From bd3718c210707836d54d473cf4d28d9f2796351e Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Wed, 24 Jan 2024 17:38:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=AD=E5=81=A5365-=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt b/base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt index 9d955b4..dbb2c3e 100644 --- a/base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt +++ b/base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt @@ -78,7 +78,7 @@ class AppUpdateDialog( isShow.invoke(false) return } - // binding.mClose.visibility = if (isUpdate) View.GONE else View.VISIBLE + binding.mClose.visibility = if (isUpdate) View.GONE else View.VISIBLE isShow.invoke(true) loadPath = url show() From 8cf6d94e41dc318f5a439364a66acc6532fca712 Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Mon, 29 Jan 2024 09:13:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=AD=E5=81=A5365-=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E9=9A=90=E7=A7=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/zj365/dc/activity/RegisterAct.kt | 2 +- mine/src/main/java/com/zj365/mime/act/AgreementAct.kt | 2 +- 2 files changed, 2 insertions(+), 2 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 db90f83..b8eb7e6 100644 --- a/app/src/main/java/com/zj365/dc/activity/RegisterAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/RegisterAct.kt @@ -149,7 +149,7 @@ class RegisterAct : BaseVmAct() { override fun onClick(widget: View) { bundle.clear() bundle.putString("title", "隐私政策") - bundle.putString("url", "https://auprty.com/app/static/app/privacy.html") + bundle.putString("url", "https://dc.zhongjian365.com/privacy.html") RouteManager.goActRequest( ARouterUrl.AGREEMNT_READ_WEB_ACT, this@RegisterAct, 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..09643ad 100644 --- a/mine/src/main/java/com/zj365/mime/act/AgreementAct.kt +++ b/mine/src/main/java/com/zj365/mime/act/AgreementAct.kt @@ -37,7 +37,7 @@ class AgreementAct : IBaseAct() { 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) } From a95219ef173f284ffd76da1d6f159432519be8e9 Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Mon, 5 Feb 2024 16:51:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=AD=E5=81=A5365-=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=9A=90=E7=A7=81=E9=97=AE=E9=A2=98=E5=8F=8A?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/zj365/dc/activity/LoginAct.kt | 2 +- app/src/main/java/com/zj365/dc/activity/RegisterAct.kt | 2 +- app/src/main/java/com/zj365/dc/weight/PrevDialog.kt | 2 +- app/src/main/res/layout/frag_mine.xml | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/zj365/dc/activity/LoginAct.kt b/app/src/main/java/com/zj365/dc/activity/LoginAct.kt index d7c40ad..a1390ce 100644 --- a/app/src/main/java/com/zj365/dc/activity/LoginAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/LoginAct.kt @@ -148,7 +148,7 @@ class LoginAct : BaseVmAct() { * 隐私条款 */ fun setPrv() { - var txtCol = ContextCompat.getColor(this, R.color.col_313) + var txtCol = ContextCompat.getColor(this, R.color.col_02c) binding.seleck.setOnClickListener { it.isSelected = !it.isSelected } 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 b8eb7e6..d6c1b7d 100644 --- a/app/src/main/java/com/zj365/dc/activity/RegisterAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/RegisterAct.kt @@ -122,7 +122,7 @@ class RegisterAct : BaseVmAct() { * 隐私条款 */ private fun setPrv() { - var txtCol = ContextCompat.getColor(this, R.color.col_313) + var txtCol = ContextCompat.getColor(this, R.color.col_02c) binding.mPrivate.movementMethod = MyLinkedMovementMethod().getInstance() var span = SpannableString(getString(R.string.private_info)) span.setSpan(object : ClickableSpan() { 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..da33ae8 100644 --- a/app/src/main/java/com/zj365/dc/weight/PrevDialog.kt +++ b/app/src/main/java/com/zj365/dc/weight/PrevDialog.kt @@ -32,7 +32,7 @@ class PrevDialog(context: Context, private var agree: () -> Unit, private var gi percentHeight = 3 / 5f setDialogPadding(80, 0, 80, 80) - val txtCol = ContextCompat.getColor(context, R.color.col_009) + val txtCol = ContextCompat.getColor(context, R.color.col_02c) binding.mContent.movementMethod = MyLinkedMovementMethod().getInstance() val string = context.getString(R.string.prev_content) val span = SpannableString(string) diff --git a/app/src/main/res/layout/frag_mine.xml b/app/src/main/res/layout/frag_mine.xml index c292303..61ff617 100644 --- a/app/src/main/res/layout/frag_mine.xml +++ b/app/src/main/res/layout/frag_mine.xml @@ -135,7 +135,7 @@ android:layout_height="wrap_content" android:paddingTop="@dimen/dp_25" android:orientation="horizontal" - android:weightSum="4" + android:background="@color/white" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -636,6 +636,7 @@