From: luozheng <1732036298@qq.com>
Date: Mon, 8 Apr 2024 08:55:06 +0000 (+0800)
Subject: Merge branch 'xts_origin' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230... 
X-Git-Tag: release_V1.2.70_20241020_135402~1200^2~22^2~1^2
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=a476c27584f5cb941e0985b8ff12ad4b26f08fb2;p=mirrors%2FFD230.git

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

a476c27584f5cb941e0985b8ff12ad4b26f08fb2
diff --cc code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
index cfadc512f,a27e9d6d4..bbf6d1a16
--- a/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 661cafeab,7298f26df..a0feae8c7
--- a/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_MAIN_COUNTDOWN, PNG_APPLIST_COUNTDOWN_IMAGE, PNG_APPLIST_COUNTDOWN_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_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 00d39948c,00d39948c..492201480
--- a/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"
--#include "cmsis_os2.h"
  #include "cmsis_os.h"
  #include <cmsis_os2.h>
  #include <service/graphic_service.h>