Merge #783 into sdk602patch0626 from refs/changes/783/head

Code review from 罗正

* refs/changes/783/head: (6 commits squashed)

  - 更改下拉蓝牙图标
    添加睡眠图标更新函数，还未适配接口等待联调

  - 1.修复applist心率图标大小不一致问题，修复卡片管理图片为透明背景
    2.将applist中勿扰，卡片管理，更换表盘，省电模式移动到setting

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

  - 添加按键拦截功能(目前只在function键双击添加)，若intercept_slice_ids数组中有给定的VIEWID则不触发该事件

  - 修复设置视图死机问题

  - 语言界面第一次启动逻辑修改

Signed-off-by: 罗正 <1732036298@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/783

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index dbcaf05..c023335 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
@@ -317,6 +317,7 @@ namespace OHOS
     static constexpr const char *PNG_APPLIST_INFORMATION_IMAGE = APP_LIST_PATH "/information.bin";  // 计算器
     static constexpr const char *PNG_APPLIST_MUSIC_IMAGE = APP_LIST_PATH "/music.bin";              // 音乐
     static constexpr const char *PNG_APPLIST_SCHEDULE_IMAGE = APP_LIST_PATH "/schedule.bin";
+    static constexpr const char *PNG_APPLIST_SMART_IMAGE = APP_LIST_PATH "/smart.bin";              //语音助手
     // AppList hexagon icon
     static constexpr const char *PNG_APPLIST_DEFAULT_IMG = APP_RES_PATH "/regular_hexagon.bin";
     static constexpr const char *PNG_APPLIST_NOTSETUSE_IMG = APP_RES_PATH "/regular_hexagon_inverse.bin";

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
index bcdddc2..9b732f3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
@@ -80,18 +80,16 @@ namespace OHOS
         {VIEW_TAKEPHOTOS, PNG_APPLIST_TACKEPHOTOS_IMAGE, PNG_APPLIST_TACKEPHOTOS_IMAGE, PNG_APPLIST_DEFAULT_IMG, "遥控拍照", STR_REMOTE_SHOOTING, nullptr},
         {VIEW_MAIN_ALARM, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_ALARM_IMAGE, PNG_APPLIST_DEFAULT_IMG, "闹钟", STR_ALARM, nullptr},
         {VIEW_FIND_PHONE, PNG_APPLIST_FINDPHONE_IMAGE, PNG_APPLIST_FINDPHONE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "查找手机", STR_FIND_PHONE, nullptr},
-        /* ------------------------------- 放入设置中后将会屏蔽 ------------------------------- */
-        {VIEW_DNOTDISTURB, PNG_APPLIST_DISTURB_IMAGE, PNG_APPLIST_DISTURB_IMAGE, PNG_APPLIST_DEFAULT_IMG, "勿扰模式", STR_DO_NOT_DISTURB, nullptr},
-        {VIEW_ADD_CARD, PNG_APPLIST_CARDSET_IMAGE, PNG_APPLIST_CARDSET_IMAGE, PNG_APPLIST_DEFAULT_IMG, "卡片管理", STR_CARD_MANAGEMENT, nullptr},
-        {VIEW_SET_DIAL_STYLE, PNG_APPLIST_CHANGEDIAL_IMAGE, PNG_APPLIST_CHANGEDIAL_IMAGE, PNG_APPLIST_DEFAULT_IMG, "更换表盘", STR_WATCH_FACE, nullptr},
-        {VIEW_SAVEELE, PNG_APPLIST_SAVEELE_IMAGE, PNG_APPLIST_SAVEELE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "省电模式", STR_POWER_SAVE_MODE, nullptr},
-        /* -------------------------------------------------------------------------- */
         // {VIEW_MUSIC_PLAYER, PNG_APPLIST_MUSIC_IMAGE, PNG_APPLIST_MUSIC_IMAGE, PNG_APPLIST_DEFAULT_IMG, "音乐播放器", STR_MUSIC, nullptr},
