From ba031f075c5e2381466e51992ec771d6f7c6c15a Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Wed, 17 Jul 2024 09:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=B9=9F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/login/LoginActivity.java               |  23 +++++------
 app/src/main/res/drawable-xxhdpi/read_nor.png | Bin 0 -> 1510 bytes
 .../main/res/drawable-xxhdpi/read_select.png  | Bin 0 -> 1783 bytes
 app/src/main/res/drawable/select_read.xml     |   6 +++
 app/src/main/res/layout/activity_login.xml    |  38 +++++-------------
 5 files changed, 25 insertions(+), 42 deletions(-)
 create mode 100644 app/src/main/res/drawable-xxhdpi/read_nor.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/read_select.png
 create mode 100644 app/src/main/res/drawable/select_read.xml

diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
index 501a1a0..66b8de2 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
@@ -16,6 +16,8 @@ import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.TextView;
@@ -71,8 +73,7 @@ public class LoginActivity extends BaseActivity {
     private LoginBean loginBean;
     private TimerTask tt;
     private int timer_sum = 60;
-    private ImageButton agree_btn;
-    private CardView no_btn;
+    private CheckBox cb;
     private UserRequset ur;
 
     @Override
@@ -125,8 +126,7 @@ public class LoginActivity extends BaseActivity {
         input_phone = findViewById(R.id.input_phone);
         input_code = findViewById(R.id.input_code);
         getCode = findViewById(R.id.getCode);
-        agree_btn = findViewById(R.id.agree_btn);
-        no_btn = findViewById(R.id.no_btn);
+        cb = findViewById(R.id.cb);
         ur = new UserRequset(con, hd);
         initView(null);
     }
@@ -139,17 +139,14 @@ public class LoginActivity extends BaseActivity {
     @Override
     public void initView(Object obj) {
         super.initView(obj);
-        agree_btn.setOnClickListener(v -> {
-            agree_btn.setVisibility(View.GONE);
-            no_btn.setVisibility(View.VISIBLE);
-            key = false;
+        cb.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (isChecked) {
+                key = true;
+            } else {
+                key = false;
+            }
         });
-        no_btn.setOnClickListener(v -> {
-            agree_btn.setVisibility(View.VISIBLE);
-            no_btn.setVisibility(View.GONE);
-            key = true;
 
-        });
         ConfigBean cb = ConfigParts.getConfigParts(con);
         if (cb != null) {
             url1 = cb.getData().getUserUrl();
diff --git a/app/src/main/res/drawable-xxhdpi/read_nor.png b/app/src/main/res/drawable-xxhdpi/read_nor.png
new file mode 100644
index 0000000000000000000000000000000000000000..5091cff2e7b64ef824f4411b539facc7dce235b3
GIT binary patch
literal 1510
zcmV<C1sVE@P)<h;3K|Lk000e1NJLTq001oj001or1^@s6IvV1d000H8Nkl<ZXhYRm
zTWnNS6y5vWbLYYIw!Lkqr3|EzehNaE3#|gtCMFU<KSWFX5#l2n6aPg6nSifEKTR|k
zjr~#@_<@9ALQ)kfrM&}I_?^bm7kx}ynNFt6+<Uj#V}}fFhrXum%t_AI+&O2RefHUp
zwGfs$+S=Nr%jK$Yxm?wV7(~Qp0pMu>c*=2{N<{P!(X<dEN<{x4;$0%TK}6wXGC7h=
zCdZqanylq)k4ycNX__hkG!W4N0N96!I~7GKbGzLjrA$vD#G_>$#{tW-((~cNhhW?G
zzliu309+@cD*$lQFpShva4ZRQS6A0I00<!>gRS!Ud`eka8F)ONG*F(1n4XzIM8K25
z^PHZZh6fKGz|_=~O+<VP*Lcm{yLaDREbv8v?(XicPNh<B0l>#nO0A@%1S%^l!R2x-
zcAq)lC6h^rMxzX#Zy^Q%pR20+<BlCWMiyH1iJ*xHZ{NPX-?r@&Qpy)KO_Sy2<!Q@i
zTXUgJa{bOXz%DZ}F#)ky%yJy(Ducgt=~8<r6moL?FDK|wC?pOYI`k?cel4Y}+qiKf
z_<X*{{B^ltXaA4gCLWK&{rmUX>b*qtkzp9Eh&V6sc|jAAFirDiMEu_4@%RIQz=~X9
zv4>-q85kH~zmEdIJHcS^;(Wm8fM%EI>gsx3QIv0dKA)d0tg0L^)@GzqskFtXrl!UK
z;DcZ=cpeccd-pk@J3Bj{7ecgnz1}*u@LB@S0At{6@kAogD};D+*REZE<OI!8BAHCK
zsH%FPuC8uPTq4)~v8(j<_Og%vYFXB?#>U3s%(stO+BD6RilUsVt*w=srmc-XJYknu
zECxeELslx4I<sfbp3`$co2I!P0B-2I?yIh@UX>`ZR4Z^)85tSjkQhhA=YqlD-@HcJ
z(wv$R@n=O*j%?n%8N6QaQrBO#?>U3^_4RT3zd%H9aLUhs-Uk5ZbzQHisj10J;>g!2
zI011qnVg*DOnJmGjO*Ci+Nx~by7d$yeo|jwudGM3Sm=QKD0_N(YykK)5{aC_Teoic
z9mhGRX<8GzMxl=W{(esNzX>6lIgxA=LR<?30_BAeF>)D=E5pIT!AZw)_M>T<$E1`$
zt#@2r=!Uc6_HhRN?S>5--skMc1$?0nZX!5K#^dp`4ElO$Y3bhD+S-DM&AE)mF?(oe
zh#QD@42Q%0x~>N}q2!}RUagzr(8q~pe0+S6A7aAq_j~+)|7z`*w{=HHM`3JiEWz$U
zRaI3`M4;`WvNXF#G#ZT+qfhr0ZS?rg>-D}@Y;n5yGGeCo*tBU=d1+~B-ojJ97ve5v
zU|`_?+GD25Yt=OEg(9f(+Jq2Ci=v+9?mQBSF!%RaPfyS3?9SzauItr>*trZ34|AW$
z-S}(i&SiFwxMj<hG*?$BBauh|Hvn^bL<SfRho2#$KMS=Rw{3fGLqkLNqi#H7)y~e&
zQ>v<-EHvK3w(Zk~VVs$ltm)|JsF6~(NGV@h?@lJusiab=E4FPP&&e?HNtnx16s5)O
zcBi?#l@RC4eHU5m>Ae{)@AvGr=4DMy(>yAKVAiy99a&SBHa;{A<Cg_lQ$7)MA@%k3
zuK>VVx7%H{Ru<3ZrxEepNF;Kxxw)D7j>pCmm4L&C4<7-5uhv)zxHqE&oLiC-kU17h
z7zYm?+@~nY2_ZyUbJ2AjSbob#KgoR`b9IxGlWEPxvaG8_^yTHtm#-~LbIHDs8FlMz
z0ARsLV^XK0qGCmllv6XSTU-dus9RsCs`|r<)vejSG*c0Vh-g3Sh$ST@f-A#i>WB^z
zjUr+@5rquHxU<-3vnU-gdoiYkZQE`XLL3l6>?NX|Qpz$8jk6WojPRLJZ26&CmX%g)
z9mi>R9OsInC>^V+*k*&zp^a}RB4#ml0AP|k0RR(-*be}A@}-Uc2Uycn-jEyu5&!@I
M07*qoM6N<$f)YCF_5c6?

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/read_select.png b/app/src/main/res/drawable-xxhdpi/read_select.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9b0be7023eaead412e89185104c1ef9d27fd488
GIT binary patch
literal 1783
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
Z{2%sRwy$<QXSo0X002ovPDHLkV1k4}K&Joz

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/select_read.xml b/app/src/main/res/drawable/select_read.xml
new file mode 100644
index 0000000..db24025
--- /dev/null
+++ b/app/src/main/res/drawable/select_read.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/read_select" android:state_checked="true"></item>
+    <item android:drawable="@drawable/read_nor" android:state_checked="false"></item>
+    <item android:drawable="@drawable/read_nor"></item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index b161b80..99ae066 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -104,35 +104,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
-        <androidx.cardview.widget.CardView
-            android:padding="@dimen/dp_7"
-            android:layout_marginTop="@dimen/dp_2"
-            android:layout_width="@dimen/dp_14"
-            android:layout_height="@dimen/dp_14"
-            app:cardCornerRadius="@dimen/dp_7"
-            app:cardBackgroundColor="@color/theme_color"
-            app:cardElevation="@dimen/dp_0">
-        <androidx.cardview.widget.CardView
-            android:padding="@dimen/dp_7"
-            android:id="@+id/no_btn"
-            android:layout_width="@dimen/dp_12"
-            android:layout_height="@dimen/dp_12"
-            app:cardCornerRadius="@dimen/dp_6"
-            app:cardBackgroundColor="#fff"
-            android:layout_gravity="center"
-            app:cardElevation="@dimen/dp_0">
-        </androidx.cardview.widget.CardView>
-            <ImageButton
-                android:id="@+id/agree_btn"
-                android:layout_width="@dimen/dp_14"
-                android:layout_height="@dimen/dp_14"
-                android:src="@mipmap/choice"
-                android:scaleType="fitXY"
-                android:background="#fff"
-                android:layout_gravity="center"
-                android:visibility="gone"
-                />
-        </androidx.cardview.widget.CardView>
+
+        <CheckBox
+            android:layout_marginTop="@dimen/dp_3"
+            android:id="@+id/cb"
+            android:layout_width="@dimen/dp_28"
+            android:layout_height="@dimen/dp_34"
+            android:button="@null"
+            android:checked="false"
+            android:drawableStart="@drawable/select_read"/>
         <TextView
             android:id="@+id/tv_content"
             android:layout_width="wrap_content"