From 9fa56534b6f9460d85a28432381b8e700a315b5e Mon Sep 17 00:00:00 2001
From: wlh <646507849@qq.com>
Date: Fri, 26 Jan 2024 16:33:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-=E4=BA=8C=E6=9C=9F?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91-=E4=BC=98=E5=8C=96=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zj365/dc/activity/RegisterAct.kt |  2 +-
 .../java/com/zj365/dc/weight/PrevDialog.kt    | 32 -----------------
 app/src/main/res/layout/act_register.xml      | 36 ++++++++++++-------
 .../java/com/zj365/mime/act/AgreementAct.kt   |  8 ++---
 4 files changed, 28 insertions(+), 50 deletions(-)

diff --git a/app/src/main/java/com/zj365/dc/activity/RegisterAct.kt b/app/src/main/java/com/zj365/dc/activity/RegisterAct.kt
index 2f269b6..5fb82e0 100644
--- a/app/src/main/java/com/zj365/dc/activity/RegisterAct.kt
+++ b/app/src/main/java/com/zj365/dc/activity/RegisterAct.kt
@@ -112,7 +112,7 @@ class RegisterAct : BaseVmAct<RegisterVm>() {
                 pwd
             )
         }
-        binding.mPrivate.setOnClickListener {
+        binding.seleck.setOnClickListener {
             it.isSelected = !it.isSelected
         }
         setPrv()
diff --git a/app/src/main/java/com/zj365/dc/weight/PrevDialog.kt b/app/src/main/java/com/zj365/dc/weight/PrevDialog.kt
index dd2e223..c1ef238 100644
--- a/app/src/main/java/com/zj365/dc/weight/PrevDialog.kt
+++ b/app/src/main/java/com/zj365/dc/weight/PrevDialog.kt
@@ -100,38 +100,6 @@ class PrevDialog(context: Context, private var agree: () -> Unit, private var gi
             }
 
         }, 79, 85, Spanned.SPAN_INCLUSIVE_INCLUSIVE)
-        /*span.setSpan(object : ClickableSpan() {
-            override fun onClick(widget: View) {
-                val bundle = Bundle()
-                bundle.putString("title", "隐私政策")
-                bundle.putString("url", "https://auprty.com/app/static/app/privacy.html")
-                RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle)
-            }
-
-            override fun updateDrawState(ds: TextPaint) {
-                super.updateDrawState(ds)
-                ds.color = txtCol
-                ds.isUnderlineText = false
-                ds.clearShadowLayer()
-
-            }
-        }, 92, 98, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-        span.setSpan(object : ClickableSpan() {
-            override fun onClick(widget: View) {
-                val bundle = Bundle()
-                bundle.putString("title", "中健三六五健康 APP 权限列表")
-                bundle.putString("url", "https://auprty.com/app/static/app/permission.html")
-                RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle)
-            }
-
-            override fun updateDrawState(ds: TextPaint) {
-                super.updateDrawState(ds)
-                ds.color = txtCol
-                ds.isUnderlineText = false
-                ds.clearShadowLayer()
-
-            }
-        }, 99, 114, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)*/
 
         binding.mContent.text = span
         binding.mContent.highlightColor = Color.TRANSPARENT
diff --git a/app/src/main/res/layout/act_register.xml b/app/src/main/res/layout/act_register.xml
index 7983292..8fcba68 100644
--- a/app/src/main/res/layout/act_register.xml
+++ b/app/src/main/res/layout/act_register.xml
@@ -149,20 +149,32 @@
                 android:textStyle="bold"
                 android:layout_marginTop="@dimen/dp_57"
                 android:textSize="@dimen/sp_18" />
-
-            <TextView
-                android:id="@+id/mPrivate"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_marginTop="@dimen/dp_17"
-                android:drawableLeft="@drawable/selctor_check_sel"
-                android:drawablePadding="@dimen/dp_6"
-                android:gravity="center"
-                android:text="隐私条款"
-                android:textColor="@color/col_7c7"
-                android:textSize="@dimen/sp_12"
-                tools:ignore="UseCompatTextViewDrawableXml" />
+                android:layout_marginTop="@dimen/dp_12"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/seleck"
+                    android:layout_width="@dimen/dp_15"
+                    android:layout_height="@dimen/dp_15"
+                    android:background="@drawable/selctor_check_sel"
+                    android:padding="@dimen/dp_10" />
+
+                <TextView
+                    android:id="@+id/mPrivate"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="@dimen/dp_8"
+                    android:gravity="center"
+                    android:textSize="@dimen/sp_13"
+                    android:text="隐私条款"
+                    android:textColor="@color/col_c7c" />
+
+            </LinearLayout>
 
 
             <TextView
diff --git a/mine/src/main/java/com/zj365/mime/act/AgreementAct.kt b/mine/src/main/java/com/zj365/mime/act/AgreementAct.kt
index cdff5a0..0dd0f41 100644
--- a/mine/src/main/java/com/zj365/mime/act/AgreementAct.kt
+++ b/mine/src/main/java/com/zj365/mime/act/AgreementAct.kt
@@ -29,15 +29,13 @@ class AgreementAct : IBaseAct() {
         binding.mTvAgree1.setOnClickListener {
             bundle.clear()
             bundle.putString("title", "用户协议")
-            bundle.putInt("type", Const.AGREEMENT_1)
-            bundle.putBoolean("isAgree", false)
-            RouteManager.goAct(ARouterUrl.RICH_TEXT, bundle)
+            bundle.putString("url", "https://dc.zhongjian365.com/agreement.html")
+            RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle)
         }
         binding.mTvAgree2.setOnClickListener {
             bundle.clear()
             bundle.putString("title", "隐私政策")
-            bundle.putBoolean("isAgree", false)
-            bundle.putString("url","https://auprty.com/app/static/app/privacy.html")
+            bundle.putString("url", "https://dc.zhongjian365.com/privacy.html")
             RouteManager.goAct(ARouterUrl.AGREEMNT_READ_WEB_ACT, bundle)
         }