From: luozheng <1732036298@qq.com>
Date: Wed, 24 Apr 2024 06:29:25 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1025^2~74
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=refs%2Fchanges%2F76%2F1;p=mirrors%2FFD230.git

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

4f55f33469a8d6ad4ba90812934ab160d03d4a20
diff --cc code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
index 4aae8b9e8,b3b0628f7..ede6b3404
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
@@@ -106,10 -106,11 +106,11 @@@ typedef enum : uint16_
  #ifdef SUPPORT_ALIPAY_SEC
      VIEW_MAIN_ALIPAY,
  #endif
-     VIEW_SET_DESKTOP,//显示方式
-     VIEW_SET_CARD,
-     VIEW_ADD_CARD,
-     VIEW_SET_DIAL,
 -    VIEW_SET_DESKTOP,         // 主题样式
++    VIEW_SET_DESKTOP,         // 主题样式//显示方式
+     VIEW_SET_CARD,            // 卡片管理
+     VIEW_ADD_CARD,            // 添加卡片
+     VIEW_SET_DIAL,            // 切换表盘
+ 
      VIEW_MAX_INTER_APP,       // 在此之前添加native应用ID.
      VIEW_EXTERN_APP = 0xFFFE, // 三方应用
      VIEW_INVALIDE_APP = 0xFFFF,
diff --cc code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp
index bc677cbb0,a322c4a45..ae0e81756
--- a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionPresenter.cpp
@@@ -2,7 -2,7 +2,7 @@@
   * @Author: luozheng 1732036298@qq.com
   * @Date: 2024-03-28 14:17:43
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-04-24 11:42:10
 - * @LastEditTime: 2024-04-23 18:12:26
++ * @LastEditTime: 2024-04-24 14:26:22
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/MotionRecognitionPresenter.cpp
   */
  #include "AppViewIDs.h"
diff --cc code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp
index de95455e1,3547c014b..46d56c4d8
--- a/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp
@@@ -2,7 -2,7 +2,7 @@@
   * @Author: luozheng 1732036298@qq.com
   * @Date: 2024-04-23 17:28:52
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-04-24 11:26:57
 - * @LastEditTime: 2024-04-23 19:09:24
++ * @LastEditTime: 2024-04-24 14:26:44
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/motionrecognition/src/MotionRecognitionView.cpp
   */
  #include "motionrecognition/include/MotionRecognitionPresenter.h"
diff --cc code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
index a34d66380,c152acb1a..8b72fe4c8
--- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
@@@ -2,7 -2,7 +2,7 @@@
   * @Author: luozheng 1732036298@qq.com
   * @Date: 2024-04-23 09:59:32
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-04-24 11:18:34
 - * @LastEditTime: 2024-04-23 17:00:37
++ * @LastEditTime: 2024-04-24 14:27:03
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp
   */
  #include "AppViewIDs.h"
diff --cc code/sdk/drivers/peripheral/utils/custom_utils.c
index 8d3409e34,4a84c503a..726d60951
--- a/code/sdk/drivers/peripheral/utils/custom_utils.c
+++ b/code/sdk/drivers/peripheral/utils/custom_utils.c
@@@ -227,12 -226,10 +227,13 @@@ void startup_post_init_task(void
      initializeVolume();
      initializeVibrationModel();
      initializeSilentModel();
 -
 +    // initializeVoLTECall();
 +    //initialize4GCapability();
 +    //initializeMotionRecognition();
 +    
      LOS_Msleep(5000);
      addressbookToRead(NULL);
+     up_report_timer();
      if ( poweron_cat1_on_bootup_flag() )
      {
          PRINT("PowerOn Cat1 !\r\n");