From: Caisking <3449750381@qq.com> Date: Thu, 28 Mar 2024 08:53:32 +0000 (+0800) Subject: 舞蹈列表适配多国语言 X-Git-Tag: release_V1.2.70_20241020_135402~1241^2~21^2~4 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=26ac1755e721aff3a123ebe014265ff850703291;p=mirrors%2FFD230.git 舞蹈列表适配多国语言 --- diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h index 6674068f8..e62dd0776 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h @@ -3,6 +3,7 @@ #ifndef NATIVE_LAUNCHER_H #define NATIVE_LAUNCHER_H #include "AppViewIDs.h" +#include "components/ui_label_ext.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h index 91d856c74..1f7958c48 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h @@ -18,6 +18,7 @@ #include "components/icon_adapter.h" #include "AlipayPresenter.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "AlipayListAdapter.h" #include "AlipayListItem.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h index b38739a42..61f50ca9c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h @@ -19,6 +19,7 @@ #include "components/icon_adapter.h" #include "AlipayPresenter.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "AlipayTransListAdapter.h" #include "AlipayTransListItem.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h index 216ec34bd..92a191968 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h @@ -18,6 +18,7 @@ #include "bundle_info.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "ohos_types.h" #define APP_MAX_NUM 50 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 f282011c4..32531f8e0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp @@ -15,6 +15,7 @@ #include "UiConfig.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "ApplistModel.h" #include "ApplistPresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h index f7c45b95e..3d52d902e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h @@ -11,6 +11,7 @@ #include "string" #include "PhoneService.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "message.h" #include "msg_center.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp index 209404c63..26c238d79 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "graphic_math.h" #include "classicbluetooth/include/ClassicBlueToothPresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassPresenter.h index e742c53b6..4e0bff94d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassPresenter.h @@ -13,6 +13,7 @@ #include "ohos_types.h" #include "UiConfig.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "CompassView.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h index b3597629b..b99f8b1f0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h @@ -12,6 +12,7 @@ #include "ohos_types.h" #include "UiConfig.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "CompassView.h" #include "CompassPresenter.h" #include "CompassModel.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdatePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdatePresenter.cpp index 674eaee73..2bea00464 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdatePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdatePresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "DialViewGroup.h" #include "dialupdate/include/DialUpdatePresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp index 72ea7cf17..d9fbff571 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp index 7818faa35..e15ce4295 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp @@ -6,6 +6,7 @@ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp */ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "findphone/include/FindPhonePresenter.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp index 124c7b50b..fa7e01295 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp @@ -8,6 +8,7 @@ #include "KeyInputListener.h" #include "common/key_code.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "View.h" #include "MainViewSample.h" #include "wearable_log.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/en.lang index a58e4c0b5..14a2769fa 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/en.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/en.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/ui_resource_string.h index 309da6b0f..f1519707c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/ui_resource_string.h +++ b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/ui_resource_string.h @@ -10,26 +10,17 @@ #include namespace OHOS { enum UIResourceTextId : uint16_t { - STR_IMAGE = 0, - STR_PROGRESSBAR = 1, - STR_SLIDEUNLOCK = 2, - STR_LISTBOX = 3, - STR_BUTTON = 4, - STR_SCROLLVIEW = 5, - STR_SCROLLGRID = 6, - STR_CLOCK = 7, - STR_DISTURBANCE = 8, - STR_BRIGHT = 9, - STR_PHONE = 10, - STR_LANGAGE = 11, - STR_ALARM = 12, - STR_SYSTEM = 13, - STR_SPO2 = 14, - STR_COMPASS = 15, - STR_INDOORWALK = 16, - STR_WEATHER = 17, - STR_SYSTEMSETTING = 18, - STR_MAX_ID = 19, + STR_DANCING_GENERAL = 0, + STR_DANCING_BELLY = 1, + STR_DANCING_JAZZ = 2, + STR_DANCING_LATIN = 3, + STR_DANCING_BALLET = 4, + STR_DANCING_STREET = 5, + STR_DANCING_PUBLICSQUARE = 6, + STR_DANCING_ZUMBA = 7, + STR_DANCING_SOCIALDANCE = 8, + STR_DANCING_TAPDANCE = 9, + STR_MAX_ID = 10, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/zh.lang b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/zh.lang index de8ffb0fa..99a0a9ede 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/zh.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/zh.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/language_en.xml b/code/sdk/application/wearable/fd230app/nativeui/language/language_en.xml index 7d4baae84..1f95633a5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/language_en.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/language_en.xml @@ -1,22 +1,12 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/language_zh.xml b/code/sdk/application/wearable/fd230app/nativeui/language/language_zh.xml index 14e03d60f..4ae8a1f13 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/language_zh.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/language_zh.xml @@ -1,22 +1,12 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h index 67fa5473b..14f487033 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h @@ -13,6 +13,7 @@ #include #include #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "MessagePresenter.h" #include "message/include/MessageAdapter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp index 96367990d..8855fde0b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "message/include/MessagePresenter.h" #include "message/include/MessageAdapter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp index 000fd86e3..c4c704a72 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp @@ -9,6 +9,7 @@ #include "VocassistView.h" #include "VocassistModel.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "graphic_service.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp index 71f87d970..da6f21ab7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp @@ -5,6 +5,7 @@ * Create: 2022-01-18 */ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "VocassistPresenter.h" #include "PlayersModel.h" #include "ui_service.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp index 8c58506ed..e9a094a1d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp @@ -8,6 +8,7 @@ #include #include "cmsis_os.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "PlayersModel.h" #include "CallerLogModel.h" #include "VocassistModel.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp index 0987a0b0d..55b9b043b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "string" #include "phone/include/PhoneCallPresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallingPresenter.cpp index d5d1d01ab..0240b4c21 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallingPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "phone/include/PhoneCallingPresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallupPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallupPresenter.cpp index afff599d1..d521f2022 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallupPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallupPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "phone/include/PhoneCallupPresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirPresenter.cpp index d67d46502..8d8be5705 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "phone/include/PhoneDirPresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhonePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhonePresenter.cpp index 67b84321e..08ec440ec 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhonePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhonePresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "phone/include/PhonePresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneRingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneRingPresenter.cpp index 0eac68070..dc6aefc90 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneRingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneRingPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "phone/include/PhoneRingPresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp index 533e48dd6..51eac07d5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp index 6c7c1dad3..2d95ec3e4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/rotate/src/RotatePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/rotate/src/RotatePresenter.cpp index 208c5830b..eb12881ea 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/rotate/src/RotatePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/rotate/src/RotatePresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "rotate/include/RotatePresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp index 794e9e1da..6eec6f507 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "saveele/include/SaveBatPresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveElePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveElePresenter.cpp index da6f4d97e..72e1d608a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveElePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveElePresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "saveele/include/SaveElePresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp b/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp index 1a98c4c2e..44056897c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp @@ -9,6 +9,7 @@ #include "power_display_service.h" #include "NativeAbility.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "MainViewSample.h" #include "ui_screennotify.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingAttentionPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingAttentionPresenter.cpp index 744b85ac3..86ff4f36a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingAttentionPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingAttentionPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "secondaryfunction/include/FastTrainingAttentionPresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingPresenter.cpp index a1a0d8f64..7fc99d381 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionPresenter.cpp index 1f104dd13..444fd4f05 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "secondaryfunction/include/SecondaryFunctionPresenter.h" #include "secondaryfunction/include/SecondaryFunctionModel.h" 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 fc1649b88..a19197968 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h @@ -11,6 +11,7 @@ #include #include #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "SettingItem.h" #include "SettingPresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp index 067f39a68..b7d672af5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/MediaVolumePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/MediaVolumePresenter.cpp index f76bb1726..9b7bcda4b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/MediaVolumePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/MediaVolumePresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp index f50de29c3..7be9ac504 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp @@ -7,6 +7,7 @@ */ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumePresenter.cpp index 719e50383..f9f56acc0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumePresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemLanguageView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemLanguageView.cpp index 6bf24f867..08452c61e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemLanguageView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemLanguageView.cpp @@ -138,8 +138,8 @@ namespace OHOS return nullptr; } Title->SetPosition(203, 52, 200, 35); - Title->SetTextId(11); - //Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); + Title->SetTextId(0); + // Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); scrollView->Add(Title); /* ------------------------------- Background ------------------------------- */ ImageConfig imageconfig = { @@ -210,7 +210,7 @@ namespace OHOS return nullptr; } SetRadioButtonSelectStatus(*SimplifiedChineseRadioButton, true); - UICheckBox::OnChangeListener *SimplifiedChineseRadioButtonChange = static_cast(new RadiobuttonOnChangeListener(SimplifiedChineseRadioButton,Title)); + UICheckBox::OnChangeListener *SimplifiedChineseRadioButtonChange = static_cast(new RadiobuttonOnChangeListener(SimplifiedChineseRadioButton, Title)); SimplifiedChineseRadioButton->SetOnChangeListener(SimplifiedChineseRadioButtonChange); scrollView->Add(SimplifiedChineseRadioButton); /* --------------------------- EnglishRadioButton --------------------------- */ @@ -223,7 +223,7 @@ namespace OHOS WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemLanguageView::EnglishRadioButton new fail!"); return nullptr; } - UICheckBox::OnChangeListener *EnglishRadioButtonChange = static_cast(new RadiobuttonOnChangeListener(EnglishRadioButton,Title)); + UICheckBox::OnChangeListener *EnglishRadioButtonChange = static_cast(new RadiobuttonOnChangeListener(EnglishRadioButton, Title)); EnglishRadioButton->SetOnChangeListener(EnglishRadioButtonChange); scrollView->Add(EnglishRadioButton); initViewStatus = true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp index b5b41514c..becd82344 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" @@ -10,7 +11,7 @@ #include "common/key_code.h" #include "custom_utils.h" #include "language/LanguageInit.h" - +#include "language/language_config/font/ui_resource_string.h" namespace OHOS { @@ -212,7 +213,7 @@ namespace OHOS // 英语文本 g_planguage->ChangeLanguage(LanguageId::EN); } - m_label->SetTextId(11); + m_label->SetTextId(0); // 强制刷新 m_label->ForceResetText(); RootView::GetInstance()->Invalidate(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlPresenter.cpp index 12df75ea6..14fe10789 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp index 9dfa98990..a538694d8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingControlView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataPresenter.cpp index ed60bdda2..d1d6d9c08 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp index 01cb5fdcf..81b4e0703 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingDataView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailPresenter.cpp index 051c42c3b..8dda5074b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailPresenter.cpp @@ -1,6 +1,7 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp index 4932ae601..511fdd02b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingDetailView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp index 8d5d8c199..a66979ef1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp index b4366e081..f61af205e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingEnddataView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2Presenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2Presenter.cpp index ae8c85959..a095a63f5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2Presenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2Presenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp index 47283cb64..7c1092a28 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingEndnote2View.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnotePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnotePresenter.cpp index 80c7f151d..579a4541a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnotePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnotePresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp index bcd8051fb..a5a8743bd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingEndnoteView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicPresenter.cpp index 487a9ffe0..cc33cbb7a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicView.cpp index e93705bcc..e92aeb9df 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicView.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingMusicView.h" #include #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp index 3399980e4..01bd0b215 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp index 96988b85e..9a5092d85 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingNomalView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp index 6e9eea6f0..8e7b51911 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp @@ -1,6 +1,7 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp index 1d41ef508..21792d050 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp index 31e05e9f7..7951e096b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingSetCaluliView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp index 0fb5cf850..8933844ec 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp index 68e4a58c8..7227baefe 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingSetDistView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp index 79af641af..c71b7f6c7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp index 5841d3d58..8f1c38d78 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp index 850f0903e..77b5b44ba 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingSetSeptView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp index 124473c74..8a9d0fcb6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp index 83a734391..1f6fa7e16 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingSetTimeView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp index 0ab028207..02b3a273a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingSetView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongPresenter.cpp index 10310c69d..dd40b8c3a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp index 5f16244b0..f2a6f839d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingStrongView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp index e351587e9..8e6632b4c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp index 81105ecb2..16ad8be83 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp @@ -2,6 +2,7 @@ #include "traing/include/TraingWinView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp index 0c381c4a5..ba0db55dd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp index 275003476..a9392e17f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp @@ -2,6 +2,7 @@ #include "traing/training_GPS/include/TraingGPSView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp index 7d2451626..c0f0d2ad2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp index 0d6b591ab..cff68a353 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp @@ -2,6 +2,7 @@ #include "traing/training_GPS/include/TraingGPSbackView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp index 0bb60ac5a..3136d9199 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp index 0cc434ae7..c368e60ff 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp @@ -2,6 +2,7 @@ #include "traing/training_GPS/include/TraingGPSlackView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp index eb6101ad8..befcc3c67 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp index cf1e9dd9d..50478aae2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp @@ -2,6 +2,7 @@ #include "traing/training_GPS/include/TraingGPSlostView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp index d04cba8a2..e0f367deb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp index b1cb0a3bd..802f92f39 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp @@ -2,6 +2,7 @@ #include "traing/training_GPS/include/TraingGPSnoteView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp index 17bc6aa2d..30264833c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp index 0db56d57d..811207e92 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp @@ -2,6 +2,7 @@ #include "traing/training_GPS/include/TraingGPSsetView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp index ae59a77a5..46b2874ca 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp @@ -1,6 +1,7 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp index e318451ef..6812d3130 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp @@ -1,6 +1,7 @@ #include "traing/training_card/include/TraingCardView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp index e1f8a3570..dfe9ee44d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp @@ -11,7 +11,9 @@ #include "traing/training_card/include/Training_CardView.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "wearable_log.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp index a0c29297e..0d37b1055 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp @@ -2,6 +2,7 @@ #include "traing/training_card/include/Training_CardView.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceAdapter.h index 379ee505c..e1c00f211 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceAdapter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceAdapter.h @@ -1,4 +1,4 @@ -/*** +/*** * @Author: Caisking 3449750381@qq.com * @Date: 2024-03-27 11:09:52 * @LastEditors: Caisking 3449750381@qq.com @@ -16,7 +16,8 @@ #include "components/ui_label.h" #include "components/ui_checkbox.h" #include "AppViewIDs.h" - +#include "components/ui_label_ext.h" +#include "language/language_config/font/ui_resource_string.h" // 列表的适配器 namespace OHOS { @@ -24,7 +25,7 @@ namespace OHOS typedef struct { AppViewId id; - const char *label; // 标签 + UIResourceTextId labelid; // 标签 } TraingDanceItem; class TraingDanceAdapter : public AbstractAdapter diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h index a3609957e..f5ba629b2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h @@ -1,4 +1,19 @@ - +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-27 15:24:12 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-28 16:46:53 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-27 15:24:12 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-28 16:42:47 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #ifndef TraingDance_ITEM_VIEW_H #define TraingDance_ITEM_VIEW_H @@ -10,6 +25,8 @@ #include "traing/training_list_dance/include/TraingDanceAdapter.h" #include "components/ui_label_button.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" +#include "components/ui_label_ext.h" #include "ohos_types.h" namespace OHOS @@ -26,9 +43,9 @@ namespace OHOS private: TraingDanceItemView(const TraingDanceItemView &); UIImageView sbackground; // 背景 - UIImageView sicon; // 箭头 - UILabel sLabel; // 标签 - TraingDanceItem sItemInfo = {VIEW_INVALID, nullptr}; + UIImageView sicon; // 箭头 + UILabelExt sLabel; // 标签 + TraingDanceItem sItemInfo = {VIEW_INVALID, STR_DANCING_GENERAL}; }; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceModel.h index bbb7296a6..0201b669e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceModel.h @@ -13,6 +13,8 @@ #include #include #include "AppViewIDs.h" +#include "components/ui_label_ext.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "TraingDancePresenter.h" #include "traing/training_list_dance/include/TraingDanceAdapter.h" @@ -34,7 +36,7 @@ namespace OHOS TraingDanceModel &operator=(const TraingDanceModel &); virtual ~TraingDanceModel(); static const uint16_t TraingDanceListMaxNum = 10; - TraingDanceItem TraingDances[TraingDanceListMaxNum] = {VIEW_INVALID, nullptr}; + TraingDanceItem TraingDances[TraingDanceListMaxNum] = {VIEW_INVALID, STR_DANCING_GENERAL}; // std::map TraingDanceIdToViewId; bool btConnectStatus{false}; }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp index 27095a06c..dae01e2e2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp @@ -2,6 +2,7 @@ #include "traing/training_list_dance/include/TraingDanceItemView.h" #include "traing/include/TraingModel.h" #include "traing/Training_UiConfig.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" namespace OHOS { @@ -30,7 +31,7 @@ namespace OHOS void TraingDanceItemView::SetItemInfo(const TraingDanceItem itemInfo) { sItemInfo = itemInfo; - sLabel.SetText(itemInfo.label); + sLabel.SetTextId(itemInfo.labelid); } /// @brief 设置每一个itemview上的组件 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp index 02867ae52..073773bb8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp @@ -17,9 +17,11 @@ #include "traing/training_list_dance/include/TraingDanceModel.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" namespace OHOS { @@ -33,20 +35,20 @@ namespace OHOS return instance; } - static char *text[] = {"一般舞蹈", "肚皮舞", "爵士舞", "拉丁舞", "芭蕾", "街舞", "广场舞", "尊巴", "社交舞", "踢踏舞"}; + // static char *text[] = {"一般舞蹈", "肚皮舞", "爵士舞", "拉丁舞", "芭蕾", "街舞", "广场舞", "尊巴", "社交舞", "踢踏舞"}; void TraingDanceModel::InitTraingDanceListItem() { - TraingDances[0] = {VIEW_TRAININGNOMAL, "一般舞蹈"}; - TraingDances[1] = {VIEW_TRAININGNOMAL, "肚皮舞"}; - TraingDances[2] = {VIEW_TRAININGNOMAL, "爵士舞"}; - TraingDances[3] = {VIEW_TRAININGNOMAL, "拉丁舞"}; - TraingDances[4] = {VIEW_TRAININGNOMAL, "芭蕾"}; - TraingDances[5] = {VIEW_TRAININGNOMAL, "街舞"}; - TraingDances[6] = {VIEW_TRAININGNOMAL, "广场舞"}; - TraingDances[7] = {VIEW_TRAININGNOMAL, "尊巴"}; - TraingDances[8] = {VIEW_TRAININGNOMAL, "社交舞"}; - TraingDances[9] = {VIEW_TRAININGNOMAL, "踢踏舞"}; + TraingDances[0] = {VIEW_TRAININGNOMAL, STR_DANCING_GENERAL}; + TraingDances[1] = {VIEW_TRAININGNOMAL, STR_DANCING_BELLY}; + TraingDances[2] = {VIEW_TRAININGNOMAL, STR_DANCING_JAZZ}; + TraingDances[3] = {VIEW_TRAININGNOMAL, STR_DANCING_LATIN}; + TraingDances[4] = {VIEW_TRAININGNOMAL, STR_DANCING_BALLET}; + TraingDances[5] = {VIEW_TRAININGNOMAL, STR_DANCING_STREET}; + TraingDances[6] = {VIEW_TRAININGNOMAL, STR_DANCING_PUBLICSQUARE}; + TraingDances[7] = {VIEW_TRAININGNOMAL, STR_DANCING_ZUMBA}; + TraingDances[8] = {VIEW_TRAININGNOMAL, STR_DANCING_SOCIALDANCE}; + TraingDances[9] = {VIEW_TRAININGNOMAL, STR_DANCING_TAPDANCE}; } const TraingDanceItem *TraingDanceModel::GetTraingDancelistItems() const diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp index fe9cd72c0..f67e9add2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp @@ -16,6 +16,7 @@ */ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp index ec71410cc..ac979c2f8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp @@ -3,6 +3,7 @@ #include "traing/include/TraingModel.h" #include "traing/Training_UiConfig.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "wearable_log.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h index ac714dc3c..b09bbf327 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h @@ -16,6 +16,7 @@ #include "components/ui_label.h" #include "components/ui_checkbox.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" // 列表的适配器 namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h index 62eccfd98..84520c59b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h @@ -10,6 +10,7 @@ #include "traing/training_list_ice/include/TraingIceAdapter.h" #include "components/ui_label_button.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "ohos_types.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceModel.h index 1988a7bad..52283f737 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceModel.h @@ -5,6 +5,8 @@ #include #include #include "AppViewIDs.h" +#include "components/ui_label_ext.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "TraingIcePresenter.h" #include "traing/training_list_ice/include/TraingIceAdapter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp index 779f5d59e..451389b7d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp @@ -2,6 +2,7 @@ #include "traing/training_list_ice/include/TraingIceItemView.h" #include "traing/include/TraingModel.h" #include "traing/Training_UiConfig.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp index 12fcd06f5..b76067934 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp @@ -9,9 +9,11 @@ #include "traing/training_list_ice/include/TraingIceModel.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp index 4f902f7fa..ad8e29e2d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp @@ -16,6 +16,7 @@ */ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp index 2201ad008..578568055 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp @@ -3,6 +3,7 @@ #include "traing/include/TraingModel.h" #include "traing/Training_UiConfig.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "wearable_log.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h index 2e84993a1..ab0da9d79 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h @@ -16,6 +16,7 @@ #include "components/ui_label.h" #include "components/ui_checkbox.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" // 列表的适配器 namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h index 729b58f73..005c9c397 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h @@ -17,6 +17,7 @@ #include "traing/training_list_limit/include/TraingLimitAdapter.h" #include "components/ui_label_button.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "ohos_types.h" namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h index cb8433a3c..4a41a4b19 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h @@ -5,6 +5,8 @@ #include #include #include "AppViewIDs.h" +#include "components/ui_label_ext.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "TraingLimitPresenter.h" #include "traing/training_list_limit/include/TraingLimitAdapter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp index d584b2234..a6075e103 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp @@ -2,6 +2,7 @@ #include "traing/training_list_limit/include/TraingLimitItemView.h" #include "traing/include/TraingModel.h" #include "traing/Training_UiConfig.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp index 48a67e507..f733476a5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp @@ -9,9 +9,11 @@ #include "traing/training_list_limit/include/TraingLimitModel.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp index 11593e4ad..236f0ae98 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp @@ -16,6 +16,7 @@ */ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp index 18d6a84de..8972c694f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp @@ -3,6 +3,7 @@ #include "traing/include/TraingModel.h" #include "traing/Training_UiConfig.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "wearable_log.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp index 021f61b0b..bed56e9a5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp index 7bc5b8b20..f601c711b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp @@ -4,6 +4,7 @@ #include "traing/Training_UiConfig.h" #include "common/image_cache_manager.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "ui_resource_image.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp index 13a18d0b5..471141079 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include diff --git a/code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleModel.h b/code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleModel.h index 4a37a0661..0570ca0e1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleModel.h @@ -11,6 +11,7 @@ #include #include #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "UISamplePresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherPresenter.cpp index 723519533..0b8e89fd1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "weather/include/FutureWeatherPresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorPresenter.cpp index 6fffd0098..60d9bbf1b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "weather/include/GetWeatherDataErrorPresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherPresenter.cpp index 39553f891..4c6897e89 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherPresenter.cpp @@ -1,4 +1,5 @@ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "weather/include/MainWeatherPresenter.h" #include "common/key_code.h" diff --git a/code/sdk/application/wearable/nativeabilityfwk/include/ChangeSliceListener.h b/code/sdk/application/wearable/nativeabilityfwk/include/ChangeSliceListener.h index fed36e44f..35b6b85b3 100755 --- a/code/sdk/application/wearable/nativeabilityfwk/include/ChangeSliceListener.h +++ b/code/sdk/application/wearable/nativeabilityfwk/include/ChangeSliceListener.h @@ -18,6 +18,7 @@ #include #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "components/ui_view.h" #include "NativeAbility.h" diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h index cbf615969..c34e4a907 100755 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h @@ -17,6 +17,7 @@ #ifndef NATIVE_LAUNCHER_H #define NATIVE_LAUNCHER_H #include "AppViewIDs.h" +#include "components/ui_label_ext.h" namespace OHOS { class NativeLauncher { diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/src/slices/main/MainView.cpp b/code/sdk/application/wearable/nativeapp/nativelauncher/src/slices/main/MainView.cpp index f180f6eed..3e79969e1 100644 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/src/slices/main/MainView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/src/slices/main/MainView.cpp @@ -15,6 +15,7 @@ #include "MainView.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "wearable_log.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h b/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h index 91d856c74..1f7958c48 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h @@ -18,6 +18,7 @@ #include "components/icon_adapter.h" #include "AlipayPresenter.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "AlipayListAdapter.h" #include "AlipayListItem.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h b/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h index b38739a42..61f50ca9c 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h @@ -19,6 +19,7 @@ #include "components/icon_adapter.h" #include "AlipayPresenter.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "AlipayTransListAdapter.h" #include "AlipayTransListItem.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/applist/include/ApplistModel.h b/code/sdk/application/wearable/nativeapp/nativeui/applist/include/ApplistModel.h index 57db8ce4e..c0a5d913d 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/applist/include/ApplistModel.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/applist/include/ApplistModel.h @@ -10,6 +10,7 @@ #include "bundle_info.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "ohos_types.h" #define APP_MAX_NUM 50 diff --git a/code/sdk/application/wearable/nativeapp/nativeui/callerlog/include/CallerLogModel.h b/code/sdk/application/wearable/nativeapp/nativeui/callerlog/include/CallerLogModel.h index ad21adb9a..9786748f0 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/callerlog/include/CallerLogModel.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/callerlog/include/CallerLogModel.h @@ -11,6 +11,7 @@ #include "string" #include "PhoneService.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "message.h" #include "msg_center.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/compass/include/CompassPresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/compass/include/CompassPresenter.h index 68d6877d8..aa93af255 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/compass/include/CompassPresenter.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/compass/include/CompassPresenter.h @@ -13,6 +13,7 @@ #include "ohos_types.h" #include "UiConfig.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "CompassView.h" namespace OHOS { diff --git a/code/sdk/application/wearable/nativeapp/nativeui/compass/include/MainCompassPresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/compass/include/MainCompassPresenter.h index 0fc70617c..00c389a9f 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/compass/include/MainCompassPresenter.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/compass/include/MainCompassPresenter.h @@ -12,6 +12,7 @@ #include "ohos_types.h" #include "UiConfig.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "CompassView.h" #include "CompassPresenter.h" #include "CompassModel.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/key/src/KeyInputListener.cpp b/code/sdk/application/wearable/nativeapp/nativeui/key/src/KeyInputListener.cpp index 310fcf3a2..d70e6337e 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/key/src/KeyInputListener.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/key/src/KeyInputListener.cpp @@ -8,6 +8,7 @@ #include "KeyInputListener.h" #include "common/key_code.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "View.h" #include "MainViewSample.h" #include "wearable_log.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistModel.cpp b/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistModel.cpp index 000fd86e3..c4c704a72 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistModel.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistModel.cpp @@ -9,6 +9,7 @@ #include "VocassistView.h" #include "VocassistModel.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "NativeAbility.h" #include "graphic_service.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp index 98b97129d..a158f95e9 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp @@ -5,6 +5,7 @@ * Create: 2022-01-18 */ #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "VocassistPresenter.h" #include "PlayersModel.h" #include "ui_service.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp index f67c649ba..ff56910d9 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp @@ -8,6 +8,7 @@ #include #include "cmsis_os.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "PlayersModel.h" #include "CallerLogModel.h" #include "VocassistModel.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp b/code/sdk/application/wearable/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp index da2ae2a46..07627da97 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp @@ -9,6 +9,7 @@ #include "power_display_service.h" #include "NativeAbility.h" #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "MainViewSample.h" #include "ui_screennotify.h" 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..be1e4d5a3 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/settings/include/SettingModel.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/settings/include/SettingModel.h @@ -11,6 +11,7 @@ #include #include #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "SettingItem.h" #include "SettingPresenter.h" diff --git a/code/sdk/application/wearable/nativeapp/nativeui/uisample/include/UISampleModel.h b/code/sdk/application/wearable/nativeapp/nativeui/uisample/include/UISampleModel.h index 4a37a0661..0570ca0e1 100755 --- a/code/sdk/application/wearable/nativeapp/nativeui/uisample/include/UISampleModel.h +++ b/code/sdk/application/wearable/nativeapp/nativeui/uisample/include/UISampleModel.h @@ -11,6 +11,7 @@ #include #include #include "AppViewIDs.h" +#include "components/ui_label_ext.h" #include "UiConfig.h" #include "UISamplePresenter.h" diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/en.lang index a58e4c0b5..14a2769fa 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/en.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/ui_resource_string.h index 309da6b0f..f1519707c 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/ui_resource_string.h +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/ui_resource_string.h @@ -10,26 +10,17 @@ #include namespace OHOS { enum UIResourceTextId : uint16_t { - STR_IMAGE = 0, - STR_PROGRESSBAR = 1, - STR_SLIDEUNLOCK = 2, - STR_LISTBOX = 3, - STR_BUTTON = 4, - STR_SCROLLVIEW = 5, - STR_SCROLLGRID = 6, - STR_CLOCK = 7, - STR_DISTURBANCE = 8, - STR_BRIGHT = 9, - STR_PHONE = 10, - STR_LANGAGE = 11, - STR_ALARM = 12, - STR_SYSTEM = 13, - STR_SPO2 = 14, - STR_COMPASS = 15, - STR_INDOORWALK = 16, - STR_WEATHER = 17, - STR_SYSTEMSETTING = 18, - STR_MAX_ID = 19, + STR_DANCING_GENERAL = 0, + STR_DANCING_BELLY = 1, + STR_DANCING_JAZZ = 2, + STR_DANCING_LATIN = 3, + STR_DANCING_BALLET = 4, + STR_DANCING_STREET = 5, + STR_DANCING_PUBLICSQUARE = 6, + STR_DANCING_ZUMBA = 7, + STR_DANCING_SOCIALDANCE = 8, + STR_DANCING_TAPDANCE = 9, + STR_MAX_ID = 10, }; // UIResourceTextId enum FontLanguageId : uint8_t { diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/zh.lang index de8ffb0fa..99a0a9ede 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/zh.lang differ