From: luozheng <1732036298@qq.com>
Date: Fri, 21 Jun 2024 13:12:08 +0000 (+0800)
Subject: Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... 
X-Git-Tag: release_V1.2.70_20241020_135402~973
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F350%2Fhead;p=mirrors%2FFD230.git

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

794e5e63dd82eda07cee08c10bbe22885adf7606
diff --cc code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoicePresenter.h
index f15db763e,94b32d2c6..615d7fdd6
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoicePresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoicePresenter.h
@@@ -2,7 -2,7 +2,7 @@@
   * @Author: luozheng 1732036298@qq.com
   * @Date: 2024-06-20 14:44:22
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-06-21 15:32:01
 - * @LastEditTime: 2024-06-20 15:25:08
++ * @LastEditTime: 2024-06-21 21:07:37
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoicePresenter.h
   */
  #ifndef AI_VOICE_PRESENTER_H
diff --cc code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceView.h
index 12e1a2038,7e2375235..901588968
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/include/AiVoiceView.h
@@@ -2,7 -2,7 +2,7 @@@
   * @Author: luozheng 1732036298@qq.com
   * @Date: 2024-06-08 09:36:01
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-06-21 16:35:00
 - * @LastEditTime: 2024-06-20 19:53:13
++ * @LastEditTime: 2024-06-21 21:07:45
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/respiratorytraining/include/AiVoiceView.h
   */
  #ifndef AI_VOICE_VIEW_H
diff --cc code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp
index b7bb01167,8ece842df..ec2634410
--- 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 +2,7 @@@
   * @Author: luozheng 1732036298@qq.com
   * @Date: 2024-06-20 15:11:17
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-06-21 16:46:34
 - * @LastEditTime: 2024-06-20 16:52:30
++ * @LastEditTime: 2024-06-21 21:07:51
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoicePresenter.cpp
   */
  #include "AppViewIDs.h"
diff --cc code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp
index 51d623256,1386fc2fb..c224ea9cc
--- a/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/aivoice/src/AiVoiceView.cpp
@@@ -2,7 -2,7 +2,7 @@@
   * @Author: luozheng 1732036298@qq.com
   * @Date: 2024-05-07 11:25:58
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-06-21 16:53:20
 - * @LastEditTime: 2024-06-20 20:22:36
++ * @LastEditTime: 2024-06-21 21:07:56
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/AiVoice/src/AiVoiceView.cpp
   */
  #include "aivoice/include/AiVoicePresenter.h"