[1.0.6]1.统一认证密码强度判断修改 2.新增统一认证修改密码h5

app/src/main/java/com/xjjk/healthyclients/ui/activity/LoginActivity.kt

@@ -184,14 +184,15 @@ class LoginActivity : BaseVMBActivity<LoginViewModel, ActivityLoginNewBinding>(R
 //                if (!passWord.formatCheck()) {
 //                    showToast("格式校验不通过")
 //                }
+                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) {
                     showToast("请先阅读相关协议并勾选")
-                }else{
+                } else if ((passwordLength < 12 || passwordLength > 32)&&loginType==2) {
-                    if (mBinding.loginEtUserPassword.getInputContext().length<12||mBinding.loginEtUserPassword.getInputContext().length>32) {
                     mTextViewDialog?.show()
                 } else {
                     login(
@@ -199,7 +200,7 @@ class LoginActivity : BaseVMBActivity<LoginViewModel, ActivityLoginNewBinding>(R
                         mBinding.loginEtUserPassword.getInputContext()
                     )
                 }
-                }
+
             }
             R.id.login_iv_read_state,R.id.login_agreement_root -> {
                 mBinding?.let {
@@ -214,8 +215,12 @@ class LoginActivity : BaseVMBActivity<LoginViewModel, ActivityLoginNewBinding>(R
             }
             R.id.login_retrieve_password -> {
                 //找回密码
+                if (loginType == 1) {
+                    startWebActivity("https://sso.iosp.ydpt.tech/SSOManageClient/userController/changePassword")
+                } else {
                     mContext?.startRetrievePassWordActivity()
                 }
+            }
             R.id.test_btn->{
                 if (isAdminEnable) {
                     mCount-=1
@@ -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 -> {

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" />
 

config.gradle

@@ -2,8 +2,8 @@ ext {
     minSdkVersion = 26
     targetSdkVersion = 32
     compileSdkVersion = 33
-    versionCode = 105
+    versionCode = 106
-    versionName = "1.0.5"
+    versionName = "1.0.6"
     //Dependencies
     junitVersion = "4.12"
     lifecycleVersion = "2.6.0-alpha01"