-        {VIEW_OFFLINEVOICE, PNG_APPLIST_VOCASSIST_IMAGE, PNG_APPLIST_VOCASSIST_IMAGE, PNG_APPLIST_DEFAULT_IMG, "语音助手", STR_VOICE_ASSISTANT, nullptr},
+        {VIEW_OFFLINEVOICE, PNG_APPLIST_SMART_IMAGE, PNG_APPLIST_SMART_IMAGE, PNG_APPLIST_DEFAULT_IMG, "语音助手", STR_VOICE_ASSISTANT, nullptr},
         {VIEW_SCHEDULE, PNG_APPLIST_SCHEDULE_IMAGE, PNG_APPLIST_SCHEDULE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "schedule", STR_SCHEDULE, nullptr},
         {VIEW_SETTING, PNG_APPLIST_SETTING_IMAGE, PNG_APPLIST_SETTING_IMAGE, PNG_APPLIST_DEFAULT_IMG, "设置", STR_SETTINGS, nullptr},
 #if 0
 /*屏蔽Slice*/
+        {VIEW_DNOTDISTURB, PNG_APPLIST_DISTURB_IMAGE, PNG_APPLIST_DISTURB_IMAGE, PNG_APPLIST_DEFAULT_IMG, "勿扰模式", STR_DO_NOT_DISTURB, nullptr},
+        {VIEW_ADD_CARD, PNG_APPLIST_CARDSET_IMAGE, PNG_APPLIST_CARDSET_IMAGE, PNG_APPLIST_DEFAULT_IMG, "卡片管理", STR_CARD_MANAGEMENT, nullptr},
+        {VIEW_SET_DIAL_STYLE, PNG_APPLIST_CHANGEDIAL_IMAGE, PNG_APPLIST_CHANGEDIAL_IMAGE, PNG_APPLIST_DEFAULT_IMG, "更换表盘", STR_WATCH_FACE, nullptr},
+        {VIEW_SAVEELE, PNG_APPLIST_SAVEELE_IMAGE, PNG_APPLIST_SAVEELE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "省电模式", STR_POWER_SAVE_MODE, nullptr},
         {VIEW_SOUND_VIBRATION, PNG_APPLIST_VOICE_IMAGE, PNG_APPLIST_VOICE_IMAGE, PNG_APPLIST_DEFAULT_IMG, "声音", STR_SOUND, nullptr},
         {VIEW_PHONEDIR, PNG_APPLIST_CALLLOG_IMAGE, PNG_APPLIST_CALLLOG_IMAGE, PNG_APPLIST_DEFAULT_IMG, "常用联系人", STR_FAVORITE_CONTACTS, nullptr},
         {VIEW_THEME_STYLE, PNG_APPLIST_THEME_IMAGE, PNG_APPLIST_THEME_IMAGE, PNG_APPLIST_DEFAULT_IMG, "显示方式", STR_DISPLAY_MODE, nullptr},

diff --git a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
index 45fd84a..d7e89d3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-03-28 14:17:43
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-03 20:21:27
+ * @LastEditTime: 2024-08-24 18:07:45
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/languagecode/src/LanguageSwitchPresenter.cpp
  */
 #include "AppViewIDs.h"
@@ -96,20 +96,24 @@ namespace OHOS
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "RespiratoryTrainingPresenter::OnClick");
 
         /* -------------------------------------------------------------------------- */
-        if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == false)
+        if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true)
         {
             NativeAbility::GetInstance().EnterSlice(VIEW_WATCH_QR_CODE);
         }
-        else if(ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == true)
-        {
-            if (ConfigModel::GetInstance()->GetLanguage() == -1)
-            {
-                uapi_set_screen_on_api();
-                NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
-                ConfigModel::GetInstance()->SetisFirstTimeStart(false);
-                NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN);
-            }
-        }
+        // if (ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == false)
+        // {
+        //     NativeAbility::GetInstance().EnterSlice(VIEW_WATCH_QR_CODE);
+        // }
+        // else if(ConfigModel::GetInstance()->GetisFirstTimeStart() == true && SettingModel::GetInstance().GetPhoneConnectStatus() == true)
+        // {
+        //     if (ConfigModel::GetInstance()->GetLanguage() == -1)
+        //     {
+        //         uapi_set_screen_on_api();
+        //         NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN);
+        //         ConfigModel::GetInstance()->SetisFirstTimeStart(false);
+        //         NativeAbility::GetInstance().SetDefaultSliceId(VIEW_MAIN);
+        //     }
+        // }
         /* -------------------------------------------------------------------------- */
 
         UNUSED(event);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h
