From: luozheng <1732036298@qq.com> Date: Sat, 19 Oct 2024 10:42:33 +0000 (+0800) Subject: AI语音修改: X-Git-Tag: release_V1.2.70_20241020_135402~5^2~4 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=278aba7d084dd125a4b50782a95cc3568d1bf2a6;p=mirrors%2FFD230.git AI语音修改: 1.发送取消对话指令改为直接发送,减少出现上次对话内容出现在下一次对话的UI显示上 2.关闭AI语音多余打印 --- 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 82294acd4..d9bd5e891 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-10-17 15:19:15 + * @LastEditTime: 2024-10-19 18:26:01 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp */ #include "aivoice/include/AiVoiceModel.h" @@ -171,7 +171,8 @@ namespace OHOS /*取消当前AI对话*/ void AiVoiceModel::CancelCurAIChat(void) { - cancel_AI_cur_chat(); + // cancel_AI_cur_chat(); //线程发送取消当前对话 + cancel_AI_cur_chat_();// 直接发送取消当前对话 } int AiVoiceModel::GetAIResponseType(void) 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 dad5bf0b6..e2a438727 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-10-18 10:58:29 + * @LastEditTime: 2024-10-19 17:39:07 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp */ #include "AppViewIDs.h" @@ -359,8 +359,8 @@ namespace OHOS if (it->first == AIVOICERETURNRESULTTEXT_CONTINUECHAT_BUTTON_VIEW_ID) // 点击继续对话按钮要发取消当前对话指令,避免AI回应中途按继续对话按钮没有取消上一次对话问题 { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "CancelCurAIChat"); - PlayersModel::GetInstance()->HandPausePhoneMusci(); // 暂停手机音乐 AiVoiceModel::GetInstance().CancelCurAIChat(); + PlayersModel::GetInstance()->HandPausePhoneMusci(); // 暂停手机音乐 } ChangeViewAndLogicOperator(it->second.first, it->second.second); return true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceChatContentListAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceChatContentListAdapter.cpp index 3789381c0..19e8f74a1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceChatContentListAdapter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AivoiceChatContentListAdapter.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-03-28 14:27:05 * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-10-16 18:31:00 + * @LastEditTime: 2024-10-19 17:16:50 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/AivoiceChatContentListAdapter.cpp */ #include "aivoice/include/AivoiceChatContentListAdapter.h" @@ -60,7 +60,7 @@ namespace OHOS const char *Text = text.c_str(); aiAnswerFlag = flag; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Text = %s,aiAnswerFlag = %d\n", Text, aiAnswerFlag); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Text = %s,aiAnswerFlag = %d\n", Text, aiAnswerFlag); UILabel label; label.SetPosition(53, 100); @@ -72,13 +72,13 @@ namespace OHOS label.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); label.SetFont(DEFAULT_VECTOR_FONT_FILENAME_EN, 26); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "label.GetHeight = %d,label.GetTextHeight = %d\n", label.GetHeight(), label.GetTextHeight()); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "label.GetHeight = %d,label.GetTextHeight = %d\n", label.GetHeight(), label.GetTextHeight()); itemViewHeight = label.GetTextHeight(); } UIView *AivoiceChatContentListAdapter::GetView(UIView *inView, int16_t index) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AivoiceChatContentListAdapter::GetView,index %d", index); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AivoiceChatContentListAdapter::GetView,index %d", index); // 1.先检查列表数据是否为空,若为空则返回空指针 if (listData.empty()) { diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h index 00184e474..7690271db 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h @@ -820,6 +820,7 @@ bool send_AI_is_ready(uint8_t type); void inquire_AI_is_ready(uint8_t type); void cancel_AI_cur_chat(void); +void cancel_AI_cur_chat_(void); void GetCurDataCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totaldata,uint8_t crcvalue);