修改设置视图中开关机icon，优化显示方式视图的退出方式，修改开关机视图的incon图标

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
index 9f88639..f2bf91c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/UiConfig.h
@@ -294,7 +294,9 @@ namespace OHOS
     static constexpr const char *PNG_SETTINGS_DISPLAY_MODE = APP_RES_PATH "/settings/SETTINGS_DISPLAY_MODE.bin";             // 显示方式
     static constexpr const char *PNG_SETTINGS_MOTION_RECOGNITION = APP_RES_PATH "/settings/SETTINGS_MOTION_RECOGNITION.bin"; // 运动识别
     static constexpr const char *PNG_SETTINGS_SYSTEM = APP_RES_PATH "/settings/SETTINGS_SYSTEM.bin";                         // 系统
-    static constexpr const char *PNG_SETTINGS_SETTINGS_POWER_CONTROL = APP_RES_PATH "/settings/SETTINGS_POWER_CONTROL.bin";  // 关机和重启
+    static constexpr const char *PNG_SETTINGS_SHUTDOWN_AND_RESTART = APP_RES_PATH "/settings/SETTINGS_SHUTDOWN_AND_RESTART.bin";  // 关机和重启
+    static constexpr const char *PNG_SETTINGS_SETTTING_SHUTDOWN = APP_RES_PATH "/settings/SETTTING_SHUTDOWN.bin";            // 关机
+    static constexpr const char *PNG_SETTINGS_SETTTING_REBOOT = APP_RES_PATH "/settings/SETTTING_REBOOT.bin";                // 重启
     /* ---------------------------------- 消息中心 ---------------------------------- */
     static constexpr const char *PNG_Message_System = APP_RES_PATH "/message/system-icon.bin"; // 系统消息
     static constexpr const char *PNG_Message_Note = APP_RES_PATH "/message/message-icon.bin";  // 短信

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootDeviceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootDeviceView.cpp
index bd71405..cad3c66 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootDeviceView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootDeviceView.cpp
@@ -64,7 +64,9 @@ bool RebootDeviceView::ShowUpRebootDeviceView()
         }
     }
     rebootDeviceButton->SetPosition(172, 147, 110, 110); // 172:x 147:y 110:width 110:height
-    rebootDeviceButton->SetImageSrc(PNG_REBOOT_BUTTON_IMAGE, PNG_REBOOT_BUTTON_IMAGE);
+    rebootDeviceButton->SetImageSrc(PNG_SETTINGS_SETTTING_REBOOT, PNG_SETTINGS_SETTTING_REBOOT);
+    rebootDeviceButton->SetImagePosition(36, 36);
+    rebootDeviceButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff4fc34c);
     rebootDeviceButton->SetViewId(REBOOTDEVICE_BUTTON);
     UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::RebootPresenter::GetInstance();
     if (clickListener == nullptr) {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootPresenter.cpp
index 4448b58..b2f20fe 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootPresenter.cpp
@@ -2,7 +2,7 @@
  * @Author: luozheng 1732036298@qq.com
  * @Date: 2024-02-21 19:06:02
  * @LastEditors: luozheng 1732036298@qq.com
- * @LastEditTime: 2024-03-21 14:23:19
+ * @LastEditTime: 2024-04-25 09:21:08
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootPresenter.cpp
  */
 #include "rebootdevice/include/RebootPresenter.h"
@@ -79,7 +79,7 @@ namespace OHOS
             RebootView::GetInstance()->ChangeView(SHUTDOWNDEVICEVIEW, SHUTDOWNANIMATORVIEW);
             start_shutdown_or_reboot();
             shutdown_reboot_prejobs();
-            
+
             ShutDownAnimatorView::GetInstance()->GeShutDownImageAnimatorView()->Start();
             isShutDownOperation = true;
         }
@@ -93,8 +93,9 @@ namespace OHOS
         {
             if (strcmp(view.GetViewId(), REBOOT_VIEW) == 0)
             {
-                uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
-                NativeAbility::GetInstance().ChangeSlice(preSlice);
+                // uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
+                // NativeAbility::GetInstance().ChangeSlice(preSlice);
+                NativeAbility::GetInstance().Back();
             }
             else if (strcmp(view.GetViewId(), REBOOTDEVICE_VIEW) == 0)
             {
@@ -131,8 +132,9 @@ namespace OHOS
         // 如果是power键,且是亮屏状态，按键释放就返回上一级
         if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
         {
-            uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
-            NativeAbility::GetInstance().ChangeSlice(preSlice);
+            // uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
+            // NativeAbility::GetInstance().ChangeSlice(preSlice);
+            NativeAbility::GetInstance().Back();
         }
         return true;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootView.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootView.cpp
index 88f3ed2..8e5c9c9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/RebootView.cpp
@@ -140,7 +140,9 @@ namespace OHOS
             }
         }
         rebootButton->SetPosition(69, 147, 110, 110); // 69:x 147:y 110:width 110:height
