From 401d928f927f6e37ec437311d223b9e60e75350b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= <xuqinmin@bjca.org.cn>
Date: Wed, 22 Apr 2026 19:53:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(chat):=20=E4=BF=AE=E5=A4=8D=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E5=92=8CAPI?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复ChatActivity中加载进度条和占位图标切换逻辑
- 初始化ChatVM中loading状态为false避免空值问题
- 修复CompositeLayupResultVM中API成功判断条件从success改为code==200
- 修复CompositeLayupTaskVM中API成功判断条件从success改为code==200
---
 app/src/main/java/com/nova/brain/glass/ui/ChatActivity.kt      | 3 +++
 app/src/main/java/com/nova/brain/glass/viewmodel/ChatVM.kt     | 2 +-
 .../com/nova/brain/glass/viewmodel/CompositeLayupResultVM.kt   | 2 +-
 .../com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt     | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nova/brain/glass/ui/ChatActivity.kt b/app/src/main/java/com/nova/brain/glass/ui/ChatActivity.kt
index fc033fe..459e03e 100644
--- a/app/src/main/java/com/nova/brain/glass/ui/ChatActivity.kt
+++ b/app/src/main/java/com/nova/brain/glass/ui/ChatActivity.kt
@@ -42,6 +42,9 @@ class ChatActivity : BaseListFormLayoutNormalActivity<ChatItem, ChatVM, Activity
         }
 
         // loading=true：显示旋转进度；loading=false：显示静态占位图
+        val isLoading = viewModel.loading.value ?: false
+        binding.loadingProgress.visibility = if (isLoading) View.VISIBLE else View.GONE
+        binding.loadingIdleIcon.visibility = if (isLoading) View.GONE else View.VISIBLE
         viewModel.loading.observe(this) { loading ->
             binding.loadingProgress.visibility = if (loading) View.VISIBLE else View.GONE
             binding.loadingIdleIcon.visibility = if (loading) View.GONE else View.VISIBLE
diff --git a/app/src/main/java/com/nova/brain/glass/viewmodel/ChatVM.kt b/app/src/main/java/com/nova/brain/glass/viewmodel/ChatVM.kt
index ff3fc62..9d93987 100644
--- a/app/src/main/java/com/nova/brain/glass/viewmodel/ChatVM.kt
+++ b/app/src/main/java/com/nova/brain/glass/viewmodel/ChatVM.kt
@@ -30,7 +30,7 @@ class ChatVM : BaseListViewModel<ChatItem>() {
     }
 
     val result = MutableLiveData<String>()
-    val loading = MutableLiveData<Boolean>()
+    val loading = MutableLiveData(false)
     /** 末尾始终保留一个占位 item（SPACER_ID），高度 = RecyclerView 高度，用于支持最新 item 滚到顶部 */
     val chatItems: MutableList<ChatItem> = mutableListOf(ChatItem(SPACER_ID, "", ""))
 
diff --git a/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupResultVM.kt b/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupResultVM.kt
index b93eaf6..29d887c 100644
--- a/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupResultVM.kt
+++ b/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupResultVM.kt
@@ -47,7 +47,7 @@ class CompositeLayupResultVM : BaseListViewModel<ItemItem>() {
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({ response ->
-                if (response.success && response.data != null) {
+                if (response.code==200 && response.data != null) {
                     recognizeResult.value = response.data
                     resultState.value = CompositeLayupResultState.SUCCESS
                 } else {
diff --git a/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt b/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt
index cd2878e..4e037cf 100644
--- a/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt
+++ b/app/src/main/java/com/nova/brain/glass/viewmodel/CompositeLayupTaskVM.kt
@@ -83,7 +83,7 @@ class CompositeLayupTaskVM : BaseListViewModel<ItemItem>() {
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe({ response ->
                 val result = response.data
-                if (response.success && result != null) {
+                if (response.code==200 && result != null) {
                     recognizeResult.value = result
                     lastRecognizeFinished = result.finished
                     recognizeState.value = CompositeLayupRecognizeState.SUCCESS