From b00658f21dd9869d2ad40241f8491f6bd8950570 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E7=BD=97=E6=AD=A3?= <1732036298@qq.com> Date: Fri, 27 Jun 2025 06:59:23 +0000 Subject: [PATCH] Merge #1893 into sdk602patch0911 from refs/changes/1893/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 罗正 * refs/changes/1893/head: (9 commits squashed) - 情绪测量界面slice添加，数据交互逻辑待添加 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - applist添加情绪测测量 - applist文件提交 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - AI界面优化 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - Merge branch 'sdk602patch0911' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911 - 4GAI添加重连逻辑，待验证 Signed-off-by: 罗正 <1732036298@qq.com> Reviewed-by: Caisking <3449750381@qq.com> Reviewed-by: 罗正 <1732036298@qq.com> Reviewed-by: aliyun8003852482 <1224667075@qq.com> Reviewed-by: snickersun@163.com Reviewed-by: aliyun6865282430 <1624952103@qq.com> Reviewed-by: 薛文强 Merged-by: Caisking <3449750381@qq.com> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1893 --- .../nativeui/aivoice/src/AiVoiceModel.cpp | 22 ++++++++++++++----- .../nativeui/aivoice/src/AiVoicePresenter.cpp | 4 ++-- 2 files changed, 18 insertions(+), 8 deletions(-) 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 a2ca19cda..cca2e5473 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp @@ -676,7 +676,7 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "停止录音"); if (GetSelect4gorbt() == AI_SELECT_4G) // 选的是4G需要关闭asr { - uapi_stop_asr(); + // uapi_stop_asr(); stop_AudioCaptureProcess_AI(); } else if (GetSelect4gorbt() == AI_SELECT_BT) @@ -1153,11 +1153,7 @@ namespace OHOS { if (view_ != nullptr && p_AiVoicePresenter != nullptr) { - uint8_t asr_state = 0; - uint8_t chat_state = 0; - asr_state = get_ai_asr_service_init_flag(); - chat_state = get_ai_chat_service_init_flag(); - if (asr_state == 1 && chat_state == 1) + if (AiVoiceModel::GetInstance().GetInit_4gai_task()) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "4gAi服务初始化成功"); bool state = true; @@ -1345,6 +1341,20 @@ namespace OHOS bool AiVoiceModel::GetInit_4gai_task(void) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AiVoiceModel::GetInit_4gai_task %d", init_4gai_task); + uint8_t asr_state = 0; + uint8_t chat_state = 0; + uint8_t tts_state = 0; + asr_state = get_ai_asr_service_init_flag(); + chat_state = get_ai_chat_service_init_flag(); + tts_state = get_ai_tts_server_init_flag(); + if (asr_state == 1 && chat_state == 1 && tts_state == 1) + { + init_4gai_task = true; + } + else + { + init_4gai_task = false; + } return init_4gai_task; } 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 23835cdac..15c5307f4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp @@ -469,9 +469,9 @@ namespace OHOS { // 通过4G调用大模型 model->SetSelect4gorbt(AI_SELECT_4G); - init_ai_task(); if (!model->GetInit_4gai_task()) { + init_ai_task(); model->start_ai4g_connect_timer(); ChangeViewAndLogicOperator(AIVOICE_STARTCHAT_VIEWID, AIVOICE_4GSERVICECON_VIEW); // LOADING } @@ -505,9 +505,9 @@ namespace OHOS { // 通过4G调用大模型 model->SetSelect4gorbt(AI_SELECT_4G); - init_ai_task(); if (!model->GetInit_4gai_task()) { + init_ai_task(); model->start_ai4g_connect_timer(); ChangeViewAndLogicOperator(AIVOICE_STARTCHAT_VIEWID, AIVOICE_4GSERVICECON_VIEW); // LOADING } -- 2.17.1