From baee71e4329474fc108225db08e091e9ac4cf9bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= Date: Thu, 16 Apr 2026 15:14:39 +0800 Subject: [PATCH] =?UTF-8?q?fix(chat):=20=E4=BF=AE=E5=A4=8D=E8=81=8A?= =?UTF-8?q?=E5=A4=A9=E6=A8=A1=E5=9E=8B=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 ChatModel 中的 type 和 msg 字段改为可空类型 - 添加对空值类型的检查和处理逻辑 - 当 type 为 null 时直接返回消息内容避免解析错误 --- app/src/main/java/com/nova/brain/glass/model/ChatModel.kt | 4 ++-- app/src/main/java/com/nova/brain/glass/viewmodel/ChatVM.kt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nova/brain/glass/model/ChatModel.kt b/app/src/main/java/com/nova/brain/glass/model/ChatModel.kt index 594b3a3..e9a6686 100644 --- a/app/src/main/java/com/nova/brain/glass/model/ChatModel.kt +++ b/app/src/main/java/com/nova/brain/glass/model/ChatModel.kt @@ -21,8 +21,8 @@ package com.nova.brain.glass.model //} //{"date":"2026-04-16T06:49:19.790Z","msg":"当前话题存在进行中的请求，请稍后重试","code":409,"success":false,"uri":"/docqa/chat/qa03","status":409} data class ChatModel( - val type: String, - val msg: String, + val type: String?, + val msg: String?, ) data class ChatModel1( 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 9caa68e..50cc107 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 @@ -29,6 +29,10 @@ class ChatVM : BaseViewModel() { if (l.isNotEmpty()) { val json = if (l.startsWith("data:")) l.removePrefix("data:").trim() else l val model = GsonImplHelp.get().toObject(json, ChatModel::class.java) + if (model.type == null) { + result.postValue(model.msg ?: json) + return@use + } if (t != model.type) { sb = "" }