From: Caisking <3449750381@qq.com>
Date: Fri, 26 Jan 2024 09:54:24 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1321^2~3
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=08eb9204948c12972632077870ce50d38714527e;p=mirrors%2FFD230.git

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

08eb9204948c12972632077870ce50d38714527e
diff --cc code/sdk/application/wearable/nativeapp/CMakeLists.txt
index 8b1d58c7c,e65b8826e..102ff4e5a
--- a/code/sdk/application/wearable/nativeapp/CMakeLists.txt
+++ b/code/sdk/application/wearable/nativeapp/CMakeLists.txt
@@@ -211,16 -211,16 +211,16 @@@ set(SOURCE
      ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/weather/src/WeatherControlView.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/weather/src/WeatherView.cpp
  
 -    #系统
 +
      ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemPresenter.cpp                       
-     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemView.cpp                                         
+     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemView.cpp
+     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemModel.cpp                                                
      ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemAboutTheWatchView.cpp                     
      ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemSuperviseView.cpp             
      ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemLanguageView.cpp     
-     ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemFactoryResetPresenter.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/system/src/SystemFactoryResetView.cpp
  
 -    #声音与震动
 +
      ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp 
      ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/soundandvibration/src/SoundAndVibrationView.cpp      
      ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/soundandvibration/src/SystemVolumePresenter.cpp           
diff --cc code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h
index d7901dc8a,417d287e7..26c098c18
--- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h
+++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h
@@@ -27,40 -27,38 +27,39 @@@ typedef enum : uint16_
  {
      VIEW_INVALID = 0, // 无效视图
      /* ----------------------------- 每一个id对应一个slice ----------------------------- */
-     VIEW_MAIN = 1,                // 主界面
-     VIEW_SETTING,                 // 设置
-     VIEW_APPLIST,                 // App应用
-     VIEW_MAIN_ALARM,              // 闹钟
-     VIEW_ALARM_POP_UP,            // 闹铃界面
-     VIEW_BLUETOOTH_EARPHONE,      // 连接蓝牙耳机界面
-     VIEW_CALLER_LOG,              // 通话记录界面
-     VIEW_INCOMING_CALL,           // 来电界面
-     VIEW_BLOODOXY,                // 血氧饱和度界面
-     VIEW_COMPASS,                 // 指南针界面
-     VIEW_CONNECT_PHONE,           // 连接手机界面
-     VIEW_INDOORWALK,              // 室内步行
-     VIEW_SHUTDOWN_OR_REBOOT,      // 关机或重启界面
-     VIEW_WEATHER,                 // 天气
-     VIEW_WEATHER_REPORT,          // 气象报告
-     VIEW_FUTURE_WEATHER,          // 未来天气
-     VIEW_GET_WEATHER_DATA_ERROR,  // 获取天气数据失败
-     VIEW_SYSTEM,                  // 系统
-     VIEW_SYSTEM_FACTORY_RESET,    // 系统：恢复出厂设置
-     VIEW_SOUND_VIBRATION,         // 声音与震动
-     VIEW_SYSTEM_VOLUME,           // 系统音量
-     VIEW_CALL_VOLUME,             // 通话音量
-     VIEW_MEDIA_VOLUME,            // 媒体音量
-     VIEW_DISPLAY_BRIGHTNESS,      // 屏幕与亮度
-     VIEW_BRIGHTNESS_CONTROL,      // 亮度调节
-     VIEW_SCREEN_DURATION,         // 亮屏时长
-     VIEW_SECONDARY_FUNCTION,      // 辅助功能
-     VIEW_QUICK_ACCESS,            // 快速访问
-     VIEW_FAST_TRAINING,           // 快速训练
-     VIEW_FAST_TRAINING_ATTENTION, // 快速训练项目选择超出提示
+     VIEW_MAIN = 1,               // 主界面
+     VIEW_SETTING,                // 设置
+     VIEW_APPLIST,                // App应用
+     VIEW_MAIN_ALARM,             // 闹钟
+     VIEW_ALARM_POP_UP,           // 闹铃界面
+     VIEW_BLUETOOTH_EARPHONE,     // 连接蓝牙耳机界面
+     VIEW_CALLER_LOG,             // 通话记录界面
+     VIEW_INCOMING_CALL,          // 来电界面
+     VIEW_BLOODOXY,               // 血氧饱和度界面
+     VIEW_COMPASS,                // 指南针界面
+     VIEW_CONNECT_PHONE,          // 连接手机界面
+     VIEW_INDOORWALK,             // 室内步行
+     VIEW_SHUTDOWN_OR_REBOOT,     // 关机或重启界面
 -    VIEW_DIAL,                   // 切换表盘
+     VIEW_WEATHER,                // 天气
+     VIEW_WEATHER_REPORT,         // 气象报告
+     VIEW_FUTURE_WEATHER,         // 未来天气
+     VIEW_GET_WEATHER_DATA_ERROR, // 获取天气数据失败
+     VIEW_SYSTEM,                 // 系统
+     VIEW_SOUND_VIBRATION,        // 声音与震动
+     VIEW_SYSTEM_VOLUME,          // 系统音量
+     VIEW_CALL_VOLUME,            // 通话音量
+     VIEW_MEDIA_VOLUME,           // 媒体音量
+     VIEW_DISPLAY_BRIGHTNESS,     // 屏幕与亮度
+     VIEW_BRIGHTNESS_CONTROL,     // 亮度调节
+     VIEW_SCREEN_DURATION,        // 亮屏时长
+     VIEW_SECONDARY_FUNCTION,     // 辅助功能
+     VIEW_QUICK_ACCESS,           // 快速访问
+     VIEW_FAST_TRAINING,          // 快速训练
+     VIEW_FAST_TRAINING_ATTENTION,// 快速训练项目选择超出提示
      /* ---------------------------------- 测试界面 ---------------------------------- */
 +    VIEW_DIAL,    // 切换表盘
      VIEW_MESSAGE, // 信息通知
 +    VIEW_BLOODO,  // 血氧监测
      /* -------------------------------------------------------------------------- */
      VIEW_MAIN_TEMP,     // 体温界面（暂时不用）
      VIEW_OFFLINEVOICE,  // 语音助手界面(暂时不用)