删除无用吐司

app/src/main/java/com/ckkj/defense_device/home/MessageActivity.kt

@@ -205,7 +205,7 @@ class MessageActivity : AppCompatActivity() {
                 items.add(
                     MessageListItem.Message(
                         time = extractTime(message.createTime ?: ""),
-                        title = message.categoryName ?: "未知消息",
+                        title = message.categoryName ?: "",
                         dateTime = message.createTime ?: "",
                         unread = false
                     )

app/src/main/java/com/ckkj/defense_device/liveVideo/AlarmLogActivity.kt

@@ -158,30 +158,21 @@ class AlarmLogActivity : AppCompatActivity() {
 
     private fun fetchAlarmList() {
         val currentDeviceId = deviceId ?: return
-
-        Log.d("AlarmLogActivity", "=== 开始请求设备告警日志 ===")
-        Log.d("AlarmLogActivity", "请求参数 - deviceId: $currentDeviceId")
-
         isLoading = true
         lifecycleScope.launch {
             try {
-                Log.d("AlarmLogActivity", "正在发送网络请求...")
                 val response = RetrofitNetwork.getNetworkService().getDeviceAlarmList(
                     deviceId = currentDeviceId,
                     pageNum = "1",
                     pageSize = "10"
                 )
-
-                Log.d("AlarmLogActivity", "请求完成")
                 Log.d("AlarmLogActivity", "总条数: ${response.total}, 当前页数据条数: ${response.rows.size}")
-
                 val newData = response.rows
                 originalAlarmList.clear()
                 originalAlarmList.addAll(newData)
                 filterAlarmListByDate(calendar)
                 currentAlarmItem = alarmList.firstOrNull()
                 Log.d("AlarmLogActivity", "已获取 ${newData.size} 条数据")
-
             } catch (e: Exception) {
                 Log.e("AlarmLogActivity", "请求异常: ${e.message}", e)
                 showAlarmListNetworkError()

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

@@ -13,6 +13,7 @@ import androidx.camera.core.Preview
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import com.ckkj.defense_device.R
 import com.ckkj.defense_device.databinding.FaceVerificationActivityBinding
 import com.ckkj.defense_device.view.FaceAnalyzer
 import com.google.mlkit.vision.face.FaceDetection
@@ -106,7 +107,7 @@ class FaceVerificationActivity : AppCompatActivity() {
             if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 startCamera()
             } else {
-                Toast.makeText(this, "需要相机权限才能进行人脸验证", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, R.string.need_camera_permission_for_face_verify, Toast.LENGTH_SHORT).show()
                 finish()
             }
         }

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

@@ -195,7 +195,6 @@ class LoginActivity : AppCompatActivity() {
             try {
                 val response = RetrofitNetwork.getNetworkService().getCode(phone)
                 withContext(Dispatchers.Main) {
-                    Log.d("VerificationCode", "code = ${response.code}, msg = ${response.msg}")
                     if (response.code == 200) {
                         Toast.makeText(this@LoginActivity, getString(R.string.code_sent_to, phone), Toast.LENGTH_SHORT).show()
                         startCountDown()
@@ -220,9 +219,7 @@ class LoginActivity : AppCompatActivity() {
                     phonenumber = phone,
                     smsCode = smsCode
                 )
-                android.util.Log.d("LoginActivity", "短信登录请求: $loginRequest")
                 val response = RetrofitNetwork.getNetworkService().login(loginRequest)
-                android.util.Log.d("LoginActivity", "短信登录响应: code=${response.code}, msg=${response.msg}")
                 withContext(Dispatchers.Main) {
                     if (response.code == 200 && response.data != null) {
                         UserinfoUtil.saveUserInfo(response.data)
@@ -236,7 +233,6 @@ class LoginActivity : AppCompatActivity() {
                     }
                 }
             } catch (e: Exception) {
-                android.util.Log.e("LoginActivity", "短信登录异常", e)
                 withContext(Dispatchers.Main) {
                     Toast.makeText(this@LoginActivity, R.string.network_error, Toast.LENGTH_SHORT).show()
                 }
@@ -253,9 +249,7 @@ class LoginActivity : AppCompatActivity() {
                     phonenumber = phone,
                     password = password
                 )
-                android.util.Log.d("LoginActivity", "密码登录请求: $loginRequest")
                 val response = RetrofitNetwork.getNetworkService().login(loginRequest)
-                android.util.Log.d("LoginActivity", "密码登录响应: code=${response.code}, msg=${response.msg}")
                 withContext(Dispatchers.Main) {
                     if (response.code == 200 && response.data != null) {
                         UserinfoUtil.saveUserInfo(response.data)
@@ -270,7 +264,6 @@ class LoginActivity : AppCompatActivity() {
                     }
                 }
             } catch (e: Exception) {
-                android.util.Log.e("LoginActivity", "密码登录异常", e)
                 withContext(Dispatchers.Main) {
                     Toast.makeText(this@LoginActivity, R.string.network_error, Toast.LENGTH_SHORT).show()
                 }

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

@@ -81,7 +81,7 @@ class RegisterActivity : AppCompatActivity() {
                 val response = RetrofitNetwork.getNetworkService().getCode(userName)
                 withContext(Dispatchers.Main) {
                     if (response.code == 200) {
-                        Toast.makeText(this@RegisterActivity, "验证码已发送", Toast.LENGTH_SHORT).show()
+                        Toast.makeText(this@RegisterActivity, R.string.code_already_sent, Toast.LENGTH_SHORT).show()
                         startCountDown()
                     } else {
                         Toast.makeText(this@RegisterActivity, response.msg, Toast.LENGTH_SHORT).show()

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

@@ -65,10 +65,10 @@
                         android:layout_width="38dp"
                         android:layout_height="38dp"
                         android:layout_marginEnd="10dp"
-                        android:background="@drawable/bg_home_top_icon_light"
+                        android:background="@drawable/bg_home_top_icon_light">
-                        android:padding="7dp">
 
                         <ImageView
+                            android:padding="7dp"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:src="@mipmap/message"/>
@@ -76,15 +76,13 @@
                         <TextView
                             android:id="@+id/tvUnreadCount"
                             android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
+                            android:layout_height="16dp"
                             android:layout_gravity="end|top"
                             android:background="@drawable/bg_unread_dot"
                             android:minWidth="16dp"
-                            android:height="16dp"
                             android:gravity="center"
-                            android:textSize="10sp"
+                            android:textSize="10dp"
-                            android:textColor="@color/white"
+                            android:textColor="@color/white"/>
-                            android:visibility="gone" />
                     </FrameLayout>
 
                     <FrameLayout
@@ -120,7 +118,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="14dp"
-                android:layout_marginEnd="16dp"
                 android:text="@string/device"
                 android:textColor="@color/black"
                 android:textSize="16dp"

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

@@ -196,6 +196,7 @@
     <string name="device_offline_message">设备已离线，请检查设备的WIFI及电源情况</string>
     <string name="countdown_retry">%d秒后重试</string>
     <string name="code_sent_to">验证码已发送至 %s</string>
+    <string name="code_already_sent">验证码已发送</string>
     <string name="sms_login_success_title">登录成功</string>
     <string name="password_login_success_title">登录成功</string>
     <string name="modify_phone">修改手机号</string>
@@ -277,5 +278,6 @@
     <string name="refresh_hint_release">松开刷新</string>
     <string name="refresh_hint_refreshing">正在刷新…</string>
     <string name="my_family">我的家族</string>
+    <string name="need_camera_permission_for_face_verify">需要相机权限才能进行人脸验证</string>
 
 </resources>

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

@@ -196,6 +196,7 @@
     <string name="device_offline_message">Device is offline, please check device WiFi and power</string>
     <string name="countdown_retry">Retry in %d seconds</string>
     <string name="code_sent_to">Verification code sent to %s</string>
+    <string name="code_already_sent">Verification code sent</string>
     <string name="sms_login_success_title">Login Successful</string>
     <string name="password_login_success_title">Login Successful</string>
     <string name="modify_phone">Modify Phone Number</string>
@@ -277,5 +278,6 @@
     <string name="refresh_hint_release">Release to refresh</string>
     <string name="refresh_hint_refreshing">Refreshing...</string>
     <string name="my_family">My Family</string>
+    <string name="need_camera_permission_for_face_verify">Camera permission is required for face verification</string>
 
 </resources>