build: 优化修改密码界面

Launcher3/res/layout/activity_change_pwd.xml

@@ -26,7 +26,7 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="#FFFFFF"
-        android:hint="请输入旧密码"
+        android:hint="@string/edu_item_input_oldpwd"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
         android:textColor="#363636"
@@ -44,7 +44,7 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="#FFFFFF"
-        android:hint="请输入新密码"
+        android:hint="@string/edu_item_input_newpwd"
         android:paddingLeft="16dp"
         android:inputType="textPassword"
         android:paddingRight="16dp"
@@ -63,7 +63,7 @@
         android:layout_height="48dp"
         android:background="#FFFFFF"
         android:inputType="textPassword"
-        android:hint="请再次输入新密码"
+        android:hint="@string/edu_item_input_newpwd_again"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
         android:textColor="#363636"
@@ -83,7 +83,7 @@
         android:layout_marginTop="10dp"
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
-        android:text="通过密保修改"
+        android:text="@string/edu_item_input_change_by_security"
         android:textColor="#363636"
         android:textSize="14sp" />
 

Launcher3/res/values/strings.xml

@@ -350,4 +350,19 @@
     <string name="edu_item_activation_code">激活码</string>
     <string name="edu_item_activation_start">激活时间</string>
     <string name="edu_item_activation_end">到期时间</string>
+
+    <string name="edu_item_input_oldpwd">请输入旧密码</string>
+    <string name="edu_item_input_newpwd">请输入新密码</string>
+    <string name="edu_item_input_newpwd_again">请再次输入新密码</string>
+    <string name="edu_item_input_change_by_security">通过密保修改</string>
+
+    <string name="edu_item_input_lock">请在%1$d秒后重试</string>
+    <string name="edu_item_input_newpwd_null">新密码为空或长度小于6位</string>
+    <string name="edu_item_input_newpwd_again_null">验证新密码为空或长度小于6位</string>
+    <string name="edu_item_input_oldpwd_null">原密码为空</string>
+    <string name="edu_item_input_pwd_error">密码错误，请重新输入密码</string>
+    <string name="edu_item_input_pwd_different">两次输入密码不一致，请重新输入</string>
+    <string name="edu_item_input_pwd_change_success">密码修改成功</string>
+
+
 </resources>

Launcher3/src/com/android/launcher3/function/setting/ChangePwdActivity.kt

 package com.android.launcher3.function.setting
 
 import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import android.text.SpannableString
 import android.text.Spanned
@@ -11,9 +10,8 @@ import android.text.style.AbsoluteSizeSpan
 import android.view.View
 import android.widget.EditText
 import com.android.launcher3.BaseActivity
-import com.android.launcher3.ExtendedEditText
 import com.android.launcher3.R
-import com.android.launcher3.function.setting.AdminSettingActivity
+import com.android.launcher3.function.pwd.PwdPinSetPwdActivity
 import com.android.launcher3.settings.ErrorTimeHelper
 import com.secspace.lib.common.utils.Prefs
 import com.secspace.lib.common.utils.ToastUtil
@@ -33,9 +31,9 @@ class ChangePwdActivity : BaseActivity() {
 
     private fun initView() {
         tv_setting_title.setText(R.string.edu_item_change_pwd)
-        setHintSize(et_old_pwd, "请输入旧密码")
-        setHintSize(et_new_pwd, "请输入新密码")
-        setHintSize(et_new_pwd_again, "如有疑问或购买")
+        setHintSize(et_old_pwd, getString(R.string.edu_item_input_oldpwd))
+        setHintSize(et_new_pwd, getString(R.string.edu_item_input_newpwd))
+        setHintSize(et_new_pwd_again, getString(R.string.edu_item_input_newpwd_again))
 
         tv_confir_pwd_protection.setOnClickListener {
             ToastUtil.showShort(this@ChangePwdActivity, R.string.edu_toast_wait)
@@ -44,7 +42,7 @@ class ChangePwdActivity : BaseActivity() {
 
     private fun setHintSize(editText: EditText, text: String) {
         val ss = SpannableString(text)
-        val ass = AbsoluteSizeSpan(16, false)
+        val ass = AbsoluteSizeSpan(15, true)
         ss.setSpan(ass, 0, ss.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
         editText.hint = SpannedString(ss)
     }
@@ -54,31 +52,31 @@ class ChangePwdActivity : BaseActivity() {
         val newPwd = et_new_pwd.text.toString()
         val confirmNewPwd = et_new_pwd_again.text.toString()
         if (!ErrorTimeHelper.getInstance(this).canShowDialog()) {
-            ToastUtil.showShort(this, "请在" + ErrorTimeHelper.getInstance(this).countDownTime + "秒后重试")
+            ToastUtil.showShort(this, String.format(getString(R.string.edu_item_input_lock), ErrorTimeHelper.getInstance(this).countDownTime))
             return
         }
-        if (newPwd.isEmpty()) {
-            ToastUtil.showShort(this, "新密码不能为空")
+        if (newPwd.isEmpty()|| newPwd.length < PwdPinSetPwdActivity.PWD_TINY_LENGTH) {
+            ToastUtil.showShort(this, R.string.edu_item_input_newpwd_null)
             return
         }
-        if (confirmNewPwd.isEmpty()) {
-            ToastUtil.showShort(this, "验证新密码不能为空")
+        if (confirmNewPwd.isEmpty() || confirmNewPwd.length < PwdPinSetPwdActivity.PWD_TINY_LENGTH) {
+            ToastUtil.showShort(this, R.string.edu_item_input_newpwd_again_null)
             return
         }
         if (originalPwd.isEmpty()) {
-            ToastUtil.showShort(this, "原密码不能为空")
+            ToastUtil.showShort(this, R.string.edu_item_input_oldpwd_null)
             return
         }
         if (!TextUtils.equals(originalPwd, Prefs.getLoginPwd(this))) {
-            ToastUtil.showShort(this, "密码错误，请重新输入密码")
+            ToastUtil.showShort(this, R.string.edu_item_input_pwd_error)
             ErrorTimeHelper.getInstance(this).addErrorCount()
             return
         }
         if (!TextUtils.equals(newPwd, confirmNewPwd)) {
-            ToastUtil.showShort(this, "两次输入密码不一致，请重新输入")
+            ToastUtil.showShort(this, R.string.edu_item_input_pwd_different)
             return
         }
-        ToastUtil.showShort(this, "密码修改成功")
+        ToastUtil.showShort(this, R.string.edu_item_input_pwd_change_success)
         Prefs.setLoginPwd(this, newPwd)
         //如果存在输错密码多次的情况下重置密码
         ErrorTimeHelper.getInstance(this).resetLockTimeAndCount()