index a424858..c72d98d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-08-21 11:54:00
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-23 15:00:47
+ * @LastEditTime: 2024-08-24 10:15:32
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/include/dropdown/DropDownCardPage1.h
  */
 #ifndef __DROPDOWN_CARD_PAGE1_H__
@@ -50,6 +50,7 @@ namespace OHOS
 
         UIToggleButton *GetDropDownCardPage1_ToggleButton(int index);
         void UpdateDnotdisturbState(bool state);
+        void UpdateSleepModelState(bool state);
 
     private:
         UIToggleButton *ToggleButtonInit(ToggleButtonConfig &toggleButtonConfig);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp
index acf9616..87e58c3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-08-21 11:54:00
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-23 15:26:00
+ * @LastEditTime: 2024-08-24 10:19:09
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dropdown/DropDownCardPage1.cpp
  */
 #include "main/include/dropdown/DropDownCardPage1.h"
@@ -31,6 +31,7 @@ namespace OHOS
     // Image src
     static constexpr const char *DROPDOWN_BT_CONNECT_IMAGE = "/user/res/dropdown/DROPDOWN_BT_CONNECT.bin";
     static constexpr const char *DROPDOWN_BT_DISCONNECT_IMAGE = "/user/res/dropdown/DROPDOWN_BT_DISCONNECT.bin";
+    static constexpr const char *DROPDOWN_BT_IMAGE = "/user/res/dropdown/DROPDOWN_BT.bin";
 
     static constexpr const char *DROPDOWN_4G_ON_IMAGE = "/user/res/dropdown/DROPDOWN_4G_ON.bin";
     static constexpr const char *DROPDOWN_4G_OFF_IMAGE = "/user/res/dropdown/DROPDOWN_4G_OFF.bin";
