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 194e59a..74b1945 100644 (file)
--- 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<VocassistPresenter> {\r
 public:\r
     MainVocassistView();\r
-    virtual ~MainVocassistView();\r
+    ~MainVocassistView() override;\r
     void OnStart() override;\r
     void OnSetUpView() override;\r
     void OnTearDownView() override;\r

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 51435d4..8ec9621 100644 (file)
--- 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"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label.h"\r
-#include "components/ui_label_ext.h"\r
 #include "UiConfig.h"\r
 #include "dfx/event_injector.h"\r
 #include "wearable_log.h"\r
@@ -107,7 +106,7 @@ namespace OHOS {
     class VoiceAssistance : public AppGroupView {\r
     public:\r
         VoiceAssistance();\r
-        virtual ~VoiceAssistance();\r
+        ~VoiceAssistance() override;\r
         static VoiceAssistance *GetInstance();\r
         bool InitView(void *caller) override;               // 初始化所有控件\r
 \r

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 23d4f3c..00ffa93 100644 (file)
--- 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 a394a59..5cd75bf 100644 (file)
--- 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<MainVocassistView>::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 1780bd6..98705f6 100644 (file)
--- 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 <limits>\r
 #include "cmsis_os.h"\r
 #include "AppViewIDs.h"\r
-#include "components/ui_label_ext.h"\r
-#include"language/font/ui_resource_string.h"\r
 #include "PlayersModel.h"\r
 #include "CallerLogModel.h"\r
 #include "VocassistModel.h"\r
@@ -38,7 +36,7 @@ static constexpr uint16_t WORD_LENGTH = 60;
 static constexpr int16_t ERROR_RETVAL = -1;\r
 \r
 namespace OHOS {\r
-static osTimerId_t g_closeVocassistHandle = NULL;\r
+static osTimerId_t g_closeVocassistHandle = nullptr;\r
 static VoiceAssistance *g_pVoiceAssistance = nullptr;\r
 \r
 enum {\r
@@ -100,12 +98,12 @@ VoiceAssistance::~VoiceAssistance()
     RemoveAll();\r
     g_pVoiceAssistance = nullptr;\r
     // 切换为其它slice时将定时器删除\r
-    if (g_closeVocassistHandle != NULL) {\r
+    if (g_closeVocassistHandle != nullptr) {\r
         osStatus_t statusRet = osTimerDelete(g_closeVocassistHandle);\r
         if (statusRet != osOK) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Delete timer failed!!");\r
         }\r
-        g_closeVocassistHandle = NULL;\r
+        g_closeVocassistHandle = nullptr;\r
     }\r
 \r
     delete voicePhoto;\r
@@ -146,12 +144,12 @@ void VoiceAssistance::InitImageAnimatorSource(void)
 void VoiceAssistance::DetermineCause(const int *eventRet)        // 根据能否执行用户指令做出回复\r
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[VoiceAssistView] Enter DetermineCause");\r
-    if (eventRet == NULL) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "EventRet is NULL!!");\r
+    if (eventRet == nullptr) {\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "EventRet is nullptr!!");\r
         return;\r
     }\r
     if (VoiceAssistance::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is NULL!!");\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is nullptr!!");\r
         return;\r
     }\r
     int temp = *eventRet;\r
@@ -173,7 +171,7 @@ void VoiceAssistance::InitVocassist(void)
     voicePhoto->SetSizeFixed(true);\r
 \r
     if (VoiceAssistance::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is NULL!!");\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is nullptr!!");\r
         return;\r
     }\r
     VoiceAssistance::GetInstance()->SwitchMedium(WAVE_VIEW);\r
@@ -193,7 +191,7 @@ void VoiceAssistance::InitVocassist(void)
 void VoiceAssistance::SwitchMedium(uint16_t targetView)\r
 {\r
     if (GraphicService::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GraphicService instance is NULL!!");\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GraphicService instance is nullptr!!");\r
         return;\r
     }\r
     GraphicService::GetInstance()->PostGraphicEvent(std::bind(&VoiceAssistance::VocSwitchApp, this, targetView));\r
@@ -213,7 +211,7 @@ void VoiceAssistance::VocSwitchApp(uint16_t targetView)
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[VoiceAssistView] Start Operation!!");\r
     if (VoiceAssistance::GetInstance() == nullptr) {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is NULL!!");\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "VoiceAssistance instance is nullptr!!");\r
         return;\r
     }\r
     viewFunct func = FindIndex(targetView);\r
@@ -234,7 +232,7 @@ int VoiceAssistance::ChangeViewToPlayer()           // 播放音乐
 {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[VoiceAssistView] Enter ChangeViewToPlayer");\r
 \r
-    if(!PlayersModel::GetInstance()->HasPlayerPlayed()) {       // 播放过了就不用再初始化\r
+    if (!PlayersModel::GetInstance()->HasPlayerPlayed()) {       // 播放过了就不用再初始化\r
         PlayersListGroup::GetInstance()->SetUpListCase();\r
         PlayersModel::GetInstance()->PlayerInit();\r
     }\r
@@ -580,13 +578,13 @@ void VoiceAssistance::CloseVocassist()
 \r
 static void DeleteTimeTick()\r
 {\r
-    if (g_closeVocassistHandle != NULL) {\r
+    if (g_closeVocassistHandle != nullptr) {\r
         osStatus_t ret = osTimerDelete(g_closeVocassistHandle);\r
         if (ret != osOK) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Delete timer failed!!");\r
             return;\r
         }\r
-        g_closeVocassistHandle = NULL;\r
+        g_closeVocassistHandle = nullptr;\r
     }\r
 }\r
 \r
@@ -634,11 +632,11 @@ void VoiceAssistance::ExitProgress()
         if (quitStatus == CONTINUTE_EXIT_MODE1) {\r
             int phoneStatus = VocassistModel::GetInstance()->GetPhoneDetailStatus();    // 扫描设置此时通话的状态和个数\r
             if (phoneStatus == ONE_ROAD_AND_INCOMING) {\r
-                NativeAbility::GetInstance().ChangeSlice(VIEW_INCOMING_CALL); // 返回来电界面\r
+                NativeAbility::GetInstance().ChangeSlice(VIEW_MAEKPHONE_SAMPLE); // 返回来电界面\r
                 return;\r
             }\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Too long no operate, now exit vocassist");\r
-            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);\r
+            NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN_SAMPLE);\r
             return;\r
         } else if (quitStatus == CONTINUTE_EXIT_MODE2) {\r
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Too long no operate, now change model to vocassist label");\r
@@ -655,20 +653,20 @@ void VoiceAssistance::DelayDisplayTime(int32_t waitSec)
     }\r
     int quitStatus = VocassistModel::GetInstance()->GetExitStatus();\r
     // 删除定时器，打断退出语音助手的操作\r
-    if (g_closeVocassistHandle != NULL && (quitStatus == CONTINUTE_EXIT_MODE1 ||\r
+    if (g_closeVocassistHandle != nullptr && (quitStatus == CONTINUTE_EXIT_MODE1 ||\r
         quitStatus == CONTINUTE_EXIT_MODE2)) {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Interrupt Timer!!");\r
         osStatus_t statusRet = osTimerDelete(g_closeVocassistHandle);\r
         if (statusRet != osOK) {\r
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Delete timer failed!!");\r
         }\r
-        g_closeVocassistHandle = NULL;\r
+        g_closeVocassistHandle = nullptr;\r
         VocassistModel::GetInstance()->SetExitStatus(INTERRUPT_EXIT);\r
     }\r
 \r
     // 创建新的定时器\r
-    g_closeVocassistHandle = osTimerNew((osTimerFunc_t)DelayTimeCallback, osTimerOnce, NULL, NULL);\r
-    if (g_closeVocassistHandle == NULL) {\r
+    g_closeVocassistHandle = osTimerNew((osTimerFunc_t)DelayTimeCallback, osTimerOnce, nullptr, nullptr);\r
+    if (g_closeVocassistHandle == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "New timer failed !!");\r
         return;\r
     }\r
@@ -676,13 +674,13 @@ void VoiceAssistance::DelayDisplayTime(int32_t waitSec)
     osStatus_t statusRet = osTimerStart(g_closeVocassistHandle, tick);\r
     if (statusRet != osOK) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Start timer failed !!");\r
-        if (g_closeVocassistHandle != NULL) {\r
+        if (g_closeVocassistHandle != nullptr) {\r
             statusRet = osTimerDelete(g_closeVocassistHandle);\r
             if (statusRet != osOK) {\r
                 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Delete timer failed !!");\r
                 return;\r
             }\r
-            g_closeVocassistHandle = NULL;\r
+            g_closeVocassistHandle = nullptr;\r
         }\r
         return;\r
     }\r