Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...

diff --cc code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
index 51971c8,d5c14a6..c77fc93
--- 1/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
--- 2/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
@@@ -2,12 -2,12 +2,14 @@@
   * @Author: luozheng 1732036298@qq.com
   * @Date: 2024-06-20 15:14:43
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-06-26 17:08:39
 - * @LastEditTime: 2024-06-25 17:50:45
++ * @LastEditTime: 2024-06-26 17:39:41
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceModel.h
   */
  #ifndef AI_VOICE_MODEL_H
  #define AI_VOICE_MODEL_H
  
++#include "iostream"
++#include "string"
  #include "iostream"
  #include "string"
  namespace OHOS

diff --cc code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
index 4a9accb,0a6cb1f..2f14a16
--- 1/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
--- 2/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 +2,7 @@@
   * @Author: luozheng 1732036298@qq.com
   * @Date: 2024-06-20 15:14:50
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-06-26 17:35:48
 - * @LastEditTime: 2024-06-25 17:50:59
++ * @LastEditTime: 2024-06-26 17:39:53
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceModel.cpp
   */
  #include "aivoice/include/AiVoiceModel.h"

diff --cc code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp
index 2ceeb66,be7a87a..7be738e
--- 1/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp
--- 2/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 +2,7 @@@
   * @Author: luozheng 1732036298@qq.com
   * @Date: 2024-06-20 15:11:17
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-06-26 17:34:11
 - * @LastEditTime: 2024-06-25 17:39:51
++ * @LastEditTime: 2024-06-26 17:40:11
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp
   */
  #include "AppViewIDs.h"
@@@ -16,6 -16,6 +16,8 @@@
  #include "iostream"
  #include <string>        // For std::string
  #include <unordered_map> // For std::unordered_map
++#include <string>        // For std::string
++#include <unordered_map> // For std::unordered_map
  
  namespace OHOS
  {
@@@ -45,6 -45,6 +47,7 @@@
          WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AiVoicePresenter::OnStart");
          Presenter<AiVoiceView>::OnStart();
          ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
++        ScreenAlwaysOnCtr(OPEN_SCREEN_ALWAYS_ON);
      }
  
      // 页面已经展示后的调用逻辑