From 894246456ad66af3b8fa94479c632780885a01f5 Mon Sep 17 00:00:00 2001 From: lijia Date: Thu, 1 Aug 2024 15:10:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=90=E5=8D=95=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E9=9A=90=E8=97=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/home/HuoYunDelActivity.java | 18 ++ .../ui/home/StartYunDanActivity.java | 33 +++ .../ui/my/SetupActivity.java | 4 +- .../res/drawable-xxhdpi/icon_eye_close.png | Bin 0 -> 1156 bytes .../res/drawable-xxhdpi/icon_eye_open.png | Bin 0 -> 788 bytes app/src/main/res/drawable/select_eye.xml | 6 + app/src/main/res/layout/huoyuan_xq.xml | 238 +++++++++++------- app/src/main/res/layout/item_huoyuan.xml | 5 +- app/src/main/res/layout/item_huoyuan_deal.xml | 1 + .../main/res/layout/item_yundan_yunxing.xml | 1 + 10 files changed, 211 insertions(+), 95 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/icon_eye_close.png create mode 100644 app/src/main/res/drawable-xxhdpi/icon_eye_open.png create mode 100644 app/src/main/res/drawable/select_eye.xml diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java index 72addce..343bf36 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HuoYunDelActivity.java @@ -4,13 +4,20 @@ import android.Manifest; import android.app.Activity; import android.content.Intent; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.text.Html; +import android.text.Layout; import android.text.TextUtils; +import android.text.method.HideReturnsTransformationMethod; +import android.text.method.PasswordTransformationMethod; import android.util.Log; +import android.view.inputmethod.EditorInfo; import android.widget.Button; +import android.widget.CheckBox; +import android.widget.CompoundButton; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; @@ -200,6 +207,8 @@ public class HuoYunDelActivity extends BaseAppCompatActivity { //2021/02/27记，类型声明错误 ImageButton return_btn = v.findViewById(R.id.return_btn); ImageButton xuan = v.findViewById(R.id.xuan); + CheckBox checkBox = v.findViewById(R.id.cb); + TextView totalFreight = v.findViewById(R.id.totalFreight); ImageButton btnFp = v.findViewById(R.id.btnFp); TextView effectiveTime = v.findViewById(R.id.effectiveTime); TextView check_contract = v.findViewById(R.id.check_contract); @@ -210,6 +219,15 @@ public class HuoYunDelActivity extends BaseAppCompatActivity { return_btn.setOnClickListener(v16 -> { finish(); }); + totalFreight.setText("****"); + checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> { + if (isChecked){ + totalFreight.setText(hyd.getData().getTotalFreight()); + }else{ + totalFreight.setText("****"); + } +// totalFreight.setTransformationMethod(isChecked? HideReturnsTransformationMethod.getInstance(): PasswordTransformationMethod.getInstance()); + }); // String textSource = "同意在符合相关税务机关要求的情况下代开增值税发票"; String textSource = "公司已对运输合同条款充分解释说明，本人已充分理解、认可并签署；同意符合税务机关要求下代开增值税发票，产生的增值税及附加税本人承担。"; tvZzs.setText(Html.fromHtml(textSource)); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java index d7ead1d..6133307 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/StartYunDanActivity.java @@ -40,6 +40,7 @@ import com.amap.api.services.route.DriveStep; import com.amap.api.services.route.RideRouteResult; import com.amap.api.services.route.RouteSearch; import com.amap.api.services.route.WalkRouteResult; +import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog; import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil; import com.bumptech.glide.Glide; import com.dahe.mylibrary.utils.TimeUtil; @@ -73,6 +74,7 @@ import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.function.Predicate; public class StartYunDanActivity extends BaseActivity { @@ -109,6 +111,9 @@ public class StartYunDanActivity extends BaseActivity { Log.e("-运单-", CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER)); sob = gson.fromJson(CacheGroup.cacheList.get(HuoYuanFragmengt.START_ORDER), StartOrderBean.class); wnb = gson.fromJson(CacheGroup.cacheList.get(GET_EVALUTE), WNewsBean.class); + if (!isFinishing() && customDialog != null && customDialog.isShowing()) { + customDialog.dismiss(); + } if (sob.getCode() == 200 && sob.getData() != null) { id = sob.getData().getWaybillId(); initView(null); @@ -202,6 +207,30 @@ public class StartYunDanActivity extends BaseActivity { initStartBody(v); break; case R.layout.item_yundan_yunxing: + LinearLayout llMoney = v.findViewById(R.id.llMoney); + if (!sob.getData().getWaybillStatus().equals("已装货") + && !sob.getData().getWaybillStatus().equals("待装货") + && !sob.getData().getWaybillStatus().equals("待接单")) { + if (sob.getData().getWaybillStatus().equals("已装货")) { + StartOrderBean.DataDTO.WayChildrenDTO mySdw = new StartOrderBean.DataDTO.WayChildrenDTO(); + for (int i = 0; i < sob.getData().getWayChildren().size(); i++) { + StartOrderBean.DataDTO.WayChildrenDTO sdw = sob.getData().getWayChildren().get(i); + if (sdw.getType() == 1) { + mySdw = sdw; + break; + } + } + if (mySdw.getStatus() == 3) { + llMoney.setVisibility(View.GONE); + } else { + llMoney.setVisibility(View.VISIBLE); + } + } else { + llMoney.setVisibility(View.VISIBLE); + } + } else { + llMoney.setVisibility(View.GONE); + } ImageView head_img = v.findViewById(R.id.head_img); if (ub != null && ub.getData() != null && !ub.getData().getHeadportraitUrl().equals("")) { Glide.with(con).load(ub.getData().getHeadportraitUrl()).into(head_img); @@ -446,12 +475,16 @@ public class StartYunDanActivity extends BaseActivity { return str; } + private CustomDialog customDialog; + @Override protected void onResume() { super.onResume(); if (map != null) { map.onResume(); } + customDialog = new CustomDialog(con, "网络请求中..."); + customDialog.show(); hyr.startOrder(id); hyr.getEvaluate(id); } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java index 45a932c..7522624 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java @@ -127,8 +127,8 @@ public class SetupActivity extends BaseActivity { startActivity(in); }); r6.setOnClickListener(v12 -> { - String[] title={"平台客服:"+kefu,"银行客服:95528","技术咨询:13460042961"}; - String[] value={kefu,"95528","13460042961"}; + String[] title={"平台客服:"+kefu}; + String[] value={kefu}; new XPopup.Builder(con) .isDarkTheme(false) .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个 diff --git a/app/src/main/res/drawable-xxhdpi/icon_eye_close.png b/app/src/main/res/drawable-xxhdpi/icon_eye_close.png new file mode 100644 index 0000000000000000000000000000000000000000..cde4867ea08439ac03664b82018053484c129567 GIT binary patch literal 1156 zcmV-~1bh35P)Px(K1oDDRA@u(SYL=#RT%%iyX>N@5Iy)(uz|jag=huF%sJOv4+}k5nYu|SQILtC z5JU>18AVXNL?wa*MI`tK?M3o!)%%^eW;VtXf$4#n3%ZZn4o2W3n7jp;udDUrj$Bv2JLV_ zO3B9L1tQw9EDRii#N^*^g<$5Fl~O;nK4%HgYYq_6R}Rm2f=Vej06+}@RvCc~5z(h< z0!{+JzV;;I?WLuqU~+QucPAzV!BWca0AP;^kD_Q@tyY^$6c7Z#y5`=WwVrpHh;|p` zP#7kJ*oKG~dvWQiLQ={O7vcbK5Ye}V*%SauDfQN=m{4YZMk)1E>LJz>l}cspz`#HV z0FPMUF{RY`0$lorNGZ<&z)tJ=hm}&F*ufI-0U^YGL_A?HX6Ab?B8fZzoF}5Oq)en< zWI~9uh}Z>U=C_qnr}|E74}cKjDMUPEXTJG)nweivN?q?ufL<)6{1X7yBmk$F`P6a< z(ZoH^+sn**Q#2kUqJJ;fz67LLX~)n)E(5?N`*39?JP3jn^?H3PB5t+IWD4#*BKj=1 zfRsZNA)=Q-Y?hhz;k$u|^ZIXiczAwcVd0^np`no|ibj}u1OPSzz)JwIqR(x3kchtQ zd5BXoKMer-I)5=|#`@&eUOvanM?KGbjG2=%{uU8^omxgS$d5Ivz>Ee8AznqqgK;K{ z618!+5bv%KGyJRLNwX4~+A2k+C5z*5&*%T4&_Qn+OJpjBG2S_A8IyySMxVSinh>x}{ zMBE;Rq206S5^T2SKtvsPP7nmE8jZ$ZCgHR@#um|hFL+idbyZ_Kg2uh~%E7_GFUH5m zZ`#@LegAc4HhZF3BGOx`YxEKjyQvTAyS-e{^FoNthfbaViX4b89dzgE?mx@9H5bdS{0qdhE`ny)E&G(9J&i5stpTPHPZ7JY>WjgISr30k{ju|MokYfU!;r{?x W4#+^J!`DFo0000WP)Px%&PhZ;RA@u(m`TV^Q5eU6pJc;AlCYsDkyv11L4+t%QC6mvGL{9B`V3hR3o>P8 z+K6O`GQ~pKhz%uVT2Lfeuri*%o?EBed(R!ebaYSM-nV<6^E}W08UE+o(?#T?D{}v7 z0sQL>wi#$MP%{E;3Dpc>?d45oU;;1}7y*p5NB@5V&w*#aE8sQo6nI$MduU`I7!9nk zr&mFzegQ}A5tz!OP6mc~j`yqR!B-E++bTM$0@!ZO4@w!mZRPR;cx;bKNLkV|#(rm| z)_nwyxpzCtf~W%EAh022=q_*sxKPl6#lTu%dP@EZqXfhd_ zfqi+(OU@q$R(We48K@vj6#;M+nCmHC0-O&xHxSqYj0464KaKO{h#K`xVC`;KI@`SY zYrwovAo2ioyFS_JDNqUB3@DreTmlAU$b19V0Ve}G7Ny8QjJGRGJ_JC{UiTJm1@;6C zue2sFQaMwBdnI(u0d91X&jQdN5T_?~f5#b|5imF$c;fn^uP3w6m7Z8iyRIBQ=goZv zM!9T!3g|p!*^-Ek9W#M1Y56Pw;&dGkG+x@dCKTDdfEqg)S$egpC1XFZDJNa`UF0X5 zOh?x1WJnyG@cIuxO?xrN&=nV@`6d%;@&&+UlT$DGwA{&rDnKCm*rfIi(RnaZ+Eu5S z#75vij`Ny+2Mjg2!2$jr;;8by$%*47n>R$QqF4=;(!~EBK=dV~3`O0<0uVio3PjW! zS<>iHA0-kHQ6J_6BKqUBKt%mPlax}_pOpUY9qmWG4?@=;tF5&B_fcG{Bo0S?vE@fS z+N;I%F*w@G-MsUBkIv`aO7y7lCX}}TnuuZ@9c>2cM6ZdpZ3dc%VjUgPXW$R$Bg`?# SDoLRL0000 + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/huoyuan_xq.xml b/app/src/main/res/layout/huoyuan_xq.xml index a7e0615..c31fc8d 100644 --- a/app/src/main/res/layout/huoyuan_xq.xml +++ b/app/src/main/res/layout/huoyuan_xq.xml @@ -1,47 +1,54 @@ + android:background="#fff" + android:orientation="vertical"> + + + + + + android:scaleType="fitXY" + android:src="@mipmap/share2" + android:visibility="gone" /> + + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/dp_8"> + + + + android:visibility="gone" /> + + + + + + + + + + + + - + android:textSize="@dimen/sp_13" /> + + android:layout_marginTop="@dimen/dp_16" + android:background="#EFEFEF" /> + + + + android:textSize="@dimen/sp_12" /> + + android:background="#EFEFEF" /> + + + android:background="#EFEFEF" /> + + + + android:background="#EFEFEF" /> + + + android:layout_width="match_parent" + android:layout_height="@dimen/dp_1" + android:background="#EFEFEF" /> + - - + + + + + android:background="#EFEFEF" /> + - + + android:background="@drawable/bg_bai" + android:orientation="vertical"> + + + + + + + + + + android:textSize="@dimen/sp_13" /> @@ -346,39 +403,37 @@ android:layout_height="@dimen/dp_25" android:layout_gravity="center" android:layout_marginLeft="@dimen/dp_38" - android:padding="@dimen/dp_5" android:background="@null" + android:padding="@dimen/dp_5" android:scaleType="fitXY" android:src="@mipmap/no_xuan" /> + android:textSize="@dimen/sp_13" /> + android:textSize="@dimen/sp_13" /> + android:layout_marginTop="@dimen/dp_7"> + android:src="@mipmap/no_xuan" + android:visibility="invisible" /> + android:textSize="@dimen/sp_13" /> + android:visibility="gone" />