@@ -76,16 +77,7 @@ namespace OHOS
         if (viewId == DROPDOWN_BT_TOGGLEBUTTON_VIEWID) // 蓝牙开关
         {
             state = toggleButton[DropDownCardPage1::toggleButton_BT]->GetState();
-            if (state)
-            {
-                start_custom_ble_service(); // 主动开启蓝牙
-                ConfigModel::GetInstance()->SetClassicBlueToothState(true);
-            }
-            else
-            {
-                stop_custom_ble_service();
-                ConfigModel::GetInstance()->SetClassicBlueToothState(false);
-            }
+            NativeAbility::GetInstance().EnterSlice(VIEW_CLASSIC_BLUETOOTH);
         }
         else if (viewId == DROPDOWN_4G_TOGGLEBUTTON_VIEWID) // 4G开关
         {
@@ -189,11 +181,11 @@ namespace OHOS
         bool state_dnotdisturb = DnotDisturbModel::GetInstance().GetDoNotDisturbModeEnabled();
 
         ToggleButtonConfig toggleButtonConfig[] = {
-            {0, 0, 100, 100, DROPDOWN_BT_TOGGLEBUTTON_VIEWID, DROPDOWN_BT_CONNECT_IMAGE, DROPDOWN_BT_DISCONNECT_IMAGE, true, state_bt},
+            {0, 0, 100, 100, DROPDOWN_BT_TOGGLEBUTTON_VIEWID, DROPDOWN_BT_IMAGE, DROPDOWN_BT_IMAGE, true, true},
             {110, 0, 100, 100, DROPDOWN_4G_TOGGLEBUTTON_VIEWID, DROPDOWN_4G_ON_IMAGE, DROPDOWN_4G_OFF_IMAGE, true, state_4g},
             {220, 0, 100, 100, DROPDOWN_ALIPAY_TOGGLEBUTTON_VIEWID, DROPDOWN_ALIPAY_IMAGE, DROPDOWN_ALIPAY_IMAGE, true, true},
             {330, 0, 100, 100, DROPDOWN_SAVEPOWER_TOGGLEBUTTON_VIEWID, state_savepower ? DROPDOWN_SAVEPOWER_ON_IMAGE : DROPDOWN_SAVEPOWER_OFF_IMAGE, state_savepower ? DROPDOWN_SAVEPOWER_ON_IMAGE : DROPDOWN_SAVEPOWER_OFF_IMAGE, true, state_savepower},
-            {55, 100, 100, 100, DROPDOWN_SLEEP_TOGGLEBUTTON_VIEWID, DROPDOWN_SLEEP_ON_IMAGE, DROPDOWN_SLEEP_OFF_IMAGE, true, state_sleep},
+            {55, 100, 100, 100, DROPDOWN_SLEEP_TOGGLEBUTTON_VIEWID, state_sleep ? DROPDOWN_SLEEP_ON_IMAGE : DROPDOWN_SLEEP_OFF_IMAGE, state_sleep ? DROPDOWN_SLEEP_ON_IMAGE : DROPDOWN_SLEEP_OFF_IMAGE, true, state_sleep},
             {165, 100, 100, 100, DROPDOWN_DNOTDISTURB_TOGGLEBUTTON_VIEWID, state_dnotdisturb ? DROPDOWN_DNOTDISTURB_ON_IMAGE : DROPDOWN_DNOTDISTURB_OFF_IMAGE, state_dnotdisturb ? DROPDOWN_DNOTDISTURB_ON_IMAGE : DROPDOWN_DNOTDISTURB_OFF_IMAGE, true, state_dnotdisturb},
             {275, 100, 100, 100, DROPDOWN_SETTING_TOGGLEBUTTON_VIEWID, DROPDOWN_SETTING_IMAGE, DROPDOWN_SETTING_IMAGE, true, true},
         };
@@ -239,4 +231,14 @@ namespace OHOS
             toggleButton[DropDownCardPage1::toggleButton_DNOTDISTURB]->SetImages(ImageSrc, ImageSrc);
         }
     }
+
+    // 更新睡眠模式开关
+    void DropDownCardPage1::UpdateSleepModelState(bool state)
+    {
+        if (toggleButton[DropDownCardPage1::toggleButton_SLEEP] != nullptr)
+        {
+            const char *ImageSrc = state ? DROPDOWN_SLEEP_ON_IMAGE : DROPDOWN_SLEEP_OFF_IMAGE;
+            toggleButton[DropDownCardPage1::toggleButton_DNOTDISTURB]->SetImages(ImageSrc, ImageSrc);
+        }
+    }
 }
\ No newline at end of file

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
index d3a7c65..2f89e3b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-07-18 14:55:27
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-22 20:02:18
+ * @LastEditTime: 2024-08-24 14:48:41
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootandshutdown/src/RebootAndShutdownModel.cpp
  */
 
@@ -24,6 +24,15 @@
 extern "C" uint8_t uapi_dev_runtime_get_lock_status(void);
 namespace OHOS
 {
+    static uint16_t intercept_slice_ids[] = {
+        VIEW_INVALID,
+        VIEW_SAVEBAT,      // 省电模式界面
+        VIEW_BLOOD_CHECK,  // 血氧检测界面
+        VIEW_HEART_CHECK,  // 心率检测界面
+        VIEW_TRAININGCRAD, // 训练控制卡片
+        VIEW_TEST,         // 产测测试界面
+    };
+
     RebootAndShutdownModel::RebootAndShutdownModel() {}
 
     RebootAndShutdownModel::~RebootAndShutdownModel() {}
@@ -91,12 +100,6 @@ namespace OHOS
         GraphicService::GetInstance()->PostGraphicEvent(std::bind(PowerKeyLongPressCallBack));
     }
 
