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

diff --cc code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h
index b15bc42,6ef0c96..c53c8f9
--- 1/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h
--- 2/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h
+++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h
@@@ -46,22 -45,16 +46,18 @@@ typedef enum : uint16_
      VIEW_FUTURE_WEATHER,         // 未来天气
      VIEW_GET_WEATHER_DATA_ERROR, // 获取天气数据失败
      VIEW_SYSTEM,                 // 系统
-     VIEW_SYSTEM_ABOUT_WATCH,     // 系统：关于手表
-     VIEW_SYSTEM_SUPERVISE,       // 系统：监管
      VIEW_SYSTEM_SYSTEM_LANGUAGE, // 系统：系统语言
-     VIEW_SYSTEM_REBOOT,          // 系统：重新启动
-     VIEW_SYSTEM_SHOUTDOWN,       // 系统：关机
      VIEW_SYSTEM_FACTORY_RESET,   // 系统：恢复出厂设置
 +    /* ---------------------------------- 测试界面 ---------------------------------- */
 +    VIEW_MESSAGE, // 信息通知
      /* -------------------------------------------------------------------------- */
 -    VIEW_MAIN_TEMP,              // 体温界面（暂时不用）
 -    VIEW_OFFLINEVOICE,           // 语音助手界面(暂时不用)
 -    VIEW_MAIN_ACTIVITY,          // 记录步数界面(暂时不用)
 -    VIEW_UISAMPLE,               // 示例(暂时不用)
 +    VIEW_MAIN_TEMP,     // 体温界面（暂时不用）
 +    VIEW_OFFLINEVOICE,  // 语音助手界面(暂时不用)
 +    VIEW_MAIN_ACTIVITY, // 记录步数界面(暂时不用)
 +    VIEW_UISAMPLE,      // 示例(暂时不用)
      /* -------------------------------------------------------------------------- */
 -    VIEW_MAX_INTER_APP,          // 在此之前添加native应用ID.
 -    VIEW_EXTERN_APP = 0xFFFE,    // 三方应用
 +    VIEW_MAX_INTER_APP,       // 在此之前添加native应用ID.
 +    VIEW_EXTERN_APP = 0xFFFE, // 三方应用
      VIEW_INVALIDE_APP = 0xFFFF,
  } AppViewId;
  

diff --cc code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
index c562ef3,30dc708..8cd4477
--- 1/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
--- 2/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
+++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
@@@ -43,20 -43,13 +43,16 @@@ namespace OHO
          void InitDialSlice(void);
          /* ----------------------------------- 天气 ----------------------------------- */
          void InitWeatherSlice(void);
 -        void InitWeatherReportSlice(void); 
 -        void InitFutureWeatherSlice(void);  
 +        void InitWeatherReportSlice(void);
 +        void InitFutureWeatherSlice(void);
          void InitGetWeatherDataErrorSlice(void);
          /* -------------------------------------------------------------------------- */
-         void InitSystemSlice(void);
-         void InitSystemAboutWatchSlice(void);
-         void InitSystemSuperviseSlice(void);
-         void InitSystemLanguageSlice(void);
-         void InitSystemRebootSlice(void);
-         void InitSystemShoutDownSlice(void);
-         void InitSystemFactoryResetSlice(void);
+         void InitSystemSlice(void);                          
+         void InitSystemLanguageSlice(void);            
 -        void InitSystemFactoryResetSlice(void);      
++        void InitSystemFactoryResetSlice(void);   
++        
 +        /* -------------------------------------------------------------------------- */
-         void InitMessageSlice(void);
- 
++        void InitMessageSlice(void);   
      private:
          void InitAllNativeSlices(void);
  

diff --cc code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
index 753c2be,6ad398e..ee1b0f6
--- 1/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
--- 2/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp
@@@ -129,21 -115,12 +121,17 @@@ namespace OHO
          {VIEW_FUTURE_WEATHER, &NativeLauncher::InitFutureWeatherSlice},               // 未来天气
          {VIEW_GET_WEATHER_DATA_ERROR, &NativeLauncher::InitGetWeatherDataErrorSlice}, // 获取天气数据失败
          {VIEW_SYSTEM, &NativeLauncher::InitSystemSlice},                              // 系统实例化地址
-         {VIEW_SYSTEM_ABOUT_WATCH, &NativeLauncher::InitSystemAboutWatchSlice},        // 系统:关于手表实例化地址
-         {VIEW_SYSTEM_SUPERVISE, &NativeLauncher::InitSystemSuperviseSlice},           // 系统:监管实例化地址
          {VIEW_SYSTEM_SYSTEM_LANGUAGE, &NativeLauncher::InitSystemLanguageSlice},      // 系统:系统语言实例化地址
-         {VIEW_SYSTEM_REBOOT, &NativeLauncher::InitSystemRebootSlice},                 // 系统:重启实例化地址
-         {VIEW_SYSTEM_SHOUTDOWN, &NativeLauncher::InitSystemShoutDownSlice},           // 系统:关机实例化地址
          {VIEW_SYSTEM_FACTORY_RESET, &NativeLauncher::InitSystemFactoryResetSlice},    // 系统:恢复出厂设置实例化地址
 -        //{VIEW_MAIN_ACTIVITY, &NativeLauncher::InitActivitySlice},
 -        //{VIEW_OFFLINEVOICE, &NativeLauncher::InitOfflineVoice},
 -        //{VIEW_MAIN_TEMP, &NativeLauncher::InitMainTempSlice},
 -        //{VIEW_UISAMPLE, &NativeLauncher::InitUISampleSlice}
 +
 +        {VIEW_MESSAGE, &NativeLauncher::InitMessageSlice},
 +
 +#if 0
 +        {VIEW_MAIN_ACTIVITY, &NativeLauncher::InitActivitySlice},
 +        {VIEW_OFFLINEVOICE, &NativeLauncher::InitOfflineVoice},
 +        {VIEW_MAIN_TEMP, &NativeLauncher::InitMainTempSlice},
 +        {VIEW_UISAMPLE, &NativeLauncher::InitUISampleSlice}
 +#endif
      };
  
      static const ViewIdToString VIEW_MAPPER[] = {