From: Caisking <3449750381@qq.com> Date: Fri, 24 Nov 2023 02:28:32 +0000 (+0800) Subject: ### 设置 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=dbed53224a8d6ac70ca65556f28fad55acea40a1;p=mirrors%2FFD230.git ### 设置 #### 1.屏幕与亮度:displaybrightness ​ 1.1.亮度调节:brightnesscontrol ​ 1.2.亮屏时长:screenduration #### 2.蓝牙:bluetoothofsetting, #### 3.声音与震动:soundandvibration ​ 3.1 系统音量:systemvolume #### 4.快速访问:qucikaccess, #### 5系统:system ​ 5.1.关于手表:systemaboutwatch ​ 5.2.监管:systemsupervise ​ 5.3.系统语言:systemlanguage ​ 5.4.重新启动:systemreboot ​ 5.5.关机:steamshoutdown ​ 5.6.恢复出厂设置:steamfactoryreset ​ ### 录音:record --- diff --git a/code/sdk/application/wearable/nativeapp/nativeui/settings/include/SettingModel.h b/code/sdk/application/wearable/nativeapp/nativeui/settings/include/SettingModel.h index d26280bec..ddabdf632 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/settings/include/SettingModel.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/settings/include/SettingModel.h @@ -30,7 +30,7 @@ namespace OHOS { SettingModel(const SettingModel &); SettingModel &operator=(const SettingModel &); virtual ~SettingModel(); - static const uint16_t SETTING_ITEM_LEN = 4; + static const uint16_t SETTING_ITEM_LEN = 5; SettingItem settings[SETTING_ITEM_LEN] = { SETTING_ITEM_ZERO, nullptr, nullptr, false }; std::map settingIdToViewId; bool btConnectStatus{false}; diff --git a/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp index 3292b864f..70e39a015 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingItemView.cpp @@ -7,7 +7,7 @@ #include "wearable_log.h" #include "SettingItemView.h" -#include "UiConfig.h" + namespace OHOS { static constexpr int16 SETTING_ICON_X = 19; static constexpr int16_t SETTING_SICON_Y = 19; @@ -20,7 +20,7 @@ namespace OHOS { static constexpr int16 NUMS_2 = 2; static constexpr int16 NUMS_50 = 50; - static int SETTIG_BACKGROUND_HEIGHT_COUNT = 1; + SettingItemView::SettingItemView() { SetPosition(0, 0, HORIZONTAL_RESOLUTION, SETTING_ITEM_BUTTON_HEIGHT); @@ -53,11 +53,6 @@ namespace OHOS { void SettingItemView::SetUpChild() { sBackgroundImage.SetSrc(PNG_SETTING_BACKGROUND_IMAGE); - sBackgroundImage.Resize(380,100); - sBackgroundImage.SetStyle(STYLE_BORDER_RADIUS,50); - sBackgroundImage.SetPosition(13,(SETTING_ITEM_HEIGHT - sBackgroundImage.GetHeight())); - sBackgroundImage.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE); - sIcon.SetPosition(SETTING_ICON_X, SETTING_SICON_Y); sIcon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE); diff --git a/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingModel.cpp b/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingModel.cpp index 911a78bfe..4422e0f7c 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingModel.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/settings/src/SettingModel.cpp @@ -21,24 +21,24 @@ namespace OHOS { void SettingModel::InitSettingItem() { - settings[0] = {SETTING_ITEM_ZERO, PNG_BLUETOOTH_STITLE, "蓝牙耳机", true}; - settings[1] = {SETTING_ITEM_ONE, PNG_CONNECT_PHONE_IMAGE, "连接手机", true}; - settings[2] = {SETTING_ITEM_TWO, PNG_SETTTING_REBOOT_IMAGE, "重启", true}; - settings[3] = {SETTING_ITEM_THREE, PNG_SETTTING_SHUTDOWN_IMAGE, "关机", true}; - settingIdToViewId.insert(std::pair(SETTING_ITEM_ZERO, VIEW_BLUETOOTH_EARPHONE)); - settingIdToViewId.insert(std::pair(SETTING_ITEM_ONE, VIEW_CONNECT_PHONE)); - settingIdToViewId.insert(std::pair(SETTING_ITEM_TWO, VIEW_REBOOT)); - settingIdToViewId.insert(std::pair(SETTING_ITEM_THREE, VIEW_REBOOT)); - // settings[0] = {SETTING_ITEM_ZERO, PNG_DISPLAY_BRIGHTNESS, "屏幕与亮度", true}; - // settings[1] = {SETTING_ITEM_ONE, PNG_BLUETOOTH, "蓝牙", true}; - // settings[2] = {SETTING_ITEM_TWO, PNG_SOUND_VIBRATION, "声音与震动", true}; - // settings[3] = {SETTING_ITEM_THREE, PNG_QUICK_ACCESS, "快速访问", true}; - // settings[4] = {SETTING_ITEM_FIVE, PNG_SYSTEM, "系统", true}; - // settingIdToViewId.insert(std::pair(SETTING_ITEM_ZERO, VIEW_DISPLAY_BRIGHTNESS)); - // settingIdToViewId.insert(std::pair(SETTING_ITEM_ONE, VIEW_CONNECT_BLUETOOTH)); - // settingIdToViewId.insert(std::pair(SETTING_ITEM_TWO, VIEW_SOUND_VIBRATION)); - // settingIdToViewId.insert(std::pair(SETTING_ITEM_THREE, VIEW_QUICK_ACCESS)); - // settingIdToViewId.insert(std::pair(SETTING_ITEM_FIVE, VIEW_SYSTEM)); + // settings[0] = {SETTING_ITEM_ZERO, PNG_BLUETOOTH_STITLE, "蓝牙耳机", true}; + // settings[1] = {SETTING_ITEM_ONE, PNG_CONNECT_PHONE_IMAGE, "连接手机", true}; + // settings[2] = {SETTING_ITEM_TWO, PNG_SETTTING_REBOOT_IMAGE, "重启", true}; + // settings[3] = {SETTING_ITEM_THREE, PNG_SETTTING_SHUTDOWN_IMAGE, "关机", true}; + // settingIdToViewId.insert(std::pair(SETTING_ITEM_ZERO, VIEW_BLUETOOTH_EARPHONE)); + // settingIdToViewId.insert(std::pair(SETTING_ITEM_ONE, VIEW_CONNECT_PHONE)); + // settingIdToViewId.insert(std::pair(SETTING_ITEM_TWO, VIEW_REBOOT)); + // settingIdToViewId.insert(std::pair(SETTING_ITEM_THREE, VIEW_REBOOT)); + settings[0] = {SETTING_ITEM_ZERO, PNG_DISPLAY_BRIGHTNESS, "屏幕与亮度", true}; + settings[1] = {SETTING_ITEM_ONE, PNG_BLUETOOTH, "蓝牙", true}; + settings[2] = {SETTING_ITEM_TWO, PNG_SOUND_VIBRATION, "声音与震动", true}; + settings[3] = {SETTING_ITEM_THREE, PNG_QUICK_ACCESS, "快速访问", true}; + settings[4] = {SETTING_ITEM_FIVE, PNG_SYSTEM, "系统", true}; + settingIdToViewId.insert(std::pair(SETTING_ITEM_ZERO, VIEW_DISPLAY_BRIGHTNESS)); + settingIdToViewId.insert(std::pair(SETTING_ITEM_ONE, VIEW_CONNECT_BLUETOOTH)); + settingIdToViewId.insert(std::pair(SETTING_ITEM_TWO, VIEW_SOUND_VIBRATION)); + settingIdToViewId.insert(std::pair(SETTING_ITEM_THREE, VIEW_QUICK_ACCESS)); + settingIdToViewId.insert(std::pair(SETTING_ITEM_FIVE, VIEW_SYSTEM)); } const SettingItem *SettingModel::GetSettinglistItems() const