From: luozheng <1732036298@qq.com> Date: Wed, 3 Apr 2024 06:15:08 +0000 (+0800) Subject: 修改设置视图list与多国语言适配 X-Git-Tag: release_V1.2.70_20241020_135402~1233^2~1 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=c137facd2272e18152a0c661e5ac6a8151033f30;p=mirrors%2FFD230.git 修改设置视图list与多国语言适配 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt index 53d9d994b..fe332eb13 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt @@ -235,4 +235,46 @@ STR_END_THIS_MOVEMENT$Whether to end this movement STR_GOAL_ACCOMPLISHMENT_DEGREE$Goal accomplishment degree STR_TRAINING_DURATION$Training duration STR_OFF$Off -STR_MORE$More \ No newline at end of file +STR_MORE$More +STR_SETTING$Setting +STR_SCREEN_AND_BRIGHTNESS$Screen and Brightness +STR_BRIGHTNESS_ADJUSTMENT$Brightness Adjustment +STR_SCREEN_ON_DURATION$Screen On Duration +STR_5_SECONDS$5 Seconds +STR_10_SECONDS$10 Seconds +STR_15_SECONDS$15 Seconds +STR_30_SECONDS$30 Seconds +STR_60_SECONDS$60 Seconds +STR_300_SECONDS$300 Seconds +STR_RAISE_TO_WAKE$Raise to Wake +STR_BLUETOOTH$Bluetooth +STR_BLUETOOTH_HEADPHONES$Bluetooth Headphones +STR_TRADITIONAL_BLUETOOTH$Traditional Bluetooth +STR_AUTO_OFF_BLUETOOTH_NOTE$Note: It will be automatically turned off if the connection is not successful for 10 minutes after opening, because the traditional Bluetooth will increase the power consumption for a long time, it is recommended to use when necessary \n\n(this function is mainly used for phone calls/notifications, music control/transmission, etc.) +STR_SOUND_AND_VIBRATION$Sound and Vibration +STR_SYSTEM_VOLUME$System Volume +STR_ALARM_REMINDERS_FIND_WATCH$Alarms, Reminders, Find Watch +STR_CALL_VOLUME$Call Volume +STR_WATCH_CALLS$Watch Calls +STR_MEDIA_VOLUME$Media Volume +STR_MUSIC_RECORDINGS_WORKOUTS$Music, Recordings, Workouts +STR_VIBRATION_REMINDER$Vibration Reminder +STR_SILENT_MODE$Silent Mode +STR_SYSTEM_VOLUME_UNAFFECTED$System Volume Unaffected +STR_QUICK_ACCESS$Quick Access +STR_ACCESSIBILITY$Accessibility +STR_ACCESSIBILITY_BUTTON$Accessibility Button +STR_QUICK_ACCESS_APP$This function can be set with the lower right button Quick access to the APP +STR_HEART_RATE_MONITORING$Heart Rate Monitoring +STR_BLOOD_OXYGEN_MONITORING$Blood Oxygen Monitoring +STR_SYSTEM$System +STR_ABOUT_WATCH$About Watch +STR_REGULATORY_MODE$Regulatory Mode +STR_SWITCH_LANGUAGE$Switch Language +STR_LANGUAGE$Language +STR_FACTORY_RESET$Factory Reset +STR_SYSTEM_UPDATE$System Update +STR_SHUTDOWN_AND_RESTART$Shutdown and Restart +STR_RESTART$Restart +STR_SHUTDOWN$Shutdown +STR_4G_CAPABILITY$4G capability diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt index d51ffc1bd..b1dbddb5c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt @@ -235,4 +235,46 @@ STR_END_THIS_MOVEMENT$是否结束本次运动 STR_GOAL_ACCOMPLISHMENT_DEGREE$目标完成度 STR_TRAINING_DURATION$训练时长 STR_OFF$关闭 -STR_MORE$更多 \ No newline at end of file +STR_MORE$更多 +STR_SETTING$设置 +STR_SCREEN_AND_BRIGHTNESS$屏幕与亮度 +STR_BRIGHTNESS_ADJUSTMENT$亮度调节 +STR_SCREEN_ON_DURATION$亮屏时长 +STR_5_SECONDS$5秒 +STR_10_SECONDS$10秒 +STR_15_SECONDS$15秒 +STR_30_SECONDS$30秒 +STR_60_SECONDS$60秒 +STR_300_SECONDS$300秒 +STR_RAISE_TO_WAKE$抬腕亮屏 +STR_BLUETOOTH$蓝牙 +STR_BLUETOOTH_HEADPHONES$蓝牙耳机 +STR_TRADITIONAL_BLUETOOTH$传统蓝牙 +STR_AUTO_OFF_BLUETOOTH_NOTE$注：开启后10分钟没连接成功会自动关闭，因为传统蓝牙长时间打开会增加电耗，建议在有需要的时候使用\n\n（该功能主要用于电话拨打/通知、音乐控制/传输等） +STR_SOUND_AND_VIBRATION$声音与震动 +STR_SYSTEM_VOLUME$系统音量 +STR_ALARM_REMINDERS_FIND_WATCH$闹钟、提醒、查找手表 +STR_CALL_VOLUME$通话音量 +STR_WATCH_CALLS$手表通话 +STR_MEDIA_VOLUME$媒体音量 +STR_MUSIC_RECORDINGS_WORKOUTS$音乐、录音、训练 +STR_VIBRATION_REMINDER$震动提醒 +STR_SILENT_MODE$静音模式 +STR_SYSTEM_VOLUME_UNAFFECTED$系统音量不受影响 +STR_QUICK_ACCESS$快速访问 +STR_ACCESSIBILITY$辅助功能 +STR_ACCESSIBILITY_BUTTON$辅助按钮 +STR_QUICK_ACCESS_APP$此功能可设置右下方按钮\n快速访问的APP +STR_HEART_RATE_MONITORING$心率监测 +STR_BLOOD_OXYGEN_MONITORING$血氧监测 +STR_SYSTEM$系统 +STR_ABOUT_WATCH$关于手表 +STR_REGULATORY_MODE$监管模式 +STR_SWITCH_LANGUAGE$切换语言 +STR_LANGUAGE$语言 +STR_FACTORY_RESET$恢复出厂 +STR_SYSTEM_UPDATE$系统升级 +STR_SHUTDOWN_AND_RESTART$关机和重启 +STR_RESTART$重启 +STR_SHUTDOWN$关机 +STR_4G_CAPABILITY$4G能力 \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml index 38a089019..c88f33d17 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml @@ -237,4 +237,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml index d8aff3e0c..2b507348f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml @@ -237,4 +237,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang index c011d799b..263ee97cd 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang index 0cbfc10dc..137b62e06 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/ja.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h index 08b42bdb4..70d61000e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h +++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h @@ -1,15 +1,15 @@ -/* -* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved. -* Description: language -* Author: Graphic develop team -* Create: 2021-07-06 -*/ - -#ifndef UI_RESOURCE_STRING_H -#define UI_RESOURCE_STRING_H -#include -namespace OHOS { -enum UIResourceTextId : uint16_t { +/* +* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved. +* Description: language +* Author: Graphic develop team +* Create: 2021-07-06 +*/ + +#ifndef UI_RESOURCE_STRING_H +#define UI_RESOURCE_STRING_H +#include +namespace OHOS { +enum UIResourceTextId : uint16_t { STR_EXERCISE_GENERAL = 0, STR_EXERCISE_FREETRAINING = 1, STR_EXERCISE_RESISTANCETRAINING = 2, @@ -251,10 +251,52 @@ enum UIResourceTextId : uint16_t { STR_EXERCISE_KETTLEBELLTRAINING = 238, STR_EXTREME_ORIENTEERING = 239, STR_INSUFFICIENT_EXERCISE_AMOUNT = 240, - STR_MAX_ID = 241, + STR_SETTING = 241, + STR_SCREEN_AND_BRIGHTNESS = 242, + STR_BRIGHTNESS_ADJUSTMENT = 243, + STR_SCREEN_ON_DURATION = 244, + STR_5_SECONDS = 245, + STR_10_SECONDS = 246, + STR_15_SECONDS = 247, + STR_30_SECONDS = 248, + STR_60_SECONDS = 249, + STR_300_SECONDS = 250, + STR_RAISE_TO_WAKE = 251, + STR_BLUETOOTH = 252, + STR_BLUETOOTH_HEADPHONES = 253, + STR_TRADITIONAL_BLUETOOTH = 254, + STR_AUTO_OFF_BLUETOOTH_NOTE = 255, + STR_SOUND_AND_VIBRATION = 256, + STR_SYSTEM_VOLUME = 257, + STR_ALARM_REMINDERS_FIND_WATCH = 258, + STR_CALL_VOLUME = 259, + STR_WATCH_CALLS = 260, + STR_MEDIA_VOLUME = 261, + STR_MUSIC_RECORDINGS_WORKOUTS = 262, + STR_VIBRATION_REMINDER = 263, + STR_SILENT_MODE = 264, + STR_SYSTEM_VOLUME_UNAFFECTED = 265, + STR_QUICK_ACCESS = 266, + STR_ACCESSIBILITY = 267, + STR_ACCESSIBILITY_BUTTON = 268, + STR_QUICK_ACCESS_APP = 269, + STR_HEART_RATE_MONITORING = 270, + STR_BLOOD_OXYGEN_MONITORING = 271, + STR_SYSTEM = 272, + STR_ABOUT_WATCH = 273, + STR_REGULATORY_MODE = 274, + STR_SWITCH_LANGUAGE = 275, + STR_LANGUAGE = 276, + STR_FACTORY_RESET = 277, + STR_SYSTEM_UPDATE = 278, + STR_SHUTDOWN_AND_RESTART = 279, + STR_RESTART = 280, + STR_SHUTDOWN = 281, + STR_4G_CAPABILITY = 282, + STR_MAX_ID = 283, }; // UIResourceTextId - -enum FontLanguageId : uint8_t { + +enum FontLanguageId : uint8_t { LANGUAGE_ID_JA, LANGUAGE_ID_ZH, LANGUAGE_ID_EN, diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang index cd291d402..b8c4591b2 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp index ba1114321..6a10bd58e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/language/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-04-01 14:41:00 + * @LastEditTime: 2024-04-02 17:17:55 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp */ #include "AppViewIDs.h" @@ -114,7 +114,7 @@ namespace OHOS else { g_planguage->ChangeLanguage(p_LanguageSwitchModel->GetCurLanguageCode()); - //m_labelext->SetTextId(STR_LANGUAGE); + m_labelext->SetTextId(STR_LANGUAGE); m_labelext->ForceResetText(); // 强制刷新 p_UILabelButtonExt->SetImageSrc(SelectedImg, SelectedImg); diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp index 6c0b5116a..30827aa93 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp @@ -94,7 +94,8 @@ namespace OHOS LanguageSwitchViewTitleLabel->SetStyle(STYLE_TEXT_FONT, TITLE_LABEL_TEXT_FONT); LanguageSwitchViewTitleLabel->SetStyle(STYLE_LINE_HEIGHT, TITLE_LABEL_LINE_HEIGHT); // LanguageSwitchViewTitleLabel->SetText("语言"); - // LanguageSwitchViewTitleLabel->SetTextId(STR_LANGUAGE); + LanguageSwitchViewTitleLabel->SetTextId(STR_LANGUAGE); + LanguageSwitchViewTitleLabel->ForceResetText(); LanguageSwitchViewTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); LanguageSwitchViewTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); LanguageSwitchViewTitleLabel->SetRollSpeed(TITLE_LABEL_TEXT_ROLLSPEED); diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItem.h b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItem.h index 1e3f4a09f..85d50a176 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItem.h +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItem.h @@ -1,15 +1,15 @@ /* - * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. - * Description: SettingItem.h - * Author: - * Create: 2021-11-23 + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-01-29 15:37:44 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-03 09:32:07 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItem.h */ - #ifndef SETTING_ITEM_H #define SETTING_ITEM_H #include - +#include "language/font/ui_resource_string.h" namespace OHOS { /* @@ -30,7 +30,7 @@ namespace OHOS { SettingIndex index; const char *icon; - const char *label; + UIResourceTextId textId; bool hasSecondMenu; } SettingItem; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItemView.h b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItemView.h index 0e0de3252..fe4c0a055 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItemView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItemView.h @@ -1,3 +1,10 @@ +/* + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-03-30 09:14:38 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-02 20:04:15 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingItemView.h + */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. * Description: SettingItemView.h @@ -8,14 +15,11 @@ #ifndef SETTING_ITEM_VIEW_H #define SETTING_ITEM_VIEW_H -#include "components/ui_label.h" -#include "components/ui_label_ext.h" #include "components/ui_view_group.h" -#include "components/ui_image_view.h" - #include "UiConfig.h" #include "SettingModel.h" - +#include "components/ui_label_button_ext.h" +#include "components/ui_image_view.h" namespace OHOS { class SettingItemView : public UIViewGroup @@ -29,11 +33,9 @@ namespace OHOS private: SettingItemView(const SettingItemView &); - UIImageView sBackground; - UIImageView sIcon; - UILabel sLabel; - UIImageView sNextImage; - SettingItem sItemInfo = {SETTING_ITEM_ZERO, nullptr, nullptr, false}; + UIImageView Icon; + UILabelButtonExt settingLabelButtonExt; + SettingItem sItemInfo = {SETTING_ITEM_ZERO, nullptr, STR_EXERCISE_GENERAL, false}; }; } 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 385566ad2..18d64c2a8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h @@ -1,8 +1,9 @@ /* - * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. - * Description: SettingModel.h - * Author: - * Create: 2021-11-23 + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-03-30 09:14:38 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-03 09:32:37 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h */ #ifndef SETTING_MODEL_H @@ -12,7 +13,6 @@ #include #include "AppViewIDs.h" #include "components/ui_label_ext.h" -#include"language/font/ui_resource_string.h" #include "UiConfig.h" #include "SettingItem.h" #include "SettingPresenter.h" @@ -32,11 +32,11 @@ namespace OHOS private: SettingModel(); - SettingModel(const SettingModel &); - SettingModel &operator=(const SettingModel &); + SettingModel(const SettingModel &) = delete; + SettingModel &operator=(const SettingModel &) = delete; virtual ~SettingModel(); static const uint16_t SETTING_ITEM_LEN = 6; - SettingItem settings[SETTING_ITEM_LEN] = {SETTING_ITEM_ZERO, nullptr, nullptr, false}; + SettingItem settings[SETTING_ITEM_LEN] = {SETTING_ITEM_ZERO, nullptr, STR_EXERCISE_GENERAL, false}; std::map settingIdToViewId; bool btConnectStatus{false}; }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingPresenter.h index 6fd77eefd..1dc7a162d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingPresenter.h @@ -1,17 +1,16 @@ /* - * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. - * Description: SettingPresenter.h - * Author: - * Create: 2021-11-23 + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-02-19 11:58:05 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-03 09:36:58 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingPresenter.h */ - #ifndef SETTING_PRESENTER_H #define SETTING_PRESENTER_H #include "Presenter.h" #include "components/ui_view.h" -#include "KeyInputListener.h" - +#include "View.h" namespace OHOS { class SettingView; diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h index e859137a5..5f327fa9d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h @@ -1,10 +1,10 @@ /* - * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. - * Description: SettingView.h - * Author: - * Create: 2021-11-23 + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-03-30 09:14:38 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-02 16:39:44 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingView.h */ - #ifndef SETTING_VIEW_H #define SETTING_VIEW_H @@ -12,7 +12,6 @@ #include "components/root_view.h" #include "components/ui_view_group.h" #include "components/ui_scroll_view.h" -#include "components/ui_label.h" #include "components/ui_label_ext.h" #include "components/ui_list.h" #include "window/window.h" @@ -38,7 +37,7 @@ namespace OHOS SettingAdapter *listAdapter{nullptr}; UIScrollView *scrollView{nullptr}; UIList *contentList{nullptr}; - UILabel *title{nullptr}; + UILabelExt *title{nullptr}; UIView::OnDragListener *dragListener{nullptr}; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingAdapter.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingAdapter.cpp index e04e1fb18..fab02631d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingAdapter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingAdapter.cpp @@ -1,12 +1,11 @@ /* - * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. - * Description: SettingAdapter.cpp - * Author: - * Create: 2021-11-23 + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-01-29 15:37:44 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-03 14:11:14 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingAdapter.cpp */ - #include "SettingAdapter.h" - namespace OHOS { SettingAdapter::SettingAdapter() {} @@ -36,6 +35,7 @@ namespace OHOS UIView *SettingAdapter::GetView(UIView *inView, int16_t index) { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingAdapter::GetView:%d",index); if (listData.empty()) { return nullptr; 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 50a8d9d02..4a3b85082 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp @@ -1,20 +1,14 @@ -/*** - * @Author: Caisking 3449750381@qq.com - * @Date: 2024-01-29 19:58:37 - * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-03-26 21:02:12 - * @FilePath: /sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp - * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - */ /* - * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. - * Description: SettingItemView.cpp - * Author: - * Create: 2021-11-23 + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-03-27 19:48:49 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-03 14:11:23 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingItemView.cpp */ #include "wearable_log.h" #include "SettingItemView.h" +#include "common/image_cache_manager.h" namespace OHOS { @@ -32,50 +26,45 @@ namespace OHOS SettingItemView::SettingItemView() { - SetPosition(0, 0, 380, 120); + SetPosition(0, 120, 380, 120); SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); SetStyle(STYLE_BACKGROUND_OPA, UN_OPACITY); SetTouchable(true); SetUpChild(); - - Add(&sBackground); - Add(&sIcon); - Add(&sLabel); - Add(&sNextImage); + Add(&settingLabelButtonExt); + Add(&Icon); } SettingItemView::~SettingItemView() { - Remove(&sBackground); - Remove(&sIcon); - Remove(&sLabel); - Remove(&sNextImage); + Remove(&settingLabelButtonExt); + Remove(&Icon); } void SettingItemView::SetItemInfo(const SettingItem itemInfo) { sItemInfo = itemInfo; - sIcon.SetSrc(itemInfo.icon); - sLabel.SetText(itemInfo.label); - sNextImage.SetVisible(itemInfo.hasSecondMenu); + Icon.SetSrc(itemInfo.icon); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%d", itemInfo.textId); + settingLabelButtonExt.SetTextId(itemInfo.textId); } void SettingItemView::SetUpChild() { - sBackground.SetSrc(PNG_SETTING_BACKGROUND_IMAGE); - - sIcon.SetPosition(SETTING_ICON_X, SETTING_SICON_Y); - sIcon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE); - - sLabel.SetPosition(SETTING_SLABEL_X, SETTING_SLABEL_Y, SETTING_SLABEL_W, SETTING_SLABEL_H); - sLabel.SetStyle(STYLE_TEXT_FONT, SETTING_SLABEL_FONT_SIZE); - sLabel.SetStyle(STYLE_LINE_HEIGHT, SETTING_SLABEL_FONT_HEIGHT); - sLabel.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS); - sLabel.SetFont(DEFAULT_VECTOR_FONT_FILENAME, SETTING_SLABEL_FONT_SIZE); + Icon.SetPosition(SETTING_ICON_X, SETTING_SICON_Y); + Icon.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE); - sNextImage.SetSrc(PNG_SETTING_NEXT_IMAGE); - sNextImage.SetPosition(SETTING_SNEXTIMAGE_X, (SETTING_SBACKGROUND_HEIGHT - sNextImage.GetHeight()) / NUMS_2); - sNextImage.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE); + settingLabelButtonExt.SetPosition(0, 0, 380, 100); + settingLabelButtonExt.SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919); + settingLabelButtonExt.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + settingLabelButtonExt.SetStyle(STYLE_LINE_HEIGHT, 35); + settingLabelButtonExt.SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED); + settingLabelButtonExt.SetAlign(TEXT_ALIGNMENT_LEFT); + settingLabelButtonExt.SetLabelPosition(115, 0); + settingLabelButtonExt.SetImagePosition(326, 37); + settingLabelButtonExt.SetTouchable(false); + ImageInfo *img = ImageCacheManager::GetInstance().LoadSingleRes(PNG_SETTING_NEXT_IMAGE); + settingLabelButtonExt.SetImageSrc(img, img); } SettingIndex SettingItemView::GetSettingIndex() 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 06bc0472b..6490b1759 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp @@ -1,13 +1,13 @@ /* - * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. - * Description: SettingModel.cpp - * Author: - * Create: 2021-11-23 + * @Author: luozheng 1732036298@qq.com + * @Date: 2024-02-18 09:09:13 + * @LastEditors: luozheng 1732036298@qq.com + * @LastEditTime: 2024-04-03 09:38:57 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingModel.cpp */ - #include "SettingModel.h" #include "PullUpDownView.h" - +#include "language/font/ui_resource_string.h" namespace OHOS { SettingModel::SettingModel() {} @@ -22,12 +22,12 @@ namespace OHOS void SettingModel::InitSettingItem() { - settings[0] = {SETTING_ITEM_ZERO, PNG_SETTINGS_DISPLAY_BRIGHTNESS, "屏幕与亮度", true}; - settings[1] = {SETTING_ITEM_ONE, PNG_SETTINGS_BLUETOOTH, "蓝牙", true}; - settings[2] = {SETTING_ITEM_TWO, PNG_SETTINGS_SOUND_VIBRATION, "声音与震动", true}; - settings[3] = {SETTING_ITEM_THREE, PNG_SETTINGS_SECONDARY_FUNCTION, "辅助功能", true}; - settings[4] = {SETTING_ITEM_FOUR, PNG_SETTINGS_SYSTEM, "系统", true}; - settings[5] = {SETTING_ITEM_FIVE, PNG_SETTINGS_SETTINGS_POWER_CONTROL, "关机和重启", true}; + settings[0] = {SETTING_ITEM_ZERO, PNG_SETTINGS_DISPLAY_BRIGHTNESS, STR_SCREEN_AND_BRIGHTNESS, true}; + settings[1] = {SETTING_ITEM_ONE, PNG_SETTINGS_BLUETOOTH, STR_BLUETOOTH, true}; + settings[2] = {SETTING_ITEM_TWO, PNG_SETTINGS_SOUND_VIBRATION, STR_SOUND_AND_VIBRATION, true}; + settings[3] = {SETTING_ITEM_THREE, PNG_SETTINGS_SECONDARY_FUNCTION, STR_QUICK_ACCESS, true}; + settings[4] = {SETTING_ITEM_FOUR, PNG_SETTINGS_SYSTEM, STR_SYSTEM, true}; + settings[5] = {SETTING_ITEM_FIVE, PNG_SETTINGS_SETTINGS_POWER_CONTROL, STR_SHUTDOWN_AND_RESTART, true}; settingIdToViewId.insert(std::pair(SETTING_ITEM_ZERO, VIEW_DISPLAY_BRIGHTNESS)); settingIdToViewId.insert(std::pair(SETTING_ITEM_ONE, VIEW_CLASSIC_BLUETOOTH)); settingIdToViewId.insert(std::pair(SETTING_ITEM_TWO, VIEW_SOUND_VIBRATION)); diff --git a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingView.cpp index 327fae113..6059b6e1b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/src/SettingView.cpp @@ -10,23 +10,25 @@ #include "SettingView.h" #include "SettingItem.h" #include "SettingPresenter.h" - +#include "language/font/ui_resource_string.h" namespace OHOS { /* ---------------------------------- 设置标签 ---------------------------------- */ - static constexpr int16_t SETTING_TITLE_POSITION_X = 203; + static constexpr int16_t SETTING_TITLE_POSITION_X = 83; static constexpr int16_t SETTING_TITLE_POSITION_Y = 52; - static constexpr int16_t SETTING_TITLE_SIZE_WIDTH = 60; - static constexpr int16_t SETTING_TITLE_SIZE_HEIGHT = 35; + static constexpr int16_t SETTING_TITLE_SIZE_WIDTH = 300; + static constexpr int16_t SETTING_TITLE_SIZE_HEIGHT = 40; static constexpr uint8_t SETTINGS_TITLE_FONT_SIZE = 30; // 字体大小 static constexpr uint8_t SETTINGS_TITLE_FONT_HEIGHT = 35; // 字体高度 /* --------------------------------- 设置List --------------------------------- */ static constexpr int16_t SETTING_LIST_POSITION_X = 43; static constexpr int16_t SETTING_LIST_POSITION_Y = 120; - static constexpr int16_t SETTING_SCROLLBLANKSIZE = 35; //设置此滚动视图的空白大小。 + static constexpr int16_t SETTING_SCROLLBLANKSIZE = 35; // 设置此滚动视图的空白大小。 static constexpr int16 MAX_SCR_DIS = 1000; static constexpr int16 LIST_POS = 20; static constexpr int16 SNUM_2 = 2; + static constexpr int16 ROLLSPEED = 40; + static constexpr int16 REBOUNDSIZE = 30; SettingView::SettingView() { @@ -60,24 +62,19 @@ namespace OHOS BaseView::RootView(Color::Black().full); - listAdapter = new SettingAdapter(); - if (listAdapter == nullptr) - { - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingView::OnStart::listAdapter is nullptr"); - return; - } - listAdapter->SetItemClickListener(presenter_); - - title = new UILabel(); + title = new UILabelExt(); if (title == nullptr) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingView::OnStart::title is nullptr"); return; } title->SetPosition(SETTING_TITLE_POSITION_X, SETTING_TITLE_POSITION_Y, SETTING_TITLE_SIZE_WIDTH, SETTING_TITLE_SIZE_HEIGHT); - title->SetText("设置"); + // title->SetText("设置"); + title->SetTextId(STR_SETTING); title->SetStyle(STYLE_TEXT_FONT, SETTINGS_TITLE_FONT_SIZE); title->SetStyle(STYLE_LINE_HEIGHT, SETTINGS_TITLE_FONT_HEIGHT); + title->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); + title->SetRollSpeed(ROLLSPEED); title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, SETTINGS_TITLE_FONT_SIZE); title->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); title->SetStyle(STYLE_TEXT_OPA, OPA_OPAQUE); @@ -85,20 +82,29 @@ namespace OHOS title->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); title->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE); - contentList = new UIList(); + listAdapter = new SettingAdapter(); + if (listAdapter == nullptr) + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingView::OnStart::listAdapter is nullptr"); + return; + } + UIView::OnClickListener *clicklistener = static_cast(SettingPresenter::GetInstance()); + listAdapter->SetItemClickListener(clicklistener); + contentList = new UIList(UIList::VERTICAL); if (contentList == nullptr) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SettingView::OnStart::contentList is nullptr"); return; } - contentList->SetPosition(SETTING_LIST_POSITION_X, SETTING_LIST_POSITION_Y); - contentList->Resize(HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); + contentList->SetPosition(SETTING_LIST_POSITION_X, SETTING_LIST_POSITION_Y, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); + contentList->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); contentList->SetScrollBlankSize(SETTING_SCROLLBLANKSIZE); contentList->SetSelectPosition(HORIZONTAL_RESOLUTION / SNUM_2); // middle position contentList->SetDraggable(true); contentList->SetThrowDrag(false); contentList->EnableAutoAlign(true); - contentList->SetMaxScrollDistance(MAX_SCR_DIS); + contentList->SetReboundSize(REBOUNDSIZE); + contentList->SetMaxScrollDistance(MAX_SCR_DIS / SNUM_2); scrollView = new UIScrollView(); if (scrollView == nullptr) @@ -110,8 +116,7 @@ namespace OHOS scrollView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); scrollView->SetStyle(STYLE_BACKGROUND_OPA, UN_OPACITY); scrollView->SetScrollBlankSize(SETTING_SCROLLBLANKSIZE); - scrollView->SetReboundSize(50); - scrollView->SetDirection(1); + scrollView->SetHorizontalScrollState(false); scrollView->SetTouchable(true); scrollView->SetThrowDrag(true); @@ -119,7 +124,7 @@ namespace OHOS RootView::OnKeyActListener *keyactListener = (RootView::OnKeyActListener *)OHOS::SettingPresenter::GetInstance(); RootView::GetInstance()->SetOnKeyActListener(keyactListener); RootView::GetInstance()->SetIntercept(true); - + dragListener = new SettingPresenter(); if (dragListener == nullptr) { @@ -141,9 +146,7 @@ namespace OHOS scrollView->Add(title); scrollView->Add(contentList); RootView::GetInstance()->Add(scrollView); - contentList->SetAdapter(listAdapter); - Draw(); return; } diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang index c011d799b..263ee97cd 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang index 0cbfc10dc..137b62e06 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ja.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h index 08b42bdb4..70d61000e 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h @@ -1,15 +1,15 @@ -/* -* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved. -* Description: language -* Author: Graphic develop team -* Create: 2021-07-06 -*/ - -#ifndef UI_RESOURCE_STRING_H -#define UI_RESOURCE_STRING_H -#include -namespace OHOS { -enum UIResourceTextId : uint16_t { +/* +* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved. +* Description: language +* Author: Graphic develop team +* Create: 2021-07-06 +*/ + +#ifndef UI_RESOURCE_STRING_H +#define UI_RESOURCE_STRING_H +#include +namespace OHOS { +enum UIResourceTextId : uint16_t { STR_EXERCISE_GENERAL = 0, STR_EXERCISE_FREETRAINING = 1, STR_EXERCISE_RESISTANCETRAINING = 2, @@ -251,10 +251,52 @@ enum UIResourceTextId : uint16_t { STR_EXERCISE_KETTLEBELLTRAINING = 238, STR_EXTREME_ORIENTEERING = 239, STR_INSUFFICIENT_EXERCISE_AMOUNT = 240, - STR_MAX_ID = 241, + STR_SETTING = 241, + STR_SCREEN_AND_BRIGHTNESS = 242, + STR_BRIGHTNESS_ADJUSTMENT = 243, + STR_SCREEN_ON_DURATION = 244, + STR_5_SECONDS = 245, + STR_10_SECONDS = 246, + STR_15_SECONDS = 247, + STR_30_SECONDS = 248, + STR_60_SECONDS = 249, + STR_300_SECONDS = 250, + STR_RAISE_TO_WAKE = 251, + STR_BLUETOOTH = 252, + STR_BLUETOOTH_HEADPHONES = 253, + STR_TRADITIONAL_BLUETOOTH = 254, + STR_AUTO_OFF_BLUETOOTH_NOTE = 255, + STR_SOUND_AND_VIBRATION = 256, + STR_SYSTEM_VOLUME = 257, + STR_ALARM_REMINDERS_FIND_WATCH = 258, + STR_CALL_VOLUME = 259, + STR_WATCH_CALLS = 260, + STR_MEDIA_VOLUME = 261, + STR_MUSIC_RECORDINGS_WORKOUTS = 262, + STR_VIBRATION_REMINDER = 263, + STR_SILENT_MODE = 264, + STR_SYSTEM_VOLUME_UNAFFECTED = 265, + STR_QUICK_ACCESS = 266, + STR_ACCESSIBILITY = 267, + STR_ACCESSIBILITY_BUTTON = 268, + STR_QUICK_ACCESS_APP = 269, + STR_HEART_RATE_MONITORING = 270, + STR_BLOOD_OXYGEN_MONITORING = 271, + STR_SYSTEM = 272, + STR_ABOUT_WATCH = 273, + STR_REGULATORY_MODE = 274, + STR_SWITCH_LANGUAGE = 275, + STR_LANGUAGE = 276, + STR_FACTORY_RESET = 277, + STR_SYSTEM_UPDATE = 278, + STR_SHUTDOWN_AND_RESTART = 279, + STR_RESTART = 280, + STR_SHUTDOWN = 281, + STR_4G_CAPABILITY = 282, + STR_MAX_ID = 283, }; // UIResourceTextId - -enum FontLanguageId : uint8_t { + +enum FontLanguageId : uint8_t { LANGUAGE_ID_JA, LANGUAGE_ID_ZH, LANGUAGE_ID_EN, diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang index cd291d402..b8c4591b2 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