refactor(更新)

- 修改指纹录入提示
- 修改设备初始化钥匙和锁的提示文案
- 修改设备初始化钥匙和锁的UI

app/src/main/java/com/grkj/iscs/features/init/fragment/InitDeviceRegistrationKeyAndLockFragment.kt

@@ -92,7 +92,8 @@ class InitDeviceRegistrationKeyAndLockFragment :
                 if (!it) getString(R.string.init_device_registration_key_and_lock_step_hint) else getString(
                     R.string.init_device_registration_key_and_lock_complete_step_hint
                 )
-            binding.checkDeviceInfo.isVisible = it
+            binding.dockRv.isVisible = it
+//            binding.checkDeviceInfo.isVisible = it
             binding.reRecognize.isVisible = it
             if (it) {
                 val dockData =

app/src/main/java/com/grkj/iscs/features/main/dialog/user_info/AddFingerprintDialog.kt

@@ -23,6 +23,7 @@ class AddFingerprintDialog(
         dialog?.setMaskColor(CommonUtils.getColor(com.grkj.ui_base.R.color.scrim))
         dialog.isCancelable = false
         updateTip(binding.pressTip)
+        binding.pressTip.text = CommonUtils.getStr(com.grkj.ui_base.R.string.fingerprint_scan_tip,3).toString()
         binding.cancel.setDebouncedClickListener {
             onCancel(dialog)
         }

app/src/main/java/com/grkj/iscs/features/main/fragment/user_info/SetFingerprintFragment.kt

@@ -61,7 +61,7 @@ class SetFingerprintFragment : BaseFragment<FragmentSetFingerprintBinding>() {
                 it.dismiss()
             }) {
                 pressTip = it
-                pressTip?.text = getString(
+                it.text = getString(
                     com.grkj.ui_base.R.string.fingerprint_scan_tip,
                     maxPressTimes - mFingerprintPressTimes
                 )

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

@@ -409,7 +409,7 @@
     <string name="check_key_is_new_device">Check if the key is new hardware</string>
     <string name="start_scan_key_mac">Start scanning key information</string>
     <string name="do_you_want_to_remove_exception">Are you sure to remove and modify the exception</string>
-    <string name="check_device_info">Detected %1$d keys and %2$d padlocks</string>
+    <string name="check_device_info">Detected %1$d unregister keys and %2$d unregister padlocks</string>
     <string name="exception_type">Exception type：</string>
     <string name="exception_source">Exception source：</string>
     <string name="exception_status">Exception status：</string>

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

@@ -409,7 +409,7 @@
     <string name="check_key_is_new_device">检查钥匙是否为新硬件</string>
     <string name="start_scan_key_mac">开始扫描钥匙信息</string>
     <string name="do_you_want_to_remove_exception">是否确认移除该异常</string>
-    <string name="check_device_info">检测到钥匙%1$d把,挂锁%2$d把</string>
+    <string name="check_device_info">检测到未注册钥匙%1$d把,未注册挂锁%2$d把</string>
     <string name="exception_type">异常类型：</string>
     <string name="exception_source">异常源：</string>
     <string name="exception_status">状态：</string>

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

@@ -412,7 +412,7 @@
     <string name="check_key_is_new_device">检查钥匙是否为新硬件</string>
     <string name="start_scan_key_mac">开始扫描钥匙信息</string>
     <string name="do_you_want_to_remove_exception">是否确认移除该异常</string>
-    <string name="check_device_info">检测到钥匙%1$d把,挂锁%2$d把</string>
+    <string name="check_device_info">检测到未注册钥匙%1$d把,未注册挂锁%2$d把</string>
     <string name="exception_type">异常类型：</string>
     <string name="exception_source">异常源：</string>
     <string name="exception_status">状态：</string>