From cbc23a5a348cfede0127fa400155e060b6d76977 Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Sat, 23 Aug 2025 15:50:12 +0800 Subject: [PATCH] =?utf8?q?1.4GAI=E5=85=B3=E9=97=AD=E4=B8=80=E4=BA=9B?= =?utf8?q?=E9=AB=98=E9=A2=91=E6=89=93=E5=8D=B0=202.custom=5Ffileoperate=5F?= =?utf8?q?service=E7=BA=BF=E7=A8=8B=E5=85=B3=E9=97=ADCUSTOM=5FFILEOPERATE?= =?utf8?q?=5FMSG=5FTYPE=5FBATTERY=5FDATA=5FSAVE=E6=B6=88=E6=81=AF=E5=87=BD?= =?utf8?q?=E6=95=B0=E8=B0=83=E7=94=A8=EF=BC=8C=E6=AD=A4=E4=B8=BA=E7=94=B5?= =?utf8?q?=E6=B1=A0log=E4=BF=A1=E6=81=AF=E4=BF=9D=E5=AD=98=E5=87=BD?= =?utf8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../fd230app/nativeui/aivoice/src/AiVoiceModel.cpp | 10 ++++++---- .../fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp | 8 ++++++++ .../peripheral/utils/custom_fileoperate_service.c | 4 ++-- 3 files changed, 16 insertions(+), 6 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 360b1147b..0393e1ebd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp @@ -698,7 +698,7 @@ namespace OHOS std::string processedText = accumulatedText; safe_replace_utf8(processedText, punctuation, replacement); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "processedText:%s", processedText.c_str()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "processedText:%s", processedText.c_str()); accumulatedText = processedText; size_t commaPos = accumulatedText.find_last_of(','); @@ -715,7 +715,7 @@ namespace OHOS } } - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "commaPos:%d", commaPos); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "commaPos:%d", commaPos); if (commaPos != std::string::npos) { @@ -749,10 +749,11 @@ namespace OHOS else { // 发送失败,等待下次发送 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "发送失败,等待下次发送"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "发送失败,等待下次发送,fouce_count:%d",fouce_count); fouce_count++; if (fouce_count >= 3) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "发送失败准备发送:uapi_start_tts"); uapi_start_tts(); fouce_count = 0; } @@ -806,10 +807,11 @@ namespace OHOS else { // 发送失败,等待下次发送 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "发送失败,等待下次发送"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "发送失败,等待下次发送,fouce_count:%d",fouce_count); fouce_count++; if (fouce_count >= 3) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "发送失败准备发送:uapi_start_tts"); uapi_start_tts(); fouce_count = 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 95837437b..94428b2da 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp @@ -692,11 +692,19 @@ namespace OHOS } else if (scrollView == view_->GetAiVoiceScrollView(AIVOICE_LISTENING_VIEWID)) { + if (model->GetSelect4gorbt() == AI_SELECT_4G) + { + return true; + } /*聆听中界面右滑退回到AI对话界面*/ ChangeViewAndLogicOperator(AIVOICE_LISTENING_VIEWID, AIVOICE_STARTCHAT_VIEWID); } else if (scrollView == view_->GetAiVoiceScrollView(AIVOICE_THINKING_VIEWID)) { + if (model->GetSelect4gorbt() == AI_SELECT_4G) + { + return true; + } /*思考中界面右滑退到AI对话界面*/ ChangeViewAndLogicOperator(AIVOICE_THINKING_VIEWID, AIVOICE_STARTCHAT_VIEWID); } diff --git a/code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c b/code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c index f3ab19702..4f35c703c 100644 --- a/code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c +++ b/code/sdk/drivers/peripheral/utils/custom_fileoperate_service.c @@ -188,7 +188,7 @@ static void custom_fileoperate_service_check_task(void const *arg) break; case CUSTOM_FILEOPERATE_MSG_TYPE_BATTERY_DATA_SAVE: - battery_save_data(); + // battery_save_data(); break; case CUSTOM_FILEOPERATE_MSG_TYPE_MESSAGE_DATA_NOTIFY: @@ -201,7 +201,7 @@ static void custom_fileoperate_service_check_task(void const *arg) } } #define CUSTOM_FILE_OPERATE_APP_BOARD_MSG_COUNT 10 -#define CUSTOM_FILE_OPERATE_APP_BOARD_TASK_SIZE 0x2000 +#define CUSTOM_FILE_OPERATE_APP_BOARD_TASK_SIZE 0x3000 #define CUSTOM_FILE_OPERATE_BOARD_TASK_PRIO 7 void create_custom_fileoperate_queue(void) { -- 2.17.1