From 4ace12c6c7b3c3926d493554de0e2927b29428ab Mon Sep 17 00:00:00 2001
From: lvmeng <848755140@qq.com>
Date: Tue, 28 Apr 2026 15:37:47 +0800
Subject: [PATCH] =?UTF-8?q?style(ui):=20=E8=B0=83=E6=95=B4=E5=8A=A0?=
=?UTF-8?q?=E8=BD=BD=E5=8A=A8=E7=94=BB=E5=B0=BA=E5=AF=B8=E5=B9=B6=E6=9B=BF?=
=?UTF-8?q?=E6=8D=A2=E4=B8=BA=E7=9F=A2=E9=87=8F=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 将加载动画ImageView尺寸从160dp调整为120dp
- 替换loading_spinner为新的loading矢量资源
- 添加loading.xml矢量动画资源文件
- 注释掉HomeActivity中的临时报告对话框逻辑
- 简化HomeActivity中的RespData类型转换代码
---
.../shelves/activity/HomeActivity.kt | 23 ++++----
app/src/main/res/drawable/loading.xml | 52 +++++++++++++++++++
app/src/main/res/layout/activity_init.xml | 6 +--
3 files changed, 67 insertions(+), 14 deletions(-)
create mode 100644 app/src/main/res/drawable/loading.xml
diff --git a/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt b/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt
index 04d49e7..16754a1 100644
--- a/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt
+++ b/app/src/main/java/com/shuwei/intelligent/shelves/activity/HomeActivity.kt
@@ -93,16 +93,17 @@ class HomeActivity : BaseActivity() {
override fun onTempReport(logMsg: String) {
updateLeftStatus(deviceName)
- if (tipDialog == null) {
- tipDialog = CommonDialog(this@HomeActivity).apply {
- dialogTitle = "温馨提示"
- confirmBlock = { logMsg.copyTextToClipboard(this@HomeActivity) }
- }
- }
- if (tipDialog?.isShowing == false) {
- tipDialog?.dialogContent = logMsg
- tipDialog?.show()
- }
+ log(logMsg)
+// if (tipDialog == null) {
+// tipDialog = CommonDialog(this@HomeActivity).apply {
+// dialogTitle = "温馨提示"
+// confirmBlock = { logMsg.copyTextToClipboard(this@HomeActivity) }
+// }
+// }
+// if (tipDialog?.isShowing == false) {
+// tipDialog?.dialogContent = logMsg
+// tipDialog?.show()
+// }
}
override fun onLog(message: String) = log(message)
@@ -166,7 +167,7 @@ class HomeActivity : BaseActivity() {
launch {
viewModel.updateOverdueStateUiState.collect { state ->
if (state is UiState.Success<*>) {
- val respData = state.data as? com.shuwei.intelligent.shelves.net.RespData<*>
+ val respData = state.data as? RespData<*>
if (respData == null) {
log("updateOverdueState: 数据类型错误，期望 RespData")
return@collect
diff --git a/app/src/main/res/drawable/loading.xml b/app/src/main/res/drawable/loading.xml
new file mode 100644
index 0000000..7828371
--- /dev/null
+++ b/app/src/main/res/drawable/loading.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_init.xml b/app/src/main/res/layout/activity_init.xml
index 1462959..717ff88 100644
--- a/app/src/main/res/layout/activity_init.xml
+++ b/app/src/main/res/layout/activity_init.xml
@@ -73,9 +73,9 @@