1、app所有名称改为：驭鲲智防系统

2、“打击”字样全部改为“驱离”
3、logo的整体只保留文字部分
4.修改吐司中英文显示

app/src/main/java/com/ckkj/defense_device/login/ForgetPasswordActivity.kt

@@ -57,10 +57,10 @@ class ForgetPasswordActivity : AppCompatActivity() {
                 if (isPhoneNumberValid(phoneNumber)) {
                     sendVerificationCode(phoneNumber)
                 } else {
-                    Toast.makeText(this, "请输入有效的11位手机号", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(this, getString(R.string.phone_tip), Toast.LENGTH_SHORT).show()
                 }
             } else {
-                Toast.makeText(this, "请稍后再试", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, getString(R.string.please_try_later), Toast.LENGTH_SHORT).show()
             }
         }
 
@@ -86,7 +86,7 @@ class ForgetPasswordActivity : AppCompatActivity() {
                 val response = RetrofitNetwork.getNetworkService().getCode(phoneNumber)
                 withContext(Dispatchers.Main) {
                     if (response.code == 200) {
-                        Toast.makeText(this@ForgetPasswordActivity, "验证码已发送", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(this@ForgetPasswordActivity, getString(R.string.code_sent_to), Toast.LENGTH_SHORT).show()
                         startCountDown()
                     } else {
                         Toast.makeText(this@ForgetPasswordActivity, response.msg, Toast.LENGTH_SHORT).show()
@@ -140,29 +140,30 @@ class ForgetPasswordActivity : AppCompatActivity() {
         val confirmPassword = binding.etInviteCode.text.toString().trim()
 
         if (!isPhoneNumberValid(phoneNumber)) {
-            Toast.makeText(this, "手机号格式不正确", Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, getString(R.string.invalid_phone), Toast.LENGTH_SHORT).show()
             return
         }
 
         if (TextUtils.isEmpty(smsCode)) {
-            Toast.makeText(this, "请输入验证码", Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, getString(R.string.hint_code_zh), Toast.LENGTH_SHORT).show()
             return
         }
 
         if (TextUtils.isEmpty(newPassword) || TextUtils.isEmpty(confirmPassword)) {
-            Toast.makeText(this, "密码不能为空", Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, getString(R.string.password_cannot_empty), Toast.LENGTH_SHORT).show()
             return
         }
         if (newPassword.length < MIN_PASSWORD_LENGTH || newPassword.length > MAX_PASSWORD_LENGTH) {
-            Toast.makeText(this, "密码长度需为${MIN_PASSWORD_LENGTH}-${MAX_PASSWORD_LENGTH}位", Toast.LENGTH_SHORT).show()
+            val tip = getString(R.string.pwd_length_tip, MIN_PASSWORD_LENGTH, MAX_PASSWORD_LENGTH)
+            Toast.makeText(this, tip, Toast.LENGTH_SHORT).show()
             return
         }
         if (!newPassword.matches(Regex(".*[A-Za-z].*")) || !newPassword.matches(Regex(".*[0-9].*"))) {
-            Toast.makeText(this, "密码需同时包含字母和数字", Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, getString(R.string.password_letter_digit), Toast.LENGTH_SHORT).show()
             return
         }
         if (newPassword != confirmPassword) {
-            Toast.makeText(this, "两次输入的密码不一致", Toast.LENGTH_SHORT).show()
+            Toast.makeText(this, getString(R.string.password_mismatch), Toast.LENGTH_SHORT).show()
             return
         }
 

app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt

@@ -263,6 +263,7 @@ class LoginActivity : AppCompatActivity() {
                         UserinfoUtil.saveUserInfo(response.data)
                         Toast.makeText(this@LoginActivity, R.string.password_login_success_title, Toast.LENGTH_SHORT).show()
                         val intent = Intent(this@LoginActivity, HomeActivity::class.java)
+                        //清除任务栈
                         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                         startActivity(intent)
                         finish()

app/src/main/java/com/ckkj/defense_device/login/RegisterActivity.kt

@@ -181,7 +181,8 @@ class RegisterActivity : AppCompatActivity() {
 
                     if (response.code == 200) {
                         Toast.makeText(this@RegisterActivity, R.string.register_success, Toast.LENGTH_SHORT).show()
-                        val intent = Intent(this@RegisterActivity, LoginActivity::class.java)
+                        val intent = Intent(this@RegisterActivity, RegisterSuccessActivity::class.java)
+                        //清除任务栈
                         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                         startActivity(intent)
                         finish()

app/src/main/res/drawable/shimmer_placeholder.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#E8E8E8" />
+    <corners android:radius="8dp" />
+</shape>

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

@@ -2,7 +2,7 @@
 <resources>
 
     <!-- App Name -->
-    <string name="app_name">防御机</string>
+    <string name="app_name">驭鲲智防系统</string>
 
     <!-- Common -->
     <string name="confirm">确定</string>
@@ -204,11 +204,11 @@
     <string name="warning_voice_playback">警告语音播放</string>
     <string name="warning_voice_content">警告语音内容</string>
     <string name="enter_warning_voice_content_system_will_generate_voice_automatically">请输入警告语音内容，系统将自动生成语音</string>
-    <string name="strike_interval">打击间隔</string>
+    <string name="strike_interval">驱离间隔</string>
     <string name="switch_container">切换容器</string>
-    <string name="strike_position">打击位置</string>
-    <string name="click_model_select_strike_pos">请点击下方人体模型，选择大致打击位置</string>
-    <string name="confirm_modify_strike_pos">确定修改为该打击位置？</string>
+    <string name="strike_position">驱离位置</string>
+    <string name="click_model_select_strike_pos">请点击下方人体模型，选择大致驱离位置</string>
+    <string name="confirm_modify_strike_pos">确定修改为该驱离位置？</string>
     <string name="submit_success">提交成功</string>
     <string name="submit_failed">提交失败</string>
     <string name="container_1">容器1</string>
@@ -382,6 +382,7 @@
     <string name="verification_code_error">验证码错误</string>
     <string name="password_cannot_empty">密码不能为空</string>
     <string name="password_letter_digit">密码需同时包含字母和数字</string>
+    <string name="pwd_length_tip">密码长度需为%1$d-%2$d位</string>
     <string name="password_mismatch">两次输入的密码不一致</string>
     <string name="redirect_face_page">跳转到人脸页面</string>
     <string name="redirect_register_page">跳转到注册页面</string>
@@ -395,8 +396,8 @@
     <string name="go_check">去看一下</string>
     <string name="notice">温馨提示</string>
     <string name="got_it">知道了</string>
-    <string name="strike_distance">打击距离</string>
-    <string name="enter_strike_distance">请输入打击距离</string>
+    <string name="strike_distance">驱离距离</string>
+    <string name="enter_strike_distance">请输入驱离距离</string>
     <string name="face_detection_failed">人脸检测失败</string>
     <string name="nickname_default">这里是我的昵称</string>
     <string name="device_running_days">设备已经运行\n%d天请及时维护</string>
@@ -421,6 +422,7 @@
     <string name="confirm_reset_password">确定重设密码</string>
     <string name="get_verification_code">获取验证码</string>
     <string name="hint_phone_zh">请输入手机号</string>
+    <string name="phone_tip">请输入有效的11位手机号</string>
     <string name="hint_code_zh">请输入验证码</string>
     <string name="hint_new_password_zh">请输入新密码</string>
     <string name="hint_confirm_password_zh">请再次输入新密码</string>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- App Name -->
-    <string name="app_name">Defense Device</string>
+    <string name="app_name">Yukun Intelligent Defense System</string>
 
     <!-- Common -->
     <string name="save">Save</string>
@@ -33,6 +33,7 @@
     <string name="agreement_prefix">I have read and agree to the</string>
     <string name="and">and</string>
     <string name="register_success">Registration Successful</string>
+    <string name="phone_tip">Please enter a valid 11-digit mobile number</string>
     <string name="registering">Registering...</string>
     <string name="register_success_message">Your account has been created successfully</string>
     <string name="go_to_login">Go to Login</string>
@@ -378,6 +379,7 @@
     <string name="verification_code_error">Verification code error</string>
     <string name="password_cannot_empty">Password cannot be empty</string>
     <string name="password_letter_digit">Password must contain both letters and digits</string>
+    <string name="pwd_length_tip">Password must be %1$d-%2$d characters long</string>
     <string name="password_mismatch">Passwords do not match</string>
     <string name="redirect_face_page">Redirecting to face page</string>
     <string name="redirect_register_page">Redirecting to register page</string>
@@ -392,13 +394,13 @@
     <string name="go_check">Go check</string>
     <string name="notice">Notice</string>
     <string name="got_it">Got it</string>
-    <string name="strike_distance">Strike Distance</string>
-    <string name="enter_strike_distance">Enter strike distance</string>
-    <string name="strike_interval">Strike Interval</string>
+    <string name="strike_distance">Expel Distance</string>
+    <string name="enter_strike_distance">Enter expel distance</string>
+    <string name="strike_interval">Expel Interval</string>
     <string name="switch_container">Switch Container</string>
-    <string name="strike_position">Strike Position</string>
-    <string name="click_model_select_strike_pos">Please click the human model below to select the approximate strike position</string>
-    <string name="confirm_modify_strike_pos">Confirm to modify to this strike position?</string>
+    <string name="strike_position">Expel Position</string>
+    <string name="click_model_select_strike_pos">Please click the human model below to select the approximate expel position</string>
+    <string name="confirm_modify_strike_pos">Confirm to modify to this expel position?</string>
     <string name="submit_success">Submitted successfully</string>
     <string name="submit_failed">Submission failed</string>
     <string name="container_1">Container 1</string>