From: luozheng <1732036298@qq.com> Date: Tue, 28 May 2024 12:45:42 +0000 (+0800) Subject: offlinevoice 文件夹更新 X-Git-Tag: release_V1.2.70_20241020_135402~1090 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=a361cda8a7a49312508fa110c3797510c7f7c0a9;p=mirrors%2FFD230.git offlinevoice 文件夹更新 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/include/MainVocassistView.h b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/include/MainVocassistView.h index 194e59a4b..74b194508 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/include/MainVocassistView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/include/MainVocassistView.h @@ -17,7 +17,7 @@ class VocassistPresenter; class MainVocassistView : public View { public: MainVocassistView(); - virtual ~MainVocassistView(); + ~MainVocassistView() override; void OnStart() override; void OnSetUpView() override; void OnTearDownView() override; diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/include/VocassistView.h b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/include/VocassistView.h index 51435d42c..8ec962153 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/include/VocassistView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/include/VocassistView.h @@ -12,7 +12,6 @@ #include "components/ui_image_animator.h" #include "components/ui_scroll_view.h" #include "components/ui_label.h" -#include "components/ui_label_ext.h" #include "UiConfig.h" #include "dfx/event_injector.h" #include "wearable_log.h" @@ -107,7 +106,7 @@ namespace OHOS { class VoiceAssistance : public AppGroupView { public: VoiceAssistance(); - virtual ~VoiceAssistance(); + ~VoiceAssistance() override; static VoiceAssistance *GetInstance(); bool InitView(void *caller) override; // 初始化所有控件 diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp index 23d4f3c44..00ffa938d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp @@ -9,8 +9,6 @@ #include "VocassistView.h" #include "VocassistModel.h" #include "AppViewIDs.h" -#include "components/ui_label_ext.h" -#include"language/font/ui_resource_string.h" #include "NativeAbility.h" #include "graphic_service.h" @@ -37,7 +35,7 @@ static const char g_voiceWordName[SMART_VOICE_INVALID_CMD_ID + 1][CMD_LENGTH] = namespace OHOS { static void RecognVoiceEvent(const SmartVoiceCmdParam data) { - SmartVoiceCmdParam *param = NULL; + SmartVoiceCmdParam *param = nullptr; param = (SmartVoiceCmdParam *)&data; if (param->cmdId < SMART_VOICE_WAKEUP_CMD || param->cmdId > SMART_VOICE_INVALID_CMD_ID) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Get cmdid failed, funct callback finish!!"); @@ -56,11 +54,11 @@ static void RecognVoiceEvent(const SmartVoiceCmdParam data) } } else if (NativeAbility::GetInstance().GetCurSliceId() == VIEW_OFFLINEVOICE) { // 已经进入语音助手 if (VoiceAssistance::GetInstance() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is NULL, funct callback finish!!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is nullptr, funct callback finish!!"); return; } if (VocassistModel::GetInstance()->GetToggleFlag() == ALREADY_OPEN_VOCASSIST_IMAGE && - VocassistModel::GetInstance()->GetHasOneCmd() == false) { + (!VocassistModel::GetInstance()->GetHasOneCmd())) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "CurSliceId equals VIEW_OFFLINEVOICE"); VoiceAssistance::GetInstance()->SetCmdContext(g_voiceWordName[param->cmdId]); VoiceAssistance::GetInstance()->SwitchMedium(CREATE_CMD_LABEL); @@ -75,7 +73,7 @@ static void RecognVoiceEvent(const SmartVoiceCmdParam data) void VoiceFunction(SmartVoiceEventType type, td_void *data, td_s32 size) { int dataSize = sizeof(SmartVoiceCmdParam); - if (data == NULL || dataSize != size) { + if (data == nullptr || dataSize != size) { return; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp index a394a59d1..5cd75bf95 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp @@ -5,8 +5,6 @@ * Create: 2022-01-18 */ #include "AppViewIDs.h" -#include "components/ui_label_ext.h" -#include"language/font/ui_resource_string.h" #include "VocassistPresenter.h" #include "PlayersModel.h" #include "ui_service.h" @@ -63,7 +61,6 @@ void VocassistPresenter::VocAssistDeal(int flag) VocassistModel::GetInstance()->SetExitStatus(CONTINUTE_EXIT_MODE1); VoiceAssistance::GetInstance()->DelayDisplayTime(DELAY_SIX_SECONDS); // 开启定时器,太长时间未操作退出语音助手 - } void VocassistPresenter::OnAnimatorStop(UIView& view) // 播放结束监听 @@ -91,7 +88,7 @@ bool VocassistPresenter::OnClick(UIView& view, const ClickEvent& event) // 语 { UNUSED(event); if (VoiceAssistance::GetInstance() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is NULL!!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is nullptr!!"); return false; } if (strcmp(view.GetViewId(), VOCPHOTO_ID) == 0) { @@ -117,7 +114,7 @@ bool VocassistPresenter::OnDrag(UIView& view, const DragEvent& event) strcmp(view.GetViewId(), VOC_ID) == 0) { // 语音助手右滑退出 int phoneStatus = VocassistModel::GetInstance()->GetPhoneDetailStatus(); // 扫描设置此时通话的状态和个数 if (phoneStatus == ONE_ROAD_AND_INCOMING) { - NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL); + NativeAbility::GetInstance().ChangeSlice(VIEW_MAEKPHONE_SAMPLE); } else { NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST); } @@ -139,7 +136,6 @@ void VocassistPresenter::OnResume(void) {} void VocassistPresenter::OnStop(void) { Presenter::OnStop(); - SendMsgToUIService(SCREEN_TURN_OFF_TO_UI, 0, NULL, 0); - + SendMsgToUIService(SCREEN_TURN_OFF_TO_UI, 0, nullptr, 0); } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp index 1780bd66f..98705f63c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp @@ -8,8 +8,6 @@ #include #include "cmsis_os.h" #include "AppViewIDs.h" -#include "components/ui_label_ext.h" -#include"language/font/ui_resource_string.h" #include "PlayersModel.h" #include "CallerLogModel.h" #include "VocassistModel.h" @@ -38,7 +36,7 @@ static constexpr uint16_t WORD_LENGTH = 60; static constexpr int16_t ERROR_RETVAL = -1; namespace OHOS { -static osTimerId_t g_closeVocassistHandle = NULL; +static osTimerId_t g_closeVocassistHandle = nullptr; static VoiceAssistance *g_pVoiceAssistance = nullptr; enum { @@ -100,12 +98,12 @@ VoiceAssistance::~VoiceAssistance() RemoveAll(); g_pVoiceAssistance = nullptr; // 切换为其它slice时将定时器删除 - if (g_closeVocassistHandle != NULL) { + if (g_closeVocassistHandle != nullptr) { osStatus_t statusRet = osTimerDelete(g_closeVocassistHandle); if (statusRet != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Delete timer failed!!"); } - g_closeVocassistHandle = NULL; + g_closeVocassistHandle = nullptr; } delete voicePhoto; @@ -146,12 +144,12 @@ void VoiceAssistance::InitImageAnimatorSource(void) void VoiceAssistance::DetermineCause(const int *eventRet) // 根据能否执行用户指令做出回复 { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[VoiceAssistView] Enter DetermineCause"); - if (eventRet == NULL) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "EventRet is NULL!!"); + if (eventRet == nullptr) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "EventRet is nullptr!!"); return; } if (VoiceAssistance::GetInstance() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is NULL!!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is nullptr!!"); return; } int temp = *eventRet; @@ -173,7 +171,7 @@ void VoiceAssistance::InitVocassist(void) voicePhoto->SetSizeFixed(true); if (VoiceAssistance::GetInstance() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is NULL!!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is nullptr!!"); return; } VoiceAssistance::GetInstance()->SwitchMedium(WAVE_VIEW); @@ -193,7 +191,7 @@ void VoiceAssistance::InitVocassist(void) void VoiceAssistance::SwitchMedium(uint16_t targetView) { if (GraphicService::GetInstance() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GraphicService instance is NULL!!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GraphicService instance is nullptr!!"); return; } GraphicService::GetInstance()->PostGraphicEvent(std::bind(&VoiceAssistance::VocSwitchApp, this, targetView)); @@ -213,7 +211,7 @@ void VoiceAssistance::VocSwitchApp(uint16_t targetView) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[VoiceAssistView] Start Operation!!"); if (VoiceAssistance::GetInstance() == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is NULL!!"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is nullptr!!"); return; } viewFunct func = FindIndex(targetView); @@ -234,7 +232,7 @@ int VoiceAssistance::ChangeViewToPlayer() // 播放音乐 { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[VoiceAssistView] Enter ChangeViewToPlayer"); - if(!PlayersModel::GetInstance()->HasPlayerPlayed()) { // 播放过了就不用再初始化 + if (!PlayersModel::GetInstance()->HasPlayerPlayed()) { // 播放过了就不用再初始化 PlayersListGroup::GetInstance()->SetUpListCase(); PlayersModel::GetInstance()->PlayerInit(); } @@ -580,13 +578,13 @@ void VoiceAssistance::CloseVocassist() static void DeleteTimeTick() { - if (g_closeVocassistHandle != NULL) { + if (g_closeVocassistHandle != nullptr) { osStatus_t ret = osTimerDelete(g_closeVocassistHandle); if (ret != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Delete timer failed!!"); return; } - g_closeVocassistHandle = NULL; + g_closeVocassistHandle = nullptr; } } @@ -634,11 +632,11 @@ void VoiceAssistance::ExitProgress() if (quitStatus == CONTINUTE_EXIT_MODE1) { int phoneStatus = VocassistModel::GetInstance()->GetPhoneDetailStatus(); // 扫描设置此时通话的状态和个数 if (phoneStatus == ONE_ROAD_AND_INCOMING) { - NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL); // 返回来电界面 + NativeAbility::GetInstance().ChangeSlice(VIEW_MAEKPHONE_SAMPLE); // 返回来电界面 return; } WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Too long no operate, now exit vocassist"); - NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN); + NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE); return; } else if (quitStatus == CONTINUTE_EXIT_MODE2) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Too long no operate, now change model to vocassist label"); @@ -655,20 +653,20 @@ void VoiceAssistance::DelayDisplayTime(int32_t waitSec) } int quitStatus = VocassistModel::GetInstance()->GetExitStatus(); // 删除定时器,打断退出语音助手的操作 - if (g_closeVocassistHandle != NULL && (quitStatus == CONTINUTE_EXIT_MODE1 || + if (g_closeVocassistHandle != nullptr && (quitStatus == CONTINUTE_EXIT_MODE1 || quitStatus == CONTINUTE_EXIT_MODE2)) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Interrupt Timer!!"); osStatus_t statusRet = osTimerDelete(g_closeVocassistHandle); if (statusRet != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Delete timer failed!!"); } - g_closeVocassistHandle = NULL; + g_closeVocassistHandle = nullptr; VocassistModel::GetInstance()->SetExitStatus(INTERRUPT_EXIT); } // 创建新的定时器 - g_closeVocassistHandle = osTimerNew((osTimerFunc_t)DelayTimeCallback, osTimerOnce, NULL, NULL); - if (g_closeVocassistHandle == NULL) { + g_closeVocassistHandle = osTimerNew((osTimerFunc_t)DelayTimeCallback, osTimerOnce, nullptr, nullptr); + if (g_closeVocassistHandle == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "New timer failed !!"); return; } @@ -676,13 +674,13 @@ void VoiceAssistance::DelayDisplayTime(int32_t waitSec) osStatus_t statusRet = osTimerStart(g_closeVocassistHandle, tick); if (statusRet != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Start timer failed !!"); - if (g_closeVocassistHandle != NULL) { + if (g_closeVocassistHandle != nullptr) { statusRet = osTimerDelete(g_closeVocassistHandle); if (statusRet != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Delete timer failed !!"); return; } - g_closeVocassistHandle = NULL; + g_closeVocassistHandle = nullptr; } return; }