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

diff --cc code/sdk/application/wearable/fd230app/CMakeLists.txt
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
index 3e3e516,bb6c217..9b8eef2
--- 1/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
--- 2/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/AppViewIDs.h
@@@ -55,17 -55,12 +55,18 @@@ typedef enum : uint16_
      VIEW_QUICK_ACCESS,            // 快速访问
      VIEW_FAST_TRAINING,           // 快速训练
      VIEW_FAST_TRAINING_ATTENTION, // 快速训练项目选择超出提示
 +    /* ----------------------------------- 录音 ----------------------------------- */
 +    VIEW_RECORD,
 +    VIEW_RECORD_LIST,
 +    VIEW_RECORD_PLAY,
 +    VIEW_RECORD_DELETE,
 +    VIEW_RECORD_GOING,
      /* ---------------------------------- 测试界面 ---------------------------------- */
-     VIEW_DIAL,    // 切换表盘
-     VIEW_MESSAGE, // 信息通知
-     VIEW_BLOODO,  // 血氧监测
-     VIEW_ROTATE,  // 模拟表冠
+     VIEW_DIAL,       // 切换表盘
+     VIEW_MESSAGE,    // 信息通知
+     VIEW_BLOODO,     // 血氧监测
+     VIEW_ROTATE,     // 模拟表冠
+     VIEW_DIALUPDATE, // 更新表盘
      /* -------------------------------------------------------------------------- */
      VIEW_MAIN_TEMP,     // 体温界面（暂时不用）
      VIEW_OFFLINEVOICE,  // 语音助手界面(暂时不用)

diff --cc code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
Simple merge

diff --cc code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index 09f1d71,5560ee7..1578992
--- 1/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
--- 2/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
@@@ -165,15 -157,9 +168,16 @@@ namespace OHO
          {VIEW_FAST_TRAINING, &NativeLauncher::InitFastTrainingSlice},
          {VIEW_FAST_TRAINING_ATTENTION, &NativeLauncher::InitFastTrainingAttentionSlice},
  
 +        {VIEW_RECORD, &NativeLauncher::InitRecordingSlice}, // 录音实例化地址
 +        {VIEW_RECORD_LIST, &NativeLauncher::InitRecordingListSlice},
 +        {VIEW_RECORD_PLAY, &NativeLauncher::InitRecordingPlaySlice},
 +        {VIEW_RECORD_DELETE, &NativeLauncher::InitRecordingDeleteSlice},
 +        {VIEW_RECORD_DELETE, &NativeLauncher::InitRecordingDeleteSlice},
 +        {VIEW_RECORD_GOING, &NativeLauncher::InitRecordingGoingSlice},
 +
          {VIEW_MESSAGE, &NativeLauncher::InitMessageSlice},
          {VIEW_ROTATE, &NativeLauncher::InitRotateSlice},
+         {VIEW_DIALUPDATE, &NativeLauncher::InitDialUpdateSlice},
  #ifdef SUPPORT_ALIPAY_SEC
          {VIEW_MAIN_ALIPAY, &NativeLauncher::InitMainAlipaySlice},
  #endif