-    static void SOSKeyLongPress(void)
-    {
-        start_SOS_phone_dail();
-    }
-
-
     /*注册电源键的长按事件*/
     bool RebootAndShutdownModel::RegisterPowerKeyLongPressEvent(void)
     {
@@ -107,12 +110,6 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Register PowerKey LongPress Event error, ret = %d", ret);
             return false;
         }
-        ret = uapi_button_register_event_cb(SOSKeyLongPress, BUTTON1_LONGPRESS_8S);
-        if (ret != ERRCODE_SUCC)
-        {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Register PowerKey LongPress Event error, ret = %d", ret);
-            return false;
-        }
         return true;
     }
 
@@ -274,19 +271,24 @@ namespace OHOS
         }
     }
 
+    static void SOSKeyLongPress(void)
+    {
+        start_SOS_phone_dail();
+    }
+
     static void HandFuncKeyOnLongPress(void)
     {
-        GraphicService::GetInstance()->PostGraphicEvent(std::bind(FuncKeyOnLongPressCallBack));
+        GraphicService::GetInstance()->PostGraphicEvent(std::bind(SOSKeyLongPress));
     }
 
-    /*注册功能键的长按(2s)事件*/
+    /*注册功能键的长按(8s)事件*/
     bool RebootAndShutdownModel::RegisterFuncKeyLongPressEvent(void)
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "RebootAndShutdownModel::RegisterFuncKeyLongPressEvent");
-        int32_t ret = uapi_button_register_event_cb(HandFuncKeyOnLongPress, BUTTON1_LONGPRESS_2S);
+        int32_t ret = uapi_button_register_event_cb(SOSKeyLongPress, BUTTON1_LONGPRESS_8S);
         if (ret != ERRCODE_SUCC)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Register FuncKey LongPress Event error, ret = %d", ret);
+            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Register PowerKey LongPress Event error, ret = %d", ret);
             return false;
         }
         return true;
@@ -381,6 +383,14 @@ namespace OHOS
             return;
         }
 
