diff --git a/app/src/main/java/com/ckkj/defense_device/home/MessageActivity.kt b/app/src/main/java/com/ckkj/defense_device/home/MessageActivity.kt
index 56a091b..09c62fa 100644
--- a/app/src/main/java/com/ckkj/defense_device/home/MessageActivity.kt
+++ b/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
)
diff --git a/app/src/main/java/com/ckkj/defense_device/liveVideo/AlarmLogActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/AlarmLogActivity.kt
index 89dace3..fac59b4 100644
--- a/app/src/main/java/com/ckkj/defense_device/liveVideo/AlarmLogActivity.kt
+++ b/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()
diff --git a/app/src/main/java/com/ckkj/defense_device/login/FaceVerificationActivity.kt b/app/src/main/java/com/ckkj/defense_device/login/FaceVerificationActivity.kt
index 199c1c7..93b05c6 100644
--- a/app/src/main/java/com/ckkj/defense_device/login/FaceVerificationActivity.kt
+++ b/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()
}
}
diff --git a/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt b/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt
index d66d0e0..543275a 100644
--- a/app/src/main/java/com/ckkj/defense_device/login/LoginActivity.kt
+++ b/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()
}
diff --git a/app/src/main/java/com/ckkj/defense_device/login/RegisterActivity.kt b/app/src/main/java/com/ckkj/defense_device/login/RegisterActivity.kt
index 8567b5e..bcb8ded 100644
--- a/app/src/main/java/com/ckkj/defense_device/login/RegisterActivity.kt
+++ b/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()
diff --git a/app/src/main/res/layout/home_menu_fragment.xml b/app/src/main/res/layout/home_menu_fragment.xml
index 0f21bb1..3fe8077 100644
--- a/app/src/main/res/layout/home_menu_fragment.xml
+++ b/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:padding="7dp">
+ android:background="@drawable/bg_home_top_icon_light">
@@ -76,15 +76,13 @@
+ android:textSize="10dp"
+ android:textColor="@color/white"/>
设备已离线,请检查设备的WIFI及电源情况
%d秒后重试
验证码已发送至 %s
+ 验证码已发送
登录成功
登录成功
修改手机号
@@ -277,5 +278,6 @@
松开刷新
正在刷新…
我的家族
+ 需要相机权限才能进行人脸验证
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eca121d..0960315 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -196,6 +196,7 @@
Device is offline, please check device WiFi and power
Retry in %d seconds
Verification code sent to %s
+ Verification code sent
Login Successful
Login Successful
Modify Phone Number
@@ -277,5 +278,6 @@
Release to refresh
Refreshing...
My Family
+ Camera permission is required for face verification
\ No newline at end of file