-        rebootButton->SetImageSrc(PNG_REBOOT_BUTTON_IMAGE, PNG_REBOOT_BUTTON_IMAGE);
+        rebootButton->SetImageSrc(PNG_SETTINGS_SETTTING_REBOOT, PNG_SETTINGS_SETTTING_REBOOT);
+        rebootButton->SetImagePosition(36, 36);
+        rebootButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xff4fc34c);
         rebootButton->SetViewId(REBOOT_BUTTON);
         UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::RebootPresenter::GetInstance();
         if (clickListener == nullptr)
@@ -180,7 +182,9 @@ namespace OHOS
             }
         }
         shutdownButton->SetPosition(275, 147, 110, 110); // 275:x 147:y 110:width 110:height
-        shutdownButton->SetImageSrc(PNG_SHUTDOWN_BUTTON_IMAGE, PNG_SHUTDOWN_BUTTON_IMAGE);
+        shutdownButton->SetImageSrc(PNG_SETTINGS_SETTTING_SHUTDOWN, PNG_SETTINGS_SETTTING_SHUTDOWN);
+        shutdownButton->SetImagePosition(36, 36);
+        shutdownButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36);
         shutdownButton->SetViewId(SHUTDOWN_BUTTON);
         UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::RebootPresenter::GetInstance();
         if (clickListener == nullptr)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/ShutdownDeviceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/ShutdownDeviceView.cpp
index 4881c02..a56f9fd 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/ShutdownDeviceView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/src/ShutdownDeviceView.cpp
@@ -64,7 +64,9 @@ bool ShutdownDeviceView::ShowUpShutdownDeviceView()
         }
     }
     shutdownDeviceButton->SetPosition(172, 147, 110, 110); // 172:x 147:y 110:width 110:height