+        uint16_t current_slice_id = OHOS::NativeAbility::GetInstance().GetCurSliceId();
+        for (uint16_t i = 0; i < sizeof(intercept_slice_ids) / sizeof(intercept_slice_ids); i++)
+        {
+            if (intercept_slice_ids[i] == current_slice_id)
+            {
+                return;
+            }
+        }
         const power_display_svr_api_t *display_api = power_display_svr_get_api();
         if (!display_api)
         {
@@ -438,7 +448,7 @@ namespace OHOS
         RegisterPowerKeyDoubleClickEvent();
         RegisterPowerKeyLongPressEvent();
         RegisterFuncKeyPressEvent();
-        // RegisterFuncKeyLongPressEvent();
+        RegisterFuncKeyLongPressEvent();
         // RegisterFuncKeyClickEvent();
         RegisterFuncKeyDoubleClickEvent();
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h
index d7d7d36..fde1d10 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-03-30 09:14:38
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-06-17 18:34:09
+ * @LastEditTime: 2024-08-24 17:50:33
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h
  */
 
@@ -19,7 +19,7 @@
 
 namespace OHOS
 {
-    static const uint16_t SETTING_ITEM_COUNT = 10;
+    static const uint16_t SETTING_ITEM_COUNT = 15;
     class SettingModel
     {
     public:

diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp
index f3e5351..b9e16be 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-03-27 19:48:49
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-07-22 11:26:36
+ * @LastEditTime: 2024-08-24 10:40:42
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp
  */
 
@@ -68,7 +68,7 @@ namespace OHOS
         Icon.SetPosition(SETTING_ICON_X, SETTING_SICON_Y, SETTING_SICON_W, SETTING_SICON_H);
         Icon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
         Icon.SetAutoEnable(false);
-        Icon.SetResizeMode(UIImageView::FILL);
+        Icon.SetResizeMode(UIImageView::SCALE_DOWN);
         Icon.SetStyle(STYLE_BORDER_RADIUS, 100);
 
         settingLabelExt.SetPosition(SETTINGLABELEXT_X, SETTINGLABELEXT_Y, SETTINGLABELEXT_W, SETTINGLABELEXT_H);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
index 2dfd7d3..7afff69 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-02-18 09:09:13
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-08-20 17:42:37
+ * @LastEditTime: 2024-08-24 10:43:23
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
  */
 #include "settings/include/SettingModel.h"
@@ -31,6 +31,10 @@ namespace OHOS
         settings[index++] = {VIEW_SOUND_VIBRATION, PNG_SETTINGS_SOUND_VIBRATION, STR_SOUND_AND_VIBRATION, true};
         settings[index++] = {VIEW_THEME_STYLE, PNG_SETTINGS_DISPLAY_MODE, STR_DISPLAY_MODE, true};
         settings[index++] = {VIEW_MOTION_RECOGNITION, PNG_SETTINGS_MOTION_RECOGNITION, STR_MOTION_RECOGNITION, true};
+        settings[index++] = {VIEW_DNOTDISTURB, PNG_APPLIST_DISTURB_IMAGE, STR_DO_NOT_DISTURB, true};
+        settings[index++] = {VIEW_ADD_CARD, PNG_APPLIST_CARDSET_IMAGE, STR_CARD_MANAGEMENT, true};
+        settings[index++] = {VIEW_SET_DIAL_STYLE, PNG_APPLIST_CHANGEDIAL_IMAGE, STR_WATCH_FACE, true};
+        settings[index++] = {VIEW_SAVEELE, PNG_APPLIST_SAVEELE_IMAGE, STR_POWER_SAVE_MODE, true};
         settings[index++] = {VIEW_SYSTEM, PNG_SETTINGS_SYSTEM, STR_SYSTEM, true};
         settings[index++] = {VIEW_REBOOTANDSHUTDOWN, PNG_SETTINGS_SHUTDOWN_AND_RESTART, STR_SHUTDOWN_AND_RESTART, true};
         usedLen = index;
@@ -51,7 +55,7 @@ namespace OHOS
     {
         return phoneConnectStatus;
     }
-    
+
     // 获取蓝牙耳机连接状态
     bool SettingModel::GetEarPhoneConnectStatus(void)
     {
@@ -82,7 +86,7 @@ namespace OHOS
         {
             PullUpDownView::GetInstance()->UpdateEarPhoneStatus(status);
         }
-        if(BluetoothServiceOptionsView::GetInstance())
+        if (BluetoothServiceOptionsView::GetInstance())
         {
             BluetoothServiceOptionsView::GetInstance()->Button_UPdata();
         }
@@ -96,11 +100,11 @@ namespace OHOS
         {
             PullUpDownView::GetInstance()->UpdateBlueToothStatus(status);
         }
-        if(BluetoothServiceOptionsView::GetInstance())
+        if (BluetoothServiceOptionsView::GetInstance())
         {
             BluetoothServiceOptionsView::GetInstance()->Button_UPdata();
         }
-        if(PlayersView::GetInstance())
+        if (PlayersView::GetInstance())
         {
             PlayersView::GetInstance()->UpdatePlayerView();
         }

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/applist_icon/cardsetting.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/applist_icon/cardsetting.bin
index dc8bad1..39a8599 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/applist_icon/cardsetting.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/applist_icon/cardsetting.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1130a2101fe4c0ccbd6a5164a9af8ae2d81807012b0e8ae9f76ed19f45aafa6c
+oid sha256:388946b13924e39463aadbe9d93620c37c12704674420c7f6b4fe31177941b6a
 size 5544

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/applist_icon/heart.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/applist_icon/heart.bin
index 176abfb..f947dbb 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/applist_icon/heart.bin
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/applist_icon/heart.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8f7e5817109707da32956652c49da6487ec846336be684534feccc93e151062
-size 4504
+oid sha256:6746f5f4be93b865f5602687e3076c8b478f77b6aa30e84a6cb18597509c631d
+size 5544

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/DROPDOWN_BT.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/DROPDOWN_BT.bin
new file mode 100644 (file)
index 0000000..a068ab0
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/dropdown/DROPDOWN_BT.bin
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efec424a5d8eb26475b141ebd7c5df51af2a8405cb8cbdf4326b710a9ffb0478
+size 6824