1.string文件添加修改密码的提示语

2.修改密码前先请求设置。

app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt

@@ -422,6 +422,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                     updateAppRv()
                     if (it.fromNetWorkType==1){
                         quitAccount(it)
+                    }else if (it.fromNetWorkType==2){
+                        changeCode(it)
                     }
                 }
             }
@@ -643,14 +645,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
     private fun getChangeCodeListener(): AppAdapter.ChangePwdListener {
         return object : AppAdapter.ChangePwdListener {
             override fun changeCode() {
-                val deviceSetBean = StrategyUtils.getSchoolDeviceSetBean(this@MainActivity)
-                var showFlag = true
-                if (deviceSetBean != null && deviceSetBean.changePwd == 0) {
-                    //学校设置是否禁止修改密码
-                    showFlag = false
-                }
-                if (showFlag) {
-                    showChangeCodeDialog()
+                userBean?.let {
+                    viewModel.getSchoolSetData(it.schoolid,2)
                 }
             }
 
@@ -678,6 +674,18 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
         }
     }
 
+    private fun changeCode(deviceSetBean:SchoolDeviceSetBean?){
+        //val deviceSetBean = StrategyUtils.getSchoolDeviceSetBean(this@MainActivity)
+        var showFlag = true
+        if (deviceSetBean != null && deviceSetBean.changePwd == 0) {
+            //学校设置是否禁止修改密码
+            showFlag = false
+        }
+        if (showFlag) {
+            showChangeCodeDialog()
+        }
+    }
+
     private fun showChangeCodeDialog() {
         CustomDialog.build()
             .setCustomView(object : OnBindView<CustomDialog>(R.layout.layout_changecode_dialog) {
@@ -694,16 +702,16 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                         val oldCode = oldCodeEt.text.toString()
                         val newCode = newCodeEt.text.toString()
                         if (!getTextFlag(enterCode) || !getTextFlag(oldCode) || !getTextFlag(newCode)) {
-                            Toast("密码不符合规则")
+                            Toast(getString(R.string.codetips))
                             return@setOnClickListener
                         }
                         if (oldCode.equals(newCode)) {
-                            Toast("新密码不能和旧密码一致")
+                            Toast(getString(R.string.codetipsold))
                             return@setOnClickListener
                         }
 
                         if (!newCode.equals(enterCode)) {
-                            Toast("两次输入的新密码不一致")
+                            Toast(getString(R.string.codetipsnew))
                             return@setOnClickListener
                         }
 
@@ -1642,7 +1650,11 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
 
                                 }
                             }else{
-                                Toast("密码错误!")
+                                if (code.isNullOrBlank()){
+                                    Toast(getString(R.string.codenoempty))
+                                }else{
+                                    Toast(getString(R.string.codetips))
+                                }
                             }
                         }
                         cancelTv.setOnClickListener {
@@ -1687,7 +1699,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),Download
                     val titleTv = v.findViewById<TextView>(R.id.dialog_title_tv)
                     val contentTv = v.findViewById<TextView>(R.id.dialog_content_tv)
                     contentTv.text=msg
-                    titleTv.text="通知"
+                    titleTv.text=getString(R.string.notice)
                     closeBtn.setOnClickListener {
                         dialog.dismiss()
                     }

app/src/main/res/layout/layout_changecode_dialog.xml

@@ -53,6 +53,7 @@
                     android:hint="@string/oldcodetips"
                     android:singleLine="true"
                     android:maxLength="16"
+                    android:digits="@string/psw_style"
                     android:textColor="@color/black"
                     android:textColorHint="#FFB8C2D9"
                     android:textSize="16sp" />
@@ -92,6 +93,7 @@
                     android:gravity="center_vertical"
                     android:hint="@string/newcodetips"
                     android:singleLine="true"
+                    android:digits="@string/psw_style"
                     android:maxLength="16"
                     android:textColor="@color/black"
                     android:textColorHint="#FFB8C2D9"
@@ -133,6 +135,7 @@
                     android:hint="@string/enternewcodetips"
                     android:singleLine="true"
                     android:maxLength="16"
+                    android:digits="@string/psw_style"
                     android:textColor="@color/black"
                     android:textColorHint="#FFB8C2D9"
                     android:textSize="16sp" />

app/src/main/res/values/strings.xml

@@ -49,4 +49,7 @@
     <string name="startapptips">应用正在安装，请稍后</string>
     <string name="strategyupdatetips">请求过于频繁，请稍等</string>
     <string name="checknettips">请检查网络连接是否正常</string>
+    <string name="notice">通知</string>
+    <string name="codetipsold">新密码不能和旧密码一致</string>
+    <string name="codetipsnew">两次输入的新密码不一致</string>
 </resources>