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
Simple merge

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

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

diff --cc code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index cfadc51,a27e9d6..bbf6d1a
--- 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
@@@ -1121,17 -1134,54 +1140,65 @@@ struct AppViewMappe
          }
          NativeAbility::GetInstance().AddSliceProxy(VIEW_MAIN_STOPWATCH, mainstopwatch);
      }
-     
 +    /*倒计时*/
 +    void NativeLauncher::InitMainCountDownSlice(void)
 +    {
 +        SliceProxy *maincountdown = new AbilitySliceProxy<MainCountDownView, MainCountDownPresenter>;
 +        if (maincountdown == nullptr)
 +        {
 +            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "maincountdown");
 +            return;
 +        }
 +        NativeAbility::GetInstance().AddSliceProxy(VIEW_MAIN_COUNTDOWN, maincountdown);
 +    }
  
+     /* -------------------------------------------------------------------------- */
+     void NativeLauncher::InitSetDesktopSlice(void)
+     {
+         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitSetDesktopSlice");
+         SliceProxy *setDesktopView = new AbilitySliceProxy<SetDesktopView, SetDesktopPresenter>;
+         if (setDesktopView == nullptr)
+         {
+             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "setDesktopView");
+             return;
+         }
+         NativeAbility::GetInstance().AddSliceProxy(VIEW_SET_DESKTOP, setDesktopView);
+     }
+ 
+     void NativeLauncher::InitSetCardSlice(void)
+     {
+         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitSetCardSlice");
+         SliceProxy *setCardView = new AbilitySliceProxy<SetCardView, SetCardPresenter>;
+         if (setCardView == nullptr)
+         {
+             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "setCardView");
+             return;
+         }
+         NativeAbility::GetInstance().AddSliceProxy(VIEW_SET_CARD, setCardView);
+     }
+ 
+     void NativeLauncher::InitAddCardSlice(void)
+     {
+         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitAddCardSlice");
+         SliceProxy *addCardView = new AbilitySliceProxy<AddCardView, AddCardPresenter>;
+         if (addCardView == nullptr)
+         {
+             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "addCardView");
+             return;
+         }
+         NativeAbility::GetInstance().AddSliceProxy(VIEW_ADD_CARD, addCardView);
+     }
+ 
+     void NativeLauncher::InitSetDialSlice(void)
+     {
+         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NativeLauncher::InitSetDialSlice");
+         SliceProxy *setDialView = new AbilitySliceProxy<SetDialView, SetDialPresenter>;
+         if (setDialView == nullptr)
+         {
+             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "setCardView");
+             return;
+         }
+         NativeAbility::GetInstance().AddSliceProxy(VIEW_SET_DIAL, setDialView);
+     }
+ 
  }

diff --cc code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
index 661cafe,7298f26..a0feae8
--- 1/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
@@@ -37,9 -37,11 +37,12 @@@ namespace OHO
          {VIEW_CALLER_LOG, PNG_APPLIST_CALLLOG_IMAGE, PNG_APPLIST_CALLLOG_IMAGE, "通话记录", nullptr},
          {VIEW_PHONE, PNG_APPLIST_CALLER_IMAGE, PNG_APPLIST_CALLER_IMAGE, "电话", nullptr},
          {VIEW_MAIN_STOPWATCH, PNG_APPLIST_STOPWATCH_IMAGE, PNG_APPLIST_STOPWATCH_IMAGE, "秒表", nullptr},
-         //{VIEW_CONNECT_PHONE, PNG_CONNECT_PHONE_IMAGE, PNG_CONNECT_PHONE_IMAGE, "连接手机", nullptr},
-         //{VIEW_LANGUAGE_SWITCH, PNG_CONNECT_PHONE_IMAGE, PNG_CONNECT_PHONE_IMAGE, "语言切换", nullptr},
 +        {VIEW_MAIN_COUNTDOWN, PNG_APPLIST_COUNTDOWN_IMAGE, PNG_APPLIST_COUNTDOWN_IMAGE, "计时器", nullptr},
+         {VIEW_CONNECT_PHONE, PNG_CONNECT_PHONE_IMAGE, PNG_CONNECT_PHONE_IMAGE, "连接手机", nullptr},
+         {VIEW_SET_DESKTOP, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_ALARM_IMAGE, "主题样式", nullptr},
+         {VIEW_SET_CARD, PNG_APPLIST_SETTING_IMAGE, PNG_APPLIST_SETTING_IMAGE, "卡片管理", nullptr},
+         {VIEW_SET_DIAL, PNG_APPLIST_UI_SAMPLE_IMAGE, PNG_APPLIST_UI_SAMPLE_IMAGE, "切换表盘", nullptr},
+     //{VIEW_LANGUAGE_SWITCH, PNG_CONNECT_PHONE_IMAGE, PNG_CONNECT_PHONE_IMAGE, "语言切换", nullptr},
  #ifdef SUPPORT_ALIPAY_SEC
          {VIEW_MAIN_ALIPAY, PNG_APPLIST_ALIPAY_IMAGE, PNG_APPLIST_ALIPAY_IMAGE, "支付宝", nullptr},
  #endif

diff --cc code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchModel.cpp
index 00d3994,00d3994..4922014
--- 1/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchModel.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/stopwatch/src/StopWatchModel.cpp
@@@ -1,5 -1,5 +1,4 @@@
  #include "stopwatch/include/StopWatchModel.h"\r
--#include "cmsis_os2.h"\r
  #include "cmsis_os.h"\r
  #include <cmsis_os2.h>\r
  #include <service/graphic_service.h>\r