From e862ea6a1a362959363139bb9d745e48d9539a9a Mon Sep 17 00:00:00 2001
From: zhanglei <350328959@qq.com>
Date: Wed, 26 Nov 2025 10:34:50 +0800
Subject: [PATCH] =?UTF-8?q?[1.0.6]1.=E7=BB=9F=E4=B8=80=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=BC=BA=E5=BA=A6=E5=88=A4=E6=96=AD=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=202.=E6=96=B0=E5=A2=9E=E7=BB=9F=E4=B8=80=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81h5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/activity/LoginActivity.kt              | 33 +++++++++++--------
 .../main/res/layout/activity_login_new.xml    |  2 +-
 config.gradle                                 |  4 +--
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/LoginActivity.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/LoginActivity.kt
index e4fe0f5..5d21781 100644
--- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/LoginActivity.kt
+++ b/app/src/main/java/com/xjjk/healthyclients/ui/activity/LoginActivity.kt
@@ -184,22 +184,23 @@ class LoginActivity : BaseVMBActivity<LoginViewModel, ActivityLoginNewBinding>(R
 //                if (!passWord.formatCheck()) {
 //                    showToast("格式校验不通过")
 //                }
-                if (mBinding.loginEtUserName.text.toString().trim().length==0){
+                val passwordLength = mBinding.loginEtUserPassword.getInputContext().length
+
+                if (mBinding.loginEtUserName.text.toString().trim().length == 0) {
                     showToast("请输入员工编号或用户名")
-                }else if (mBinding.loginEtUserPassword.getInputContext().length==0){
+                } else if (passwordLength == 0) {
                     showToast("请输入密码")
-                }else if (!isRead) {
+                } else if (!isRead) {
                     showToast("请先阅读相关协议并勾选")
-                }else{
-                    if (mBinding.loginEtUserPassword.getInputContext().length<12||mBinding.loginEtUserPassword.getInputContext().length>32) {
-                        mTextViewDialog?.show()
-                    }else {
-                        login(
-                            mBinding.loginEtUserName.text.toString().trim(),
-                            mBinding.loginEtUserPassword.getInputContext()
-                        )
-                    }
+                } else if ((passwordLength < 12 || passwordLength > 32)&&loginType==2) {
+                    mTextViewDialog?.show()
+                } else {
+                    login(
+                        mBinding.loginEtUserName.text.toString().trim(),
+                        mBinding.loginEtUserPassword.getInputContext()
+                    )
                 }
+
             }
             R.id.login_iv_read_state,R.id.login_agreement_root -> {
                 mBinding?.let {
@@ -214,7 +215,11 @@ class LoginActivity : BaseVMBActivity<LoginViewModel, ActivityLoginNewBinding>(R
             }
             R.id.login_retrieve_password -> {
                 //找回密码
-                mContext?.startRetrievePassWordActivity()
+                if (loginType == 1) {
+                    startWebActivity("https://sso.iosp.ydpt.tech/SSOManageClient/userController/changePassword")
+                } else {
+                    mContext?.startRetrievePassWordActivity()
+                }
             }
             R.id.test_btn->{
                 if (isAdminEnable) {
@@ -254,6 +259,7 @@ class LoginActivity : BaseVMBActivity<LoginViewModel, ActivityLoginNewBinding>(R
                 mBinding.tvLoginPlatform.setTextColor(Color.parseColor("#FFFFFF"))
                 mBinding.tvLoginHealthy.setBackgroundResource(R.mipmap.ic_login_healthy_bg)
                 mBinding.tvLoginHealthy.setTextColor(Color.parseColor("#21BEBD"))
+                mBinding.loginRetrievePassword.text = "统一认证找回密码"
 
             }
 
@@ -263,6 +269,7 @@ class LoginActivity : BaseVMBActivity<LoginViewModel, ActivityLoginNewBinding>(R
                 mBinding.tvLoginPlatform.setTextColor(Color.parseColor("#21BEBD"))
                 mBinding.tvLoginHealthy.setBackgroundResource(R.mipmap.ic_login_healthy_bg_green)
                 mBinding.tvLoginHealthy.setTextColor(Color.parseColor("#FFFFFF"))
+                mBinding.loginRetrievePassword.text = "健康系统找回密码"
 
             }
 //            R.id.login_iv_eye -> {
diff --git a/app/src/main/res/layout/activity_login_new.xml b/app/src/main/res/layout/activity_login_new.xml
index 20d46cb..d7132ec 100644
--- a/app/src/main/res/layout/activity_login_new.xml
+++ b/app/src/main/res/layout/activity_login_new.xml
@@ -121,7 +121,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="@dimen/dp_10"
-                    android:text="找回密码"
+                    android:text="统一认证找回密码"
                     android:textColor="@color/text_black_99"
                     android:textSize="@dimen/txt14" />
 
diff --git a/config.gradle b/config.gradle
index 3d121ae..eff7e38 100644
--- a/config.gradle
+++ b/config.gradle
@@ -2,8 +2,8 @@ ext {
     minSdkVersion = 26
     targetSdkVersion = 32
     compileSdkVersion = 33
-    versionCode = 105
-    versionName = "1.0.5"
+    versionCode = 106
+    versionName = "1.0.6"
     //Dependencies
     junitVersion = "4.12"
     lifecycleVersion = "2.6.0-alpha01"