From: Caisking <3449750381@qq.com> Date: Thu, 28 Mar 2024 12:15:09 +0000 (+0800) Subject: 冰上运动列表适配多国语言 X-Git-Tag: release_V1.2.70_20241020_135402~1241^2~21^2~2 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=428a4cd54bf97b5c6ee363c526a99f5288d57a87;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 e62dd0776..6674068f8 100644 --- a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h +++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h @@ -3,7 +3,6 @@ #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 1f7958c48..afeb6d973 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 @@ -19,6 +19,7 @@ #include "AlipayPresenter.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 61f50ca9c..c000bc17c 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 @@ -20,6 +20,7 @@ #include "AlipayPresenter.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 92a191968..435c1910e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h @@ -19,6 +19,7 @@ #include "bundle_info.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 32531f8e0..5cfa7ec02 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp @@ -16,6 +16,7 @@ #include "UiConfig.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 3d52d902e..fc7bce0ad 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h @@ -12,6 +12,7 @@ #include "PhoneService.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 26c238d79..fafb264c4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 4e0bff94d..121b77ae0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassPresenter.h @@ -14,6 +14,7 @@ #include "UiConfig.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 b99f8b1f0..f2a93867e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h @@ -13,6 +13,7 @@ #include "UiConfig.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 2bea00464..152b4471b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdatePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdatePresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 d9fbff571..e7b06f48d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhoneView.h b/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhoneView.h index 6340d3ca0..af94c3cce 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhoneView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhoneView.h @@ -5,6 +5,7 @@ #include "View.h" #include "components/ui_view_group.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "components/ui_image_animator.h" #include "components/ui_label_button_ext.h" #include "components/ui_image_view.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 e15ce4295..50aeb34f3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp @@ -7,6 +7,7 @@ */ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 fa7e01295..63b086b22 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp @@ -9,6 +9,7 @@ #include "common/key_code.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "View.h" #include "MainViewSample.h" #include "wearable_log.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp b/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp index 8f9132781..86570cf6c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp @@ -51,8 +51,8 @@ namespace OHOS {"uz", "O‘zbek", "乌兹别克语"}, {"az", "Azərbaycan dili", "阿塞拜疆语"}}; - static const char *en = "user/res/language_config/font/en.lang"; - static const char *zh_CN = "user/res/language_config/font/zh.lang"; + static const char *en = "user/res/font/en.lang"; + static const char *zh_CN = "user/res/font/zh.lang"; static const uint8_t langcount = 2; const char *resFiles[langcount] = {zh_CN, en}; diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang new file mode 100644 index 000000000..62c28e180 Binary files /dev/null and b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.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 new file mode 100644 index 000000000..edb6ce7a9 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h @@ -0,0 +1,45 @@ +/* +* 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_ICE_SPORTS = 0, + STR_ICE_SKATING = 1, + STR_ICE_HOCKEY = 2, + STR_ICE_CURLING = 3, + STR_ICE_SNOWMOBILING = 4, + STR_ICE_SLED = 5, + STR_ICE_BIATHLON = 6, + STR_ICE_CROSSCOUNTRYSKING = 7, + STR_ICE_SKIING = 8, + STR_ICE_SNOWBOARDING = 9, + STR_ICE_SNOWSHOEING = 10, + STR_ICE_SNOWSPORTS = 11, + STR_DANCING_GENERAL = 12, + STR_DANCING_BELLY = 13, + STR_DANCING_JAZZ = 14, + STR_DANCING_LATIN = 15, + STR_DANCING_BALLET = 16, + STR_DANCING_STREET = 17, + STR_DANCING_PUBLICSQUARE = 18, + STR_DANCING_ZUMBA = 19, + STR_DANCING_SOCIALDANCE = 20, + STR_DANCING_TAPDANCE = 21, + STR_ICE_SNOW_SPORTS = 22, + STR_MAX_ID = 23, +}; // UIResourceTextId + +enum FontLanguageId : uint8_t { + LANGUAGE_ID_ZH, + LANGUAGE_ID_EN, + LANGUAGE_ID_MAX +}; // UITextLanguageTextId +} +#endif /* UI_RESOURCE_STRING_H */ diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang new file mode 100644 index 000000000..c56ee17c9 Binary files /dev/null and b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/config.json b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/config.json deleted file mode 100644 index 005a9cbc0..000000000 --- a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/config.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "languages": { - "zh": { - "path": "user/res/language_config/font/zh.lang" - }, - "en": { - "path": "user/res/language_config/font/en.lang" - } - }, - "languages_satuas": 0 -} \ No newline at end of file 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 deleted file mode 100644 index 14a2769fa..000000000 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/en.lang and /dev/null 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 deleted file mode 100644 index f1519707c..000000000 --- a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/ui_resource_string.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -* 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_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 { - LANGUAGE_ID_ZH, - LANGUAGE_ID_EN, - LANGUAGE_ID_MAX -}; // UITextLanguageTextId -} -#endif /* UI_RESOURCE_STRING_H */ 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 deleted file mode 100644 index 99a0a9ede..000000000 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/zh.lang and /dev/null 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 1f95633a5..af555a6d4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/language_en.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/language_en.xml @@ -1,4 +1,18 @@ + + + + + + + + + + + + + + @@ -9,4 +23,6 @@ + + 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 4ae8a1f13..ddec4679c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/language_zh.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/language_zh.xml @@ -1,4 +1,18 @@ + + + + + + + + + + + + + + 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 14f487033..e2fb6d4ea 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h @@ -14,6 +14,7 @@ #include #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 8855fde0b..8ba26d142 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp @@ -1,6 +1,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 c4c704a72..23d4f3c44 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp @@ -10,6 +10,7 @@ #include "VocassistModel.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 da6f21ab7..a394a59d1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp @@ -6,6 +6,7 @@ */ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 e9a094a1d..1780bd66f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp @@ -9,6 +9,7 @@ #include "cmsis_os.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 55b9b043b..62a93c51c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 0240b4c21..95a17c77a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallingPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 d521f2022..300d68352 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallupPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallupPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 8d8be5705..bf2466d1b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 08ec440ec..4252bce7b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhonePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhonePresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 dc6aefc90..38fdf2d7b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneRingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneRingPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 51eac07d5..35594208d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordDeleteView.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordDeleteView.h index 048776003..92fc21842 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordDeleteView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordDeleteView.h @@ -8,6 +8,7 @@ #include "components/ui_image_view.h" #include "components/ui_button.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" namespace OHOS { diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPlayerView.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPlayerView.h index e9d0b7819..9a05c2d66 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPlayerView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPlayerView.h @@ -9,6 +9,7 @@ #include "components/ui_circle_progress.h" #include "components/ui_checkbox.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "components/ui_button.h" #define APP_RES_PATH "/user/res" namespace OHOS 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 2d95ec3e4..f85bd5561 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 eb12881ea..3be61c176 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/rotate/src/RotatePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/rotate/src/RotatePresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 6eec6f507..8732423af 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp @@ -1,6 +1,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 72e1d608a..bf9e632f0 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveElePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveElePresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 44056897c..117e72dfb 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 @@ -10,6 +10,7 @@ #include "NativeAbility.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 86ff4f36a..fc8d59c6d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingAttentionPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingAttentionPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 7fc99d381..aa1e2e67e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 444fd4f05..febc7af98 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionPresenter.cpp @@ -1,6 +1,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 a19197968..385566ad2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h @@ -12,6 +12,7 @@ #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" 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 b7d672af5..69e7f0fa2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 9b7bcda4b..84bde0789 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/MediaVolumePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/MediaVolumePresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 7be9ac504..9ff5d096a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp @@ -8,6 +8,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 f9f56acc0..151f9725e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumePresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLanguageView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLanguageView.h index a84c792f1..9c3f07c08 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLanguageView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLanguageView.h @@ -8,6 +8,7 @@ #include "components/ui_radio_button.h" #include "components/ui_image_view.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" namespace OHOS { class SystemLanguageView 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 becd82344..f3c48e3ad 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "NativeAbility.h" #include "graphic_math.h" #include "string.h" @@ -11,7 +12,7 @@ #include "common/key_code.h" #include "custom_utils.h" #include "language/LanguageInit.h" -#include "language/language_config/font/ui_resource_string.h" +#include "language/font/ui_resource_string.h" namespace OHOS { @@ -198,8 +199,8 @@ namespace OHOS bool RadiobuttonOnChangeListener::OnChange(UICheckBox::UICheckBoxState state) { language *g_planguage; - // static const char *en = "user/res/language_config/font/en.lang"; - // static const char *zh_CN = "user/res/language_config/font/zh.lang"; + // static const char *en = "user/res/font/en.lang"; + // static const char *zh_CN = "user/res/font/zh.lang"; switch (state) { case UICheckBox::SELECTED: diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h index 0e1084299..1e80cc1ab 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h @@ -22,6 +22,7 @@ #include "traing/include/TraingModel.h" #include "traing/Training_UiConfig.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "traing/include/TraingModel.h" #include "traing/Training_UiConfig.h" 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 14fe10789..67b9a1ed8 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 a538694d8..5578eadcb 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 d1d6d9c08..9e73e69b6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataPresenter.cpp @@ -1,6 +1,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 81b4e0703..53f79031a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 8dda5074b..20f24f097 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailPresenter.cpp @@ -2,6 +2,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 511fdd02b..5470ca092 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 a66979ef1..983459fbc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 f61af205e..f83b6f913 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 a095a63f5..d924430ce 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2Presenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2Presenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 7c1092a28..3332c876f 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 579a4541a..e7e8448e3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnotePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnotePresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 a5a8743bd..b6c99eac5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 cc33cbb7a..65dd18790 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 e92aeb9df..f20944733 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicView.cpp @@ -3,6 +3,7 @@ #include #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 01bd0b215..bfcf6bf37 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp @@ -1,6 +1,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 9a5092d85..9ba235bb5 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 8e7b51911..472b82c66 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp @@ -2,6 +2,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 21792d050..b1731eac3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 7951e096b..06141f6fc 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 8933844ec..02e391a3c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 7227baefe..bcbaf84d3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 c71b7f6c7..dde17f27e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 8f1c38d78..20d097633 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 77b5b44ba..1c6408ff1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 8a9d0fcb6..36f58efe9 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 1f6fa7e16..f2d761b53 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 02b3a273a..1203ece44 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 dd40b8c3a..288e0d889 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongPresenter.cpp @@ -1,6 +1,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 f2a6f839d..e810e2351 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 8e6632b4c..c71226bd7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp @@ -1,6 +1,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 16ad8be83..bbd9a44da 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 ba0db55dd..62c4b8573 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,6 +1,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 a9392e17f..1c0712e69 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 @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 c0f0d2ad2..2517296cd 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,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 cff68a353..9ba146b35 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 @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 3136d9199..876edf700 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,6 +1,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 c368e60ff..e6bd415eb 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 @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 befcc3c67..0b0a5d05a 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,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 50478aae2..b7c24621c 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 @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 e0f367deb..84430540f 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,6 +1,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 802f92f39..bc53b07ff 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 @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 30264833c..28285664f 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,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 811207e92..cb8fbe8e7 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 @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 46b2874ca..3279404d6 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 @@ -2,6 +2,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 6812d3130..f4425a77e 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 @@ -2,6 +2,7 @@ #include "traing/training_card/include/TraingCardView.h" #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 dfe9ee44d..b9c7d60fc 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 @@ -12,8 +12,10 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "NativeAbility.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 0d37b1055..4856389c1 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 @@ -3,6 +3,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 e1c00f211..c6fd188e4 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 @@ -17,7 +17,8 @@ #include "components/ui_checkbox.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" -#include "language/language_config/font/ui_resource_string.h" +#include"language/font/ui_resource_string.h" +#include "language/font/ui_resource_string.h" // 列表的适配器 namespace OHOS { 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 f5ba629b2..2fd719472 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 @@ -26,7 +26,9 @@ #include "components/ui_label_button.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "ohos_types.h" namespace OHOS 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 0201b669e..5cae108d7 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 @@ -14,7 +14,9 @@ #include #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "UiConfig.h" #include "TraingDancePresenter.h" #include "traing/training_list_dance/include/TraingDanceAdapter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceView.h index be6094c01..484b4e3dd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceView.h @@ -11,6 +11,7 @@ #include "traing/training_list_dance/include/TraingDanceModel.h" #include "components/ui_label_button_ext.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" namespace OHOS { 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 dae01e2e2..4b907bd49 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 @@ -3,6 +3,7 @@ #include "traing/include/TraingModel.h" #include "traing/Training_UiConfig.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "UiConfig.h" namespace OHOS { 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 073773bb8..6e4535d15 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 @@ -18,10 +18,12 @@ #include "traing/training_list_dance/include/TraingDanceModel.h" #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "UiConfig.h" #include "ui_resource_image.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" namespace OHOS { 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 f67e9add2..deda1774d 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 @@ -17,6 +17,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 ac979c2f8..d0db319fc 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 @@ -4,6 +4,7 @@ #include "traing/Training_UiConfig.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "UiConfig.h" #include "wearable_log.h" @@ -80,8 +81,8 @@ namespace OHOS TraingDanceList->SetMaxScrollDistance(MAX_SCR_DIS); // 增加表冠控制 - TraingDanceList->SetRotateFactor(2); - TraingDanceList->RequestFocus(); + scrollView->SetRotateFactor(2); + scrollView->RequestFocus(); } UIList *TraingDanceView::GetList() { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessView.h index 557378db5..3c54bdaef 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessView.h @@ -11,6 +11,7 @@ #include "traing/training_list_fitness/include/TraingFitnessModel.h" #include "components/ui_label_button_ext.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" namespace OHOS { 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 b09bbf327..50e83636d 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 @@ -1,8 +1,8 @@ -/*** +/*** * @Author: Caisking 3449750381@qq.com * @Date: 2024-03-27 11:09:52 * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-03-27 15:25:46 + * @LastEditTime: 2024-03-28 19:54:05 * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -17,6 +17,7 @@ #include "components/ui_checkbox.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" // 列表的适配器 namespace OHOS @@ -25,7 +26,7 @@ namespace OHOS typedef struct { AppViewId id; - const char *label; // 标签 + UIResourceTextId labelid; // 标签 } TraingIceItem; class TraingIceAdapter : public AbstractAdapter 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 84520c59b..aa1cbe6d8 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 @@ -11,6 +11,7 @@ #include "components/ui_label_button.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "ohos_types.h" namespace OHOS @@ -28,8 +29,8 @@ namespace OHOS TraingIceItemView(const TraingIceItemView &); UIImageView sbackground; // 背景 UIImageView sicon; // 箭头 - UILabel sLabel; // 标签 - TraingIceItem sItemInfo = {VIEW_INVALID, nullptr}; + UILabelExt sLabel; // 标签 + TraingIceItem sItemInfo = {VIEW_INVALID, STR_ICE_SPORTS}; }; } 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 52283f737..fef4cf721 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 @@ -6,7 +6,9 @@ #include #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "UiConfig.h" #include "TraingIcePresenter.h" #include "traing/training_list_ice/include/TraingIceAdapter.h" @@ -28,7 +30,7 @@ namespace OHOS TraingIceModel &operator=(const TraingIceModel &); virtual ~TraingIceModel(); static const uint16_t TraingIceListMaxNum = 12; - TraingIceItem TraingIces[TraingIceListMaxNum] = {VIEW_INVALID, nullptr}; + TraingIceItem TraingIces[TraingIceListMaxNum] = {VIEW_INVALID, STR_ICE_SPORTS}; // std::map TraingIceIdToViewId; bool btConnectStatus{false}; }; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceView.h index c23d7e342..f768e7a5c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceView.h @@ -11,6 +11,7 @@ #include "traing/training_list_ice/include/TraingIceModel.h" #include "components/ui_label_button_ext.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" namespace OHOS { 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 451389b7d..d159a9474 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 @@ -3,6 +3,7 @@ #include "traing/include/TraingModel.h" #include "traing/Training_UiConfig.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "UiConfig.h" namespace OHOS { @@ -31,7 +32,7 @@ namespace OHOS void TraingIceItemView::SetItemInfo(const TraingIceItem 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_ice/src/TraingIceModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp index b76067934..726ad8660 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 @@ -10,10 +10,12 @@ #include "traing/training_list_ice/include/TraingIceModel.h" #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include "language/font/ui_resource_string.h" #include "UiConfig.h" #include "ui_resource_image.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include "language/font/ui_resource_string.h" namespace OHOS { @@ -31,21 +33,20 @@ namespace OHOS void TraingIceModel::InitTraingIceListItem() { - TraingIces[0] = {VIEW_TRAININGNOMAL, "一般冰上运动"}; - TraingIces[1] = {VIEW_TRAININGNOMAL, "溜冰"}; - TraingIces[2] = {VIEW_TRAININGNOMAL, "冰球"}; - TraingIces[3] = {VIEW_TRAININGNOMAL, "冰石壶/冰壶"}; - TraingIces[4] = {VIEW_TRAININGNOMAL, "雪上摩托车"}; - TraingIces[5] = {VIEW_TRAININGNOMAL, "雪橇"}; - TraingIces[6] = {VIEW_TRAININGNOMAL, "冬季两项"}; - TraingIces[7] = {VIEW_TRAININGNOMAL, "越野滑雪"}; - TraingIces[8] = {VIEW_TRAININGNOMAL, "滑雪"}; - TraingIces[9] = {VIEW_TRAININGNOMAL, "单板滑雪/滑雪板"}; - TraingIces[10] = {VIEW_TRAININGNOMAL, "雪鞋健行"}; - TraingIces[11] = {VIEW_TRAININGNOMAL, "雪地运动"}; + TraingIces[0] = {VIEW_TRAININGNOMAL, STR_ICE_SPORTS}; + TraingIces[1] = {VIEW_TRAININGNOMAL, STR_ICE_SKATING}; + TraingIces[2] = {VIEW_TRAININGNOMAL, STR_ICE_HOCKEY}; + TraingIces[3] = {VIEW_TRAININGNOMAL, STR_ICE_CURLING}; + TraingIces[4] = {VIEW_TRAININGNOMAL, STR_ICE_SNOWMOBILING}; + TraingIces[5] = {VIEW_TRAININGNOMAL, STR_ICE_SLED}; + TraingIces[6] = {VIEW_TRAININGNOMAL, STR_ICE_BIATHLON}; + TraingIces[7] = {VIEW_TRAININGNOMAL, STR_ICE_CROSSCOUNTRYSKING}; + TraingIces[8] = {VIEW_TRAININGNOMAL, STR_ICE_SKIING}; + TraingIces[9] = {VIEW_TRAININGNOMAL, STR_ICE_SNOWBOARDING}; + TraingIces[10] = {VIEW_TRAININGNOMAL, STR_ICE_SNOWSHOEING}; + TraingIces[11] = {VIEW_TRAININGNOMAL, STR_ICE_SNOW_SPORTS}; } - const TraingIceItem *TraingIceModel::GetTraingIcelistItems() const { return TraingIces; 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 ad8e29e2d..ebe797c06 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 @@ -17,6 +17,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 578568055..f6f446414 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 @@ -1,9 +1,18 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-26 09:46:17 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-28 19:59:38 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #include "traing/training_list_ice/include/TraingIceView.h" #include "traing/training_list_ice/include/TraingIcePresenter.h" #include "traing/include/TraingModel.h" #include "traing/Training_UiConfig.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "UiConfig.h" #include "wearable_log.h" @@ -80,8 +89,8 @@ namespace OHOS TraingIceList->SetMaxScrollDistance(MAX_SCR_DIS); // 增加表冠控制 - TraingIceList->SetRotateFactor(2); - TraingIceList->RequestFocus(); + scrollView->SetRotateFactor(2); + scrollView->RequestFocus(); } UIList *TraingIceView::GetList() { 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 ab0da9d79..369720570 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 @@ -17,6 +17,7 @@ #include "components/ui_checkbox.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 005c9c397..f8e683249 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 @@ -18,6 +18,7 @@ #include "components/ui_label_button.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 4a41a4b19..31e63b229 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 @@ -6,7 +6,9 @@ #include #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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/include/TraingLimitView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitView.h index 3fcc7fb45..19597cfab 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitView.h @@ -19,6 +19,7 @@ #include "traing/training_list_limit/include/TraingLimitModel.h" #include "components/ui_label_button_ext.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" namespace OHOS { 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 a6075e103..ab62dd3e7 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 @@ -3,6 +3,7 @@ #include "traing/include/TraingModel.h" #include "traing/Training_UiConfig.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 f733476a5..3a3f29b73 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 @@ -10,10 +10,12 @@ #include "traing/training_list_limit/include/TraingLimitModel.h" #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "UiConfig.h" #include "ui_resource_image.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 236f0ae98..04e338ffe 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 @@ -17,6 +17,7 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 8972c694f..234cf21d3 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 @@ -4,6 +4,7 @@ #include "traing/Training_UiConfig.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 bed56e9a5..fc22065bd 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,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 f601c711b..f06465c5c 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 @@ -5,6 +5,7 @@ #include "common/image_cache_manager.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 471141079..22a0c8b9d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 0570ca0e1..556d8fced 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleModel.h @@ -12,6 +12,7 @@ #include #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "UiConfig.h" #include "UISamplePresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherReportView.h b/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherReportView.h index bf8272bfe..07ef3b5f3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherReportView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherReportView.h @@ -7,6 +7,7 @@ #include "components/ui_view_group.h" #include "components/ui_scroll_view.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "components/ui_image_animator.h" #include "config/include/ConfigModel.h" namespace OHOS 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 0b8e89fd1..cddd76bfd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 60d9bbf1b..4169b7be7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.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 4c6897e89..43bf11f93 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherPresenter.cpp @@ -1,5 +1,6 @@ #include "AppViewIDs.h" #include "components/ui_label_ext.h" +#include"language/font/ui_resource_string.h" #include "NativeAbility.h" #include "weather/include/MainWeatherPresenter.h" #include "common/key_code.h" 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 new file mode 100644 index 000000000..62c28e180 Binary files /dev/null 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/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h new file mode 100644 index 000000000..edb6ce7a9 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h @@ -0,0 +1,45 @@ +/* +* 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_ICE_SPORTS = 0, + STR_ICE_SKATING = 1, + STR_ICE_HOCKEY = 2, + STR_ICE_CURLING = 3, + STR_ICE_SNOWMOBILING = 4, + STR_ICE_SLED = 5, + STR_ICE_BIATHLON = 6, + STR_ICE_CROSSCOUNTRYSKING = 7, + STR_ICE_SKIING = 8, + STR_ICE_SNOWBOARDING = 9, + STR_ICE_SNOWSHOEING = 10, + STR_ICE_SNOWSPORTS = 11, + STR_DANCING_GENERAL = 12, + STR_DANCING_BELLY = 13, + STR_DANCING_JAZZ = 14, + STR_DANCING_LATIN = 15, + STR_DANCING_BALLET = 16, + STR_DANCING_STREET = 17, + STR_DANCING_PUBLICSQUARE = 18, + STR_DANCING_ZUMBA = 19, + STR_DANCING_SOCIALDANCE = 20, + STR_DANCING_TAPDANCE = 21, + STR_ICE_SNOW_SPORTS = 22, + STR_MAX_ID = 23, +}; // UIResourceTextId + +enum FontLanguageId : uint8_t { + LANGUAGE_ID_ZH, + LANGUAGE_ID_EN, + LANGUAGE_ID_MAX +}; // UITextLanguageTextId +} +#endif /* UI_RESOURCE_STRING_H */ 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 new file mode 100644 index 000000000..c56ee17c9 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/config.json b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/config.json deleted file mode 100644 index 005a9cbc0..000000000 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/config.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "languages": { - "zh": { - "path": "user/res/language_config/font/zh.lang" - }, - "en": { - "path": "user/res/language_config/font/en.lang" - } - }, - "languages_satuas": 0 -} \ No newline at end of file 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 deleted file mode 100644 index 14a2769fa..000000000 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/en.lang and /dev/null 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 deleted file mode 100644 index f1519707c..000000000 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/ui_resource_string.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -* 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_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 { - LANGUAGE_ID_ZH, - LANGUAGE_ID_EN, - LANGUAGE_ID_MAX -}; // UITextLanguageTextId -} -#endif /* UI_RESOURCE_STRING_H */ 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 deleted file mode 100644 index 99a0a9ede..000000000 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/zh.lang and /dev/null differ