From 54d64b016e65f6281386654fbf8cfbeca85eaf4a Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Wed, 28 Aug 2024 18:22:57 +0800 Subject: [PATCH] =?utf8?q?1.AI=E8=AF=AD=E9=9F=B3=E5=85=B3=E4=BA=8E?= =?utf8?q?=E5=8F=96=E6=B6=88=E5=BD=93=E5=89=8D=E5=AF=B9=E8=AF=9D=E9=80=BB?= =?utf8?q?=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=B7=BB=E5=8A=A0AI?= =?utf8?q?=E5=9B=9E=E5=BA=94=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE=EF=BC=88?= =?utf8?q?=E5=90=8E=E7=BB=AD=E4=BC=9A=E9=85=8D=E5=90=88=E4=BD=BF=E7=94=A8?= =?utf8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../fd230app/nativeui/aivoice/include/AiVoiceModel.h | 11 ++++++++++- .../fd230app/nativeui/aivoice/src/AiVoiceModel.cpp | 3 ++- .../nativeui/aivoice/src/AiVoicePresenter.cpp | 3 ++- .../fd230app/nativeui/aivoice/src/AiVoiceView.cpp | 7 ++----- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h index 3ab0a1e2b..87b1d09b1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-20 15:14:43 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-21 11:34:53 + * @LastEditTime: 2024-08-28 17:45:47 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h */ #ifndef AI_VOICE_MODEL_H @@ -27,6 +27,14 @@ namespace OHOS class AiVoiceModel { public: + enum aiResponseType :uint8_t { + AI_RECORDING_PARSING_ERROR = 0, //AI录音解析错误 + AI_RECORDING_PARSING_CONTENT, //AI录音解析内容 + AI_RESPONSE_CONTENT, //AI回应内容 + AI_RESPONSE_ERROR,//AI 回应错误 + AI_RESPONSE_END,//AI 回应结束 + }; + static AiVoiceModel &GetInstance(void); // 获取单例实例 bool ChangeToReturnResultTextView(void); bool ChangeToAIVoiceListeningView(bool value); @@ -107,6 +115,7 @@ namespace OHOS bool entryTextViewState{false}; // 进入返回结果界面的标志 std::map> selectAiModelToTextId; // pair的参数类型<模型的textid,查询模型是否可用id> bool AiVoiceConnectStatus{false}; //与AI模型的连接状态 + uint8_t AIResponseType; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp index 9bcf22468..c457ba92c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-20 15:14:50 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-21 11:35:44 + * @LastEditTime: 2024-08-28 17:46:07 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp */ #include "aivoice/include/AiVoiceModel.h" @@ -450,6 +450,7 @@ namespace OHOS void AiVoiceModel::SetAiAnswerStrStr(std::string str, uint8_t type) { aiAnswerStr += str; + AIResponseType = type; SendMsgToUIService(UI_UPDATE_AI_ANSWER_STR, 0, nullptr, 0); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp index 6f09ea77d..db8e8480c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-06-20 15:11:17 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-15 18:53:14 + * @LastEditTime: 2024-08-28 17:46:50 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp */ #include "AppViewIDs.h" @@ -430,6 +430,7 @@ namespace OHOS if (keyID == static_cast(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 1 && uapi_get_screen_state() == 0) { NativeAbility::GetInstance().Back(TransitionType::TRANSITION_BACK_TO_HEXAGONS); + AiVoiceModel::GetInstance().CancelCurAIChat(); } return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp index 46d504d6f..2343c9df6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-08-21 11:43:04 + * @LastEditTime: 2024-08-28 17:47:15 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AiVoiceView.cpp */ #include "aivoice/include/AiVoicePresenter.h" @@ -513,10 +513,7 @@ namespace OHOS { container_->Add(AiVoiceScrollView[thisView]); } - if (AiVoiceModel::GetInstance().GetAiVoiceConnectStatus()) - { - AiVoiceModel::GetInstance().CancelCurAIChat(); - } + AiVoiceModel::GetInstance().CancelCurAIChat(); return true; } -- 2.17.1