diff --git a/app/src/main/java/com/nova/brain/glass/helper/AsrHelper.kt b/app/src/main/java/com/nova/brain/glass/helper/AsrHelper.kt index ee97a1c..b5c0bbe 100644 --- a/app/src/main/java/com/nova/brain/glass/helper/AsrHelper.kt +++ b/app/src/main/java/com/nova/brain/glass/helper/AsrHelper.kt @@ -26,7 +26,7 @@ object AsrHelper : OfflineCmdListener { // 唤醒词:Nova Nova private const val WAKE_WORD = "Nova Nova" - private const val WAKE_WORD1 = "我的任务" + private const val WAKE_WORD1 = "飞宝飞宝" private const val WAKE_WORD_PINYIN = "nou wa nou wa" private var sdk: OnlineSpeechSdk? = null diff --git a/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt b/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt index 539b37a..39c247f 100644 --- a/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt +++ b/app/src/main/java/com/nova/brain/glass/helper/OfflineCmdServiceHelper.kt @@ -129,7 +129,7 @@ object OfflineCmdServiceHelper { OfflineCmdBean("Nova Nova", "nao wa nao wa"), OfflineCmdBean("C大脑", "c da nao"), OfflineCmdBean("C大脑", "sei da nao"), - OfflineCmdBean("我的任务", "wo de ren wu") + OfflineCmdBean("飞宝飞宝", "fei bao fei bao"), ) ) } 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 483ecb0..152e851 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 @@ -16,6 +16,8 @@ import com.xuqm.base.viewmodel.BaseListViewModel import com.xuqm.base.viewmodel.callback.Response import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers +import org.json.JSONObject +import retrofit2.HttpException import java.util.UUID class ChatVM : BaseListViewModel() { @@ -124,7 +126,20 @@ class ChatVM : BaseListViewModel() { }, { e -> LogHelper.e(">>>>22", e) loading.postValue(false) - result.postValue("AI反馈异常: ${e.message}") + val errMsg = if (e is HttpException) { + runCatching { + val body = e.response()?.errorBody()?.string() ?: "" + JSONObject(body).optString("msg", e.message()) + }.getOrDefault(e.message()) + } else { + "AI反馈异常: ${e.message}" + } + val lastIndex = chatItems.size - 1 + if (lastIndex >= 0) { + chatItems[lastIndex].content = errMsg + notifyItem(lastIndex) + } + result.postValue(errMsg) }) currentTask?.also { add(it) } }