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 @@