-    shutdownDeviceButton->SetImageSrc(PNG_SHUTDOWN_BUTTON_IMAGE, PNG_SHUTDOWN_BUTTON_IMAGE);
+    shutdownDeviceButton->SetImageSrc(PNG_SETTINGS_SETTTING_SHUTDOWN, PNG_SETTINGS_SETTTING_SHUTDOWN);
+    shutdownDeviceButton->SetImagePosition(36, 36);
+    shutdownDeviceButton->SetStyle(STYLE_BACKGROUND_COLOR, 0xffff5a36);
     shutdownDeviceButton->SetViewId(SHUTDOWNDEVICE_BUTTON);
     UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::RebootPresenter::GetInstance();
     if (clickListener == nullptr) {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopPresenter.h
index 1e8d0c1..e1fe726 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopPresenter.h
@@ -1,3 +1,10 @@
+/*
+ * @Author: luozheng 1732036298@qq.com
+ * @Date: 2024-04-08 16:43:48
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-04-24 16:37:10
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/set_desktop/include/SetDesktopPresenter.h
+ */
 /*
  * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.
  * Description: SetDesktopPresenter.h
@@ -8,6 +15,7 @@
 #ifndef SET_DESKTOP_PRESENTER_H
 #define SET_DESKTOP_PRESENTER_H
 
+#include "View.h"
 #include "Presenter.h"
 #include "components/ui_view.h"
 
@@ -19,17 +27,21 @@ class SetDesktopView;
 class SetDesktopModel;
 class SetDesktopPresenter : public Presenter<SetDesktopView>,
                          public UIView::OnClickListener,
+                         public RootView::OnKeyActListener,
                          public UIView::OnDragListener {
 public:
     SetDesktopPresenter();
     virtual ~SetDesktopPresenter();
+    static SetDesktopPresenter *GetInstance();
 
     virtual void OnStart() override;
     virtual void OnResume() override;
     virtual void OnStop() override;
 
     bool OnClick(UIView &view, const ClickEvent &event) override;
-    virtual bool OnDrag(UIView& view, const DragEvent& event) override;
+    bool OnDrag(UIView& view, const DragEvent& event) override;
+    bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件
+
     bool GetHexagonsStyleState(void);
 private:
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopPresenter.cpp
index 0c361bc..cadd1c7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopPresenter.cpp
@@ -1,3 +1,10 @@
+/*
+ * @Author: luozheng 1732036298@qq.com
+ * @Date: 2024-04-08 16:43:48
+ * @LastEditors: luozheng 1732036298@qq.com
+ * @LastEditTime: 2024-04-25 09:24:59
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopPresenter.cpp
+ */
 /*
  * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved.
  * Description: SettingPresenter.cpp
@@ -8,14 +15,27 @@
 #include "SetDesktopView.h"
 #include "SetDesktopModel.h"
 #include "SetDesktopPresenter.h"
+#include "common/key_code.h"
+#include <custom_utils.h>
 
 namespace OHOS {
+
+    static SetDesktopPresenter *g_pSetDesktopPresenter = nullptr;
+    
     SetDesktopPresenter::SetDesktopPresenter()
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetDesktopPresenter::SetDesktopPresenter");
+        g_pSetDesktopPresenter=this;
     }
 
-    SetDesktopPresenter::~SetDesktopPresenter() {}
+    SetDesktopPresenter::~SetDesktopPresenter() {
+        g_pSetDesktopPresenter = nullptr;
+    }
+
+    SetDesktopPresenter *SetDesktopPresenter::GetInstance()
+    {
+        return g_pSetDesktopPresenter;
+    }
 
     void SetDesktopPresenter::OnStart()
     {
@@ -37,8 +57,9 @@ namespace OHOS {
         if ((event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) &&
             (event.GetDeltaX() > X_DRAG_OFFSET) && (event.GetDeltaX() > (DOUBLES * MATH_ABS(event.GetDeltaY())))) {
             WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingPresenter::OnDrag ChangeSlice");
-            uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
-            NativeAbility::GetInstance().ChangeSlice(preSlice);
+            // uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
+            // NativeAbility::GetInstance().ChangeSlice(preSlice);
+            NativeAbility::GetInstance().Back();
         }
         return false;
     }
@@ -51,12 +72,25 @@ namespace OHOS {
         } else if (strcmp(view.GetViewId(), SET_DESKTOP_LIST) == 0) {
             SetDesktopModel::GetInstance().SetDesktopStyle(APPLIST_STYLE);
         }
-        uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
-        NativeAbility::GetInstance().ChangeSlice(preSlice);
+        // uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
+        NativeAbility::GetInstance().ChangeSlice(VIEW_APPLIST);
                return true; 
     }
     bool SetDesktopPresenter::GetHexagonsStyleState(void)
     {
         return (SetDesktopModel::GetInstance().GetDesktopStyle() == HEXAGONS_STYLE);
     }
+
+    bool SetDesktopPresenter::OnKeyAct(UIView &view, const KeyEvent &event)
+    {
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetDesktopPresenter::OnKeyAct");
+        uint16 keyID = event.GetKeyId();
+        uint16 keyState = event.GetState();
+        // 如果是power键就返回上一级
+        if (keyID == static_cast<uint16_t>(ZliteKeyCode::ZLITE_KEY_POWER) && keyState == 0 && uapi_get_screen_state() == 0)
+        {
+            NativeAbility::GetInstance().Back();
+        }
+        return true;
+    }
 }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopView.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopView.cpp
index c5f2b49..9609c70 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/set_desktop/src/SetDesktopView.cpp
@@ -29,6 +29,10 @@ void SetDesktopView::OnStart()
     container_->SetPosition(0, 0, Screen::GetInstance().GetWidth(), Screen::GetInstance().GetHeight());
     container_->SetOnDragListener(presenter_);
     container_->SetTouchable(true);
+
+    // 增加按键监听
+    RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::SetDesktopPresenter::GetInstance();
+    RootView::GetInstance()->SetOnKeyActListener(keyactListener);
 }
 
 void SetDesktopView::OnSetUpView()

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 bf2836d..e37684b 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-04-23 19:26:32
+ * @LastEditTime: 2024-04-24 16:19:53
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp
  */
 
@@ -14,16 +14,24 @@ namespace OHOS
 {
     static constexpr int16_t SETTING_ICON_X = 19;
     static constexpr int16_t SETTING_SICON_Y = 19;
-    static constexpr int16_t SETTING_SLABEL_X = 115;
-    static constexpr int16_t SETTING_SLABEL_Y = 33;
-    static constexpr int16_t SETTING_SLABEL_W = 200;
-    static constexpr int16_t SETTING_SLABEL_H = 40;
-    static constexpr int16_t SETTING_SNEXTIMAGE_X = 326;
-    static constexpr int16 SETTING_SLABEL_FONT_SIZE = 30;
-    static constexpr int16 SETTING_SLABEL_FONT_HEIGHT = 36;
-    static constexpr int16 SETTING_SBACKGROUND_HEIGHT = 100;
-    static constexpr int16 NUMS_2 = 2;
+    static constexpr int16_t SETTING_SICON_W = 62;
+    static constexpr int16_t SETTING_SICON_H = 62;
 
+    static constexpr int16_t SETTINGLABELEXT_X = 115;
+    static constexpr int16_t SETTINGLABELEXT_Y = 33;
+    static constexpr int16_t SETTINGLABELEXT_W = 180;
+    static constexpr int16_t SETTINGLABELEXT_H = 40;
+    static constexpr int16_t SETTINGLABELEXT_TEXT_FONT = 30;
+    static constexpr int16_t SETTINGLABELEXT_LINE_HEIGHT = 35;
+    static constexpr int16_t SETTINGLABELEXT_ROLLSPEED = 40;
+
+    static constexpr int16_t SETTINGLABELBUTTONEXT_X = 0;
+    static constexpr int16_t SETTINGLABELBUTTONEXT_Y = 0;
+    static constexpr int16_t SETTINGLABELBUTTONEXT_W = 380;
+    static constexpr int16_t SETTINGLABELBUTTONEXT_H = 100;
+    static constexpr int16_t SETTINGLABELBUTTONEXT_TEXT_FONT = 30;
+    static constexpr int16_t SETTINGLABELBUTTONEXT_LINE_HEIGHT = 35;
+    
     SettingItemView::SettingItemView()
     {
         SetPosition(0, 120, 380, 120);
@@ -47,26 +55,29 @@ namespace OHOS
     {
         sItemInfo = itemInfo;
         Icon.SetSrc(itemInfo.icon);
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d", itemInfo.textId);
+        //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d", itemInfo.textId);
         settingLabelExt.SetTextId(itemInfo.textId);
     }
 
     void SettingItemView::SetUpChild()
     {
-        Icon.SetPosition(SETTING_ICON_X, SETTING_SICON_Y);
+        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.SetStyle(STYLE_BORDER_RADIUS,100);
 
-        settingLabelExt.SetPosition(115, 33,180,100); 
-        settingLabelExt.SetStyle(STYLE_TEXT_FONT, 30);
-        settingLabelExt.SetStyle(STYLE_LINE_HEIGHT, 35);
+        settingLabelExt.SetPosition(SETTINGLABELEXT_X, SETTINGLABELEXT_Y, SETTINGLABELEXT_W, SETTINGLABELEXT_H);
+        settingLabelExt.SetStyle(STYLE_TEXT_FONT, SETTINGLABELEXT_TEXT_FONT);
+        settingLabelExt.SetStyle(STYLE_LINE_HEIGHT, SETTINGLABELEXT_LINE_HEIGHT);
         settingLabelExt.SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE);
-        settingLabelExt.SetRollSpeed(40);
-        settingLabelExt.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
+        settingLabelExt.SetRollSpeed(SETTINGLABELEXT_ROLLSPEED);
+        settingLabelExt.SetFont(DEFAULT_VECTOR_FONT_FILENAME, SETTINGLABELEXT_TEXT_FONT);
 
-        settingLabelButtonExt.SetPosition(0, 0, 380, 100);
+        settingLabelButtonExt.SetPosition(SETTINGLABELBUTTONEXT_X, SETTINGLABELBUTTONEXT_Y, SETTINGLABELBUTTONEXT_W, SETTINGLABELBUTTONEXT_H);
         settingLabelButtonExt.SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);
-        settingLabelButtonExt.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
-        settingLabelButtonExt.SetStyle(STYLE_LINE_HEIGHT, 35);
+        settingLabelButtonExt.SetFont(DEFAULT_VECTOR_FONT_FILENAME, SETTINGLABELBUTTONEXT_TEXT_FONT);
+        settingLabelButtonExt.SetStyle(STYLE_LINE_HEIGHT, SETTINGLABELBUTTONEXT_LINE_HEIGHT);
         settingLabelButtonExt.SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED);
         settingLabelButtonExt.SetAlign(TEXT_ALIGNMENT_LEFT);
         settingLabelButtonExt.SetLabelPosition(115, 0);

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 79c3862..251c6ed 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-04-23 18:09:47
+ * @LastEditTime: 2024-04-25 09:12:06
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp
  */
 #include "SettingModel.h"
@@ -22,14 +22,15 @@ namespace OHOS
 
     void SettingModel::InitSettingItem()
     {
-        settings[0] = {SETTING_ITEM_ZERO, PNG_SETTINGS_DISPLAY_BRIGHTNESS, STR_SCREEN_AND_BRIGHTNESS, true};
-        settings[1] = {SETTING_ITEM_ONE, PNG_SETTINGS_NETWORKANDCALL, STR_NETWORKANDCALL, true};
-        settings[2] = {SETTING_ITEM_TWO, PNG_SETTINGS_BLUETOOTH, STR_BLUETOOTH, true};
-        settings[3] = {SETTING_ITEM_THREE, PNG_SETTINGS_SOUND_VIBRATION, STR_SOUND_AND_VIBRATION, true};
-        settings[4] = {SETTING_ITEM_FOUR, PNG_SETTINGS_DISPLAY_MODE, STR_DISPLAY_MODE, true};
-        settings[5] = {SETTING_ITEM_FIVE, PNG_SETTINGS_MOTION_RECOGNITION, STR_MOTION_RECOGNITION, true};
-        settings[6] = {SETTING_ITEM_SIX, PNG_SETTINGS_SYSTEM, STR_SYSTEM, true};
-        settings[7] = {SETTING_ITEM_SEVEN, PNG_SETTINGS_SETTINGS_POWER_CONTROL, STR_SHUTDOWN_AND_RESTART, true};
+        int settingLen = 0;
+        settings[settingLen++] = {SETTING_ITEM_ZERO, PNG_SETTINGS_DISPLAY_BRIGHTNESS, STR_SCREEN_AND_BRIGHTNESS, true};
+        settings[settingLen++] = {SETTING_ITEM_ONE, PNG_SETTINGS_NETWORKANDCALL, STR_NETWORKANDCALL, true};
+        settings[settingLen++] = {SETTING_ITEM_TWO, PNG_SETTINGS_BLUETOOTH, STR_BLUETOOTH, true};
+        settings[settingLen++] = {SETTING_ITEM_THREE, PNG_SETTINGS_SOUND_VIBRATION, STR_SOUND_AND_VIBRATION, true};
+        settings[settingLen++] = {SETTING_ITEM_FOUR, PNG_SETTINGS_DISPLAY_MODE, STR_DISPLAY_MODE, true};
+        settings[settingLen++] = {SETTING_ITEM_FIVE, PNG_SETTINGS_MOTION_RECOGNITION, STR_MOTION_RECOGNITION, true};
+        settings[settingLen++] = {SETTING_ITEM_SIX, PNG_SETTINGS_SYSTEM, STR_SYSTEM, true};
+        settings[settingLen++] = {SETTING_ITEM_SEVEN, PNG_SETTINGS_SHUTDOWN_AND_RESTART, STR_SHUTDOWN_AND_RESTART, true};
         settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_ZERO, VIEW_DISPLAY_BRIGHTNESS));
         settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_ONE, VIEW_NETWORKANDCALL));
         settingIdToViewId.insert(std::pair<SettingIndex, AppViewId>(SETTING_ITEM_TWO, VIEW_CLASSIC_BLUETOOTH));

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTINGS_POWER_CONTROL.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTINGS_POWER_CONTROL.bin
deleted file mode 100644 (file)
index daeb8ab..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTINGS_POWER_CONTROL.bin and /dev/null differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTINGS_SHUTDOWN_AND_RESTART.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTINGS_SHUTDOWN_AND_RESTART.bin
new file mode 100644 (file)
index 0000000..cb55abe
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTINGS_SHUTDOWN_AND_RESTART.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_REBOOT.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_REBOOT.bin
new file mode 100644 (file)
index 0000000..adae54c
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_REBOOT.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_SHUTDOWN.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_SHUTDOWN.bin
new file mode 100644 (file)
index 0000000..615b3fd
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/settings/SETTTING_SHUTDOWN.bin differ