舞蹈列表适配多国语言

diff --git a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
index 6674068..e62dd07 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
+++ b/code/sdk/application/wearable/fd230app/nativelauncher/include/NativeLauncher.h
@@ -3,6 +3,7 @@
 #ifndef NATIVE_LAUNCHER_H
 #define NATIVE_LAUNCHER_H
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h
index 91d856c..1f7958c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h
@@ -18,6 +18,7 @@
 #include "components/icon_adapter.h"
 #include "AlipayPresenter.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "AlipayListAdapter.h"
 #include "AlipayListItem.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h
index b38739a..61f50ca 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h
@@ -19,6 +19,7 @@
 #include "components/icon_adapter.h"
 #include "AlipayPresenter.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "AlipayTransListAdapter.h"
 #include "AlipayTransListItem.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h
index 216ec34..92a1919 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistModel.h
@@ -18,6 +18,7 @@
 
 #include "bundle_info.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "ohos_types.h"
 
 #define APP_MAX_NUM 50

diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
index f282011..32531f8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/applist/src/ApplistModel.cpp
@@ -15,6 +15,7 @@
 
 #include "UiConfig.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "ApplistModel.h"
 #include "ApplistPresenter.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h
index f7c45b9..3d52d90 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h
@@ -11,6 +11,7 @@
 #include "string"\r
 #include "PhoneService.h"\r
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "message.h"\r
 #include "msg_center.h"\r
 \r

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 209404c..26c238d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 #include "graphic_math.h"\r
 #include "classicbluetooth/include/ClassicBlueToothPresenter.h"\r

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 e742c53..4e0bff9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassPresenter.h
@@ -13,6 +13,7 @@
 #include "ohos_types.h"
 #include "UiConfig.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "CompassView.h"
 
 namespace OHOS {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h
index b359762..b99f8b1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/MainCompassPresenter.h
@@ -12,6 +12,7 @@
 #include "ohos_types.h"
 #include "UiConfig.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "CompassView.h"
 #include "CompassPresenter.h"
 #include "CompassModel.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdatePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdatePresenter.cpp
index 674eaee..2bea004 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdatePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdatePresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 #include "DialViewGroup.h"
 #include "dialupdate/include/DialUpdatePresenter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
index 72ea7cf..d9fbff5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 #include "graphic_math.h"\r
 #include "string.h"\r

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 7818faa..e15ce42 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp
@@ -6,6 +6,7 @@
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp
  */
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 #include "findphone/include/FindPhonePresenter.h"
 #include "common/key_code.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
index 124c7b5..fa7e012 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/key/src/KeyInputListener.cpp
@@ -8,6 +8,7 @@
 #include "KeyInputListener.h"
 #include "common/key_code.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "View.h"
 #include "MainViewSample.h"
 #include "wearable_log.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/en.lang
index a58e4c0..14a2769 100644 (file)
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/en.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/en.lang differ

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/ui_resource_string.h
index 309da6b..f151970 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/ui_resource_string.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/ui_resource_string.h
@@ -10,26 +10,17 @@
 #include <cstdint>
 namespace OHOS {
 enum UIResourceTextId : uint16_t {
-    STR_IMAGE = 0,\r
-    STR_PROGRESSBAR = 1,\r
-    STR_SLIDEUNLOCK = 2,\r
-    STR_LISTBOX = 3,\r
-    STR_BUTTON = 4,\r
-    STR_SCROLLVIEW = 5,\r
-    STR_SCROLLGRID = 6,\r
-    STR_CLOCK = 7,\r
-    STR_DISTURBANCE = 8,\r
-    STR_BRIGHT = 9,\r
-    STR_PHONE = 10,\r
-    STR_LANGAGE = 11,\r
-    STR_ALARM = 12,\r
-    STR_SYSTEM = 13,\r
-    STR_SPO2 = 14,\r
-    STR_COMPASS = 15,\r
-    STR_INDOORWALK = 16,\r
-    STR_WEATHER = 17,\r
-    STR_SYSTEMSETTING = 18,\r
-    STR_MAX_ID = 19,\r
+    STR_DANCING_GENERAL = 0,\r
+    STR_DANCING_BELLY = 1,\r
+    STR_DANCING_JAZZ = 2,\r
+    STR_DANCING_LATIN = 3,\r
+    STR_DANCING_BALLET = 4,\r
+    STR_DANCING_STREET = 5,\r
+    STR_DANCING_PUBLICSQUARE = 6,\r
+    STR_DANCING_ZUMBA = 7,\r
+    STR_DANCING_SOCIALDANCE = 8,\r
+    STR_DANCING_TAPDANCE = 9,\r
+    STR_MAX_ID = 10,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/zh.lang b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/zh.lang
index de8ffb0..99a0a9e 100644 (file)
Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/zh.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/zh.lang differ

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/language_en.xml b/code/sdk/application/wearable/fd230app/nativeui/language/language_en.xml
index 7d4baae..1f95633 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/language_en.xml
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/language_en.xml
@@ -1,22 +1,12 @@
-<language id="language" languageinfo="en" fontName="DroidSansFallback.ttf" direct="ltf">
-
-    <lanstr id="STR_IMAGE" value="Image" size="21" direct="rtl" />
-    <lanstr id="STR_PROGRESSBAR" value="ProgressBar" direct="mixed" />
-    <lanstr id="STR_SLIDEUNLOCK" value="SlideUnlock" />
-    <lanstr id="STR_LISTBOX" value="ListBox" />
-    <lanstr id="STR_BUTTON" value="Button" />
-    <lanstr id="STR_SCROLLVIEW" value="ScrollView" />
-    <lanstr id="STR_SCROLLGRID" value="ScrollGrid" />
-    <lanstr id="STR_CLOCK" value="Clock" />
-    <lanstr id="STR_DISTURBANCE" value="Disturbance" />
-    <lanstr id="STR_BRIGHT" value="Bright" />
-    <lanstr id="STR_PHONE" value="Phone" />
-    <lanstr id="STR_ALARM" value="Alarm" />
-    <lanstr id="STR_SYSTEMSETTING" value="Setting" />
-    <lanstr id="STR_LANGAGE" size="26" value="Language" />
-    <lanstr id="STR_SPO2" value="SPO2" />
-    <lanstr id="STR_COMPASS" value="Compass" />
-    <lanstr id="STR_INDOORWALK" value="IndoorWalk" />
-    <lanstr id="STR_WEATHER" value="Weathher" />
-
-</language>
\ No newline at end of file
+<language id="language" direct="ltf" languageinfo="en">
+    <lanstr id="STR_DANCING_GENERAL" value="General Dance" />
+    <lanstr id="STR_DANCING_BELLY" value="Belly Dance" />
+    <lanstr id="STR_DANCING_JAZZ" value="Jazz Dance" />
+    <lanstr id="STR_DANCING_LATIN" value="Latin Dance" />
+    <lanstr id="STR_DANCING_BALLET" value="Ballet" />
+    <lanstr id="STR_DANCING_STREET" value="Street Dance" />
+    <lanstr id="STR_DANCING_PUBLICSQUARE" value="Public Square Dance" />
+    <lanstr id="STR_DANCING_ZUMBA" value="Zumba" />
+    <lanstr id="STR_DANCING_SOCIALDANCE" value="Social Dance" />
+    <lanstr id="STR_DANCING_TAPDANCE" value="Tap Dance" />
+</language>

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 14e03d6..4ae8a1f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/language_zh.xml
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/language_zh.xml
@@ -1,22 +1,12 @@
-<language id="language" direct="ltf" languageinfo="zh">
-
-    <lanstr id="STR_IMAGE" value="图片" size="32" direct="rtl" />
-    <lanstr id="STR_PROGRESSBAR" value="进度条" direct="mixed" />
-    <lanstr id="STR_SLIDEUNLOCK" value="滑动解锁" />
-    <lanstr id="STR_LISTBOX" value="列表" />
-    <lanstr id="STR_BUTTON" value="按钮" />
-    <lanstr id="STR_SCROLLVIEW" value="滚动视图" />
-    <lanstr id="STR_SCROLLGRID" value="滚动网格" />
-    <lanstr id="STR_CLOCK" value="时钟" />
-    <lanstr id="STR_DISTURBANCE" value="勿扰" />
-    <lanstr id="STR_BRIGHT" value="亮屏" />
-    <lanstr id="STR_PHONE" value="找手机" />
-    <lanstr id="STR_LANGAGE" size="30" value="语言" />
-    <lanstr id="STR_ALARM" value="闹钟" />
-    <lanstr id="STR_SYSTEM" value="设置" />
-    <lanstr id="STR_SPO2" value="血氧饱和度" />
-    <lanstr id="STR_COMPASS" value="指南针" />
-    <lanstr id="STR_INDOORWALK" value="室内步行" />
-    <lanstr id="STR_WEATHER" value="天气" />
-
-</language>
\ No newline at end of file
+<language id="language" direct="lft" languageinfo="zh">
+    <lanstr id="STR_DANCING_GENERAL" value="一般舞蹈" />
+    <lanstr id="STR_DANCING_BELLY" value="肚皮舞" />
+    <lanstr id="STR_DANCING_JAZZ" value="爵士舞" />
+    <lanstr id="STR_DANCING_LATIN" value="拉丁舞" />
+    <lanstr id="STR_DANCING_BALLET" value="芭蕾" />
+    <lanstr id="STR_DANCING_STREET" value="街舞" />
+    <lanstr id="STR_DANCING_PUBLICSQUARE" value="广场舞" />
+    <lanstr id="STR_DANCING_ZUMBA" value="尊巴" />
+    <lanstr id="STR_DANCING_SOCIALDANCE" value="社交舞" />
+    <lanstr id="STR_DANCING_TAPDANCE" value="踢踏舞" />
+</language>

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 67fa547..14f4870 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessageModel.h
@@ -13,6 +13,7 @@
 #include <cstdint>
 #include <map>
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "MessagePresenter.h"
 #include "message/include/MessageAdapter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp
index 9636799..8855fde 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp
@@ -1,5 +1,6 @@
 
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 #include "message/include/MessagePresenter.h"
 #include "message/include/MessageAdapter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp
index 000fd86..c4c704a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp
@@ -9,6 +9,7 @@
 #include "VocassistView.h"
 #include "VocassistModel.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 
 #include "NativeAbility.h"
 #include "graphic_service.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp
index 71f87d9..da6f21a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp
@@ -5,6 +5,7 @@
  * Create: 2022-01-18
  */
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "VocassistPresenter.h"
 #include "PlayersModel.h"
 #include "ui_service.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp
index 8c58506..e9a094a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp
@@ -8,6 +8,7 @@
 #include <limits>\r
 #include "cmsis_os.h"\r
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "PlayersModel.h"\r
 #include "CallerLogModel.h"\r
 #include "VocassistModel.h"\r

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 0987a0b..55b9b04 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 #include "string"\r
 #include "phone/include/PhoneCallPresenter.h"\r

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 d5d1d01..0240b4c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallingPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include "phone/include/PhoneCallingPresenter.h"\r

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 afff599..d521f20 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallupPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneCallupPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include "phone/include/PhoneCallupPresenter.h"\r

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 d67d465..8d8be57 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include "phone/include/PhoneDirPresenter.h"\r

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 67b8432..08ec440 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhonePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhonePresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include "phone/include/PhonePresenter.h"\r

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 0eac680..dc6aefc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneRingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneRingPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include "phone/include/PhoneRingPresenter.h"\r

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 533e48d..51eac07 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 #include "graphic_math.h"\r
 #include "string.h"\r

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 6c7c1da..2d95ec3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/src/RecordingPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 #include "graphic_math.h"\r
 #include "string.h"\r

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 208c583..eb12881 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/rotate/src/RotatePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/rotate/src/RotatePresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include "rotate/include/RotatePresenter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp
index 794e9e1..6eec6f5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp
@@ -1,5 +1,6 @@
 \r
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include "saveele/include/SaveBatPresenter.h"\r

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 da6f4d9..72e1d60 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveElePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveElePresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include "saveele/include/SaveElePresenter.h"\r

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 1a98c4c..4405689 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/screennotify/src/ui_screennotify.cpp
@@ -9,6 +9,7 @@
 #include "power_display_service.h"
 #include "NativeAbility.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "MainViewSample.h"
 #include "ui_screennotify.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingAttentionPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingAttentionPresenter.cpp
index 744b85a..86ff4f3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingAttentionPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingAttentionPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include "secondaryfunction/include/FastTrainingAttentionPresenter.h"\r

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 a1a0d8f..7fc99d3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 #include "graphic_math.h"\r
 #include "string.h"\r

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 1f104dd..444fd4f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/SecondaryFunctionPresenter.cpp
@@ -1,5 +1,6 @@
 \r
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 #include "secondaryfunction/include/SecondaryFunctionPresenter.h"\r
 #include "secondaryfunction/include/SecondaryFunctionModel.h"\r

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 fc1649b..a191979 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h
@@ -11,6 +11,7 @@
 #include <cstdint>
 #include <map>
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "SettingItem.h"
 #include "SettingPresenter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp
index 067f39a..b7d672a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 #include "graphic_math.h"\r
 #include "string.h"\r

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 f76bb17..9b7bcda 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/MediaVolumePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/MediaVolumePresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 #include "graphic_math.h"\r
 #include "string.h"\r

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 f50de29..7be9ac5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
@@ -7,6 +7,7 @@
  */\r
 \r
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 #include "graphic_math.h"\r
 #include "string.h"\r

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 719e503..f9f56ac 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SystemVolumePresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 #include "graphic_math.h"\r
 #include "string.h"\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemLanguageView.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemLanguageView.cpp
index 6bf24f8..08452c6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemLanguageView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemLanguageView.cpp
@@ -138,8 +138,8 @@ namespace OHOS
             return nullptr;\r
         }\r
         Title->SetPosition(203, 52, 200, 35);\r
-        Title->SetTextId(11);\r
-        //Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        Title->SetTextId(0);\r
+        // Title->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         scrollView->Add(Title);\r
         /* ------------------------------- Background ------------------------------- */\r
         ImageConfig imageconfig = {\r
@@ -210,7 +210,7 @@ namespace OHOS
             return nullptr;\r
         }\r
         SetRadioButtonSelectStatus(*SimplifiedChineseRadioButton, true);\r
-        UICheckBox::OnChangeListener *SimplifiedChineseRadioButtonChange = static_cast<UICheckBox::OnChangeListener *>(new RadiobuttonOnChangeListener(SimplifiedChineseRadioButton,Title));\r
+        UICheckBox::OnChangeListener *SimplifiedChineseRadioButtonChange = static_cast<UICheckBox::OnChangeListener *>(new RadiobuttonOnChangeListener(SimplifiedChineseRadioButton, Title));\r
         SimplifiedChineseRadioButton->SetOnChangeListener(SimplifiedChineseRadioButtonChange);\r
         scrollView->Add(SimplifiedChineseRadioButton);\r
         /* --------------------------- EnglishRadioButton --------------------------- */\r
@@ -223,7 +223,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SystemLanguageView::EnglishRadioButton new fail!");\r
             return nullptr;\r
         }\r
-        UICheckBox::OnChangeListener *EnglishRadioButtonChange = static_cast<UICheckBox::OnChangeListener *>(new RadiobuttonOnChangeListener(EnglishRadioButton,Title));\r
+        UICheckBox::OnChangeListener *EnglishRadioButtonChange = static_cast<UICheckBox::OnChangeListener *>(new RadiobuttonOnChangeListener(EnglishRadioButton, Title));\r
         EnglishRadioButton->SetOnChangeListener(EnglishRadioButtonChange);\r
         scrollView->Add(EnglishRadioButton);\r
         initViewStatus = true;\r

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 b5b4151..becd823 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/SystemPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 #include "graphic_math.h"\r
 #include "string.h"\r
@@ -10,7 +11,7 @@
 #include "common/key_code.h"\r
 #include "custom_utils.h"\r
 #include "language/LanguageInit.h"\r
-\r
+#include "language/language_config/font/ui_resource_string.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -212,7 +213,7 @@ namespace OHOS
                 // 英语文本\r
                 g_planguage->ChangeLanguage(LanguageId::EN);\r
             }\r
-            m_label->SetTextId(11);\r
+            m_label->SetTextId(0);\r
             // 强制刷新\r
             m_label->ForceResetText();\r
             RootView::GetInstance()->Invalidate();\r

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 12df75e..14fe107 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include <iostream>\r

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 9dfa989..a538694 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingControlView.h"\r
 \r
 #include "common/image_cache_manager.h"\r
+#include "components/ui_label_ext.h"\r
 #include "UiConfig.h"\r
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r

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 ed60bdd..d1d6d9c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataPresenter.cpp
@@ -1,5 +1,6 @@
 \r
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include <iostream>\r

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 01cb5fd..81b4e07 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingDataView.h"\r
 \r
 #include "common/image_cache_manager.h"\r
+#include "components/ui_label_ext.h"\r
 #include "UiConfig.h"\r
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r

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 051c42c..8dda507 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailPresenter.cpp
@@ -1,6 +1,7 @@
 \r
 \r
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include <iostream>\r

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 4932ae6..511fdd0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingDetailView.h"\r
 \r
 #include "common/image_cache_manager.h"\r
+#include "components/ui_label_ext.h"\r
 #include "UiConfig.h"\r
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r

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 8d5d8c1..a66979e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 b4366e0..f61af20 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingEnddataView.h"
 
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 ae8c859..a095a63 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2Presenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2Presenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 47283cb..7c1092a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingEndnote2View.h"
 
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 80c7f15..579a454 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnotePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnotePresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 bcd8051..a5a8743 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingEndnoteView.h"
 
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 487a9ff..cc33cbb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 e93705b..e92aeb9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicView.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingMusicView.h"
 #include <ui_scroll_view.h>
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 3399980..01bd0b2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
@@ -1,5 +1,6 @@
 \r
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include <iostream>\r

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 96988b8..9a5092d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingNomalView.h"
 
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 6e9eea6..8e7b519 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
@@ -1,6 +1,7 @@
 
 
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 1d41ef5..21792d0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include <iostream>\r

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 31e05e9..7951e09 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingSetCaluliView.h"\r
 \r
 #include "common/image_cache_manager.h"\r
+#include "components/ui_label_ext.h"\r
 #include "UiConfig.h"\r
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r

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 0fb5cf8..8933844 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 68e4a58..7227bae 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingSetDistView.h"
 
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 79af641..c71b7f6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include <iostream>\r

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 5841d3d..8f1c38d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 850f090..77b5b44 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingSetSeptView.h"
 
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 124473c..8a9d0fc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimePresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include <iostream>\r

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 83a7343..1f6fa7e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingSetTimeView.h"\r
 \r
 #include "common/image_cache_manager.h"\r
+#include "components/ui_label_ext.h"\r
 #include "UiConfig.h"\r
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r

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 0ab0282..02b3a27 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingSetView.h"\r
 \r
 #include "common/image_cache_manager.h"\r
+#include "components/ui_label_ext.h"\r
 #include "UiConfig.h"\r
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r

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 10310c6..dd40b8c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongPresenter.cpp
@@ -1,5 +1,6 @@
 
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 5f16244..f2a6f83 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingStrongView.h"
 
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 e351587..8e6632b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinPresenter.cpp
@@ -1,5 +1,6 @@
 
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 81105ec..16ad8be 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp
@@ -2,6 +2,7 @@
 #include "traing/include/TraingWinView.h"
 
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 0c381c4..ba0db55 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSPresenter.cpp
@@ -1,5 +1,6 @@
 
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 2750034..a9392e1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSView.cpp
@@ -2,6 +2,7 @@
 #include "traing/training_GPS/include/TraingGPSView.h"
 
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 7d24516..c0f0d2a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 0d6b591..cff68a3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSbackView.cpp
@@ -2,6 +2,7 @@
 #include "traing/training_GPS/include/TraingGPSbackView.h"
 
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 0bb60ac..3136d91 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackPresenter.cpp
@@ -1,5 +1,6 @@
 
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 0cc434a..c368e60 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlackView.cpp
@@ -2,6 +2,7 @@
 #include "traing/training_GPS/include/TraingGPSlackView.h"
 
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 eb6101a..befcc3c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 cf1e9dd..50478aa 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSlostView.cpp
@@ -2,6 +2,7 @@
 #include "traing/training_GPS/include/TraingGPSlostView.h"
 
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 d04cba8..e0f367d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnotePresenter.cpp
@@ -1,5 +1,6 @@
 
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 b1cb0a3..802f92f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSnoteView.cpp
@@ -2,6 +2,7 @@
 #include "traing/training_GPS/include/TraingGPSnoteView.h"
 
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 17bc6aa..3026483 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 0db56d5..811207e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_GPS/src/TraingGPSsetView.cpp
@@ -2,6 +2,7 @@
 #include "traing/training_GPS/include/TraingGPSsetView.h"
 
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>

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 ae59a77..46b2874 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
@@ -1,6 +1,7 @@
 \r
 \r
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include <iostream>\r

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 e318451..6812d31 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp
@@ -1,6 +1,7 @@
 \r
 #include "traing/training_card/include/TraingCardView.h"\r
 #include "common/image_cache_manager.h"\r
+#include "components/ui_label_ext.h"\r
 #include "UiConfig.h"\r
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r

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 e1f8a35..dfe9ee4 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp
@@ -11,7 +11,9 @@
 #include "traing/training_card/include/Training_CardView.h"
 
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "wearable_log.h"
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp
index a0c2929..0d37b10 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp
@@ -2,6 +2,7 @@
 #include "traing/training_card/include/Training_CardView.h"\r
 \r
 #include "common/image_cache_manager.h"\r
+#include "components/ui_label_ext.h"\r
 #include "UiConfig.h"\r
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r

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 379ee50..e1c00f2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceAdapter.h
@@ -1,4 +1,4 @@
-/*** 
+/***
  * @Author: Caisking 3449750381@qq.com
  * @Date: 2024-03-27 11:09:52
  * @LastEditors: Caisking 3449750381@qq.com
@@ -16,7 +16,8 @@
 #include "components/ui_label.h"
 #include "components/ui_checkbox.h"
 #include "AppViewIDs.h"
-
+#include "components/ui_label_ext.h"
+#include "language/language_config/font/ui_resource_string.h"
 // 列表的适配器
 namespace OHOS
 {
@@ -24,7 +25,7 @@ namespace OHOS
     typedef struct
     {
         AppViewId id;
-        const char *label;       // 标签
+        UIResourceTextId labelid; // 标签
     } TraingDanceItem;
 
     class TraingDanceAdapter : public AbstractAdapter

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h
index a360995..f5ba629 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h
@@ -1,4 +1,19 @@
-
+/*** 
+ * @Author: Caisking 3449750381@qq.com
+ * @Date: 2024-03-27 15:24:12
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-03-28 16:46:53
+ * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+/***
+ * @Author: Caisking 3449750381@qq.com
+ * @Date: 2024-03-27 15:24:12
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-03-28 16:42:47
+ * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 
 #ifndef TraingDance_ITEM_VIEW_H
 #define TraingDance_ITEM_VIEW_H
@@ -10,6 +25,8 @@
 #include "traing/training_list_dance/include/TraingDanceAdapter.h"
 #include "components/ui_label_button.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
+#include "components/ui_label_ext.h"
 #include "ohos_types.h"
 
 namespace OHOS
@@ -26,9 +43,9 @@ namespace OHOS
     private:
         TraingDanceItemView(const TraingDanceItemView &);
         UIImageView sbackground; // 背景
-        UIImageView sicon;        // 箭头
-        UILabel sLabel;          // 标签
-        TraingDanceItem sItemInfo = {VIEW_INVALID, nullptr};
+        UIImageView sicon;       // 箭头
+        UILabelExt sLabel;       // 标签
+        TraingDanceItem sItemInfo = {VIEW_INVALID, STR_DANCING_GENERAL};
     };
 
 }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceModel.h
index bbb7296..0201b66 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceModel.h
@@ -13,6 +13,8 @@
 #include <cstdint>
 #include <map>
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "TraingDancePresenter.h"
 #include "traing/training_list_dance/include/TraingDanceAdapter.h"
@@ -34,7 +36,7 @@ namespace OHOS
         TraingDanceModel &operator=(const TraingDanceModel &);
         virtual ~TraingDanceModel();
         static const uint16_t TraingDanceListMaxNum = 10;
-        TraingDanceItem TraingDances[TraingDanceListMaxNum] = {VIEW_INVALID, nullptr};
+        TraingDanceItem TraingDances[TraingDanceListMaxNum] = {VIEW_INVALID, STR_DANCING_GENERAL};
         // std::map<int, AppViewId> TraingDanceIdToViewId;
         bool btConnectStatus{false};
     };

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp
index 27095a0..dae01e2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp
@@ -2,6 +2,7 @@
 #include "traing/training_list_dance/include/TraingDanceItemView.h"
 #include "traing/include/TraingModel.h"
 #include "traing/Training_UiConfig.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 namespace OHOS
 {
@@ -30,7 +31,7 @@ namespace OHOS
     void TraingDanceItemView::SetItemInfo(const TraingDanceItem itemInfo)
     {
         sItemInfo = itemInfo;
-        sLabel.SetText(itemInfo.label);
+        sLabel.SetTextId(itemInfo.labelid);
     }
 
     /// @brief 设置每一个itemview上的组件

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp
index 02867ae..073773b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp
@@ -17,9 +17,11 @@
 
 #include "traing/training_list_dance/include/TraingDanceModel.h"
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 namespace OHOS
 {
 
@@ -33,20 +35,20 @@ namespace OHOS
         return instance;
     }
 
-    static char *text[] = {"一般舞蹈", "肚皮舞", "爵士舞", "拉丁舞", "芭蕾", "街舞", "广场舞", "尊巴", "社交舞", "踢踏舞"};
+    // static char *text[] = {"一般舞蹈", "肚皮舞", "爵士舞", "拉丁舞", "芭蕾", "街舞", "广场舞", "尊巴", "社交舞", "踢踏舞"};
 
     void TraingDanceModel::InitTraingDanceListItem()
     {
-        TraingDances[0] = {VIEW_TRAININGNOMAL, "一般舞蹈"};
-        TraingDances[1] = {VIEW_TRAININGNOMAL, "肚皮舞"};
-        TraingDances[2] = {VIEW_TRAININGNOMAL, "爵士舞"};
-        TraingDances[3] = {VIEW_TRAININGNOMAL, "拉丁舞"};
-        TraingDances[4] = {VIEW_TRAININGNOMAL, "芭蕾"};
-        TraingDances[5] = {VIEW_TRAININGNOMAL, "街舞"};
-        TraingDances[6] = {VIEW_TRAININGNOMAL, "广场舞"};
-        TraingDances[7] = {VIEW_TRAININGNOMAL, "尊巴"};
-        TraingDances[8] = {VIEW_TRAININGNOMAL, "社交舞"};
-        TraingDances[9] = {VIEW_TRAININGNOMAL, "踢踏舞"};
+        TraingDances[0] = {VIEW_TRAININGNOMAL, STR_DANCING_GENERAL};
+        TraingDances[1] = {VIEW_TRAININGNOMAL, STR_DANCING_BELLY};
+        TraingDances[2] = {VIEW_TRAININGNOMAL, STR_DANCING_JAZZ};
+        TraingDances[3] = {VIEW_TRAININGNOMAL, STR_DANCING_LATIN};
+        TraingDances[4] = {VIEW_TRAININGNOMAL, STR_DANCING_BALLET};
+        TraingDances[5] = {VIEW_TRAININGNOMAL, STR_DANCING_STREET};
+        TraingDances[6] = {VIEW_TRAININGNOMAL, STR_DANCING_PUBLICSQUARE};
+        TraingDances[7] = {VIEW_TRAININGNOMAL, STR_DANCING_ZUMBA};
+        TraingDances[8] = {VIEW_TRAININGNOMAL, STR_DANCING_SOCIALDANCE};
+        TraingDances[9] = {VIEW_TRAININGNOMAL, STR_DANCING_TAPDANCE};
     }
 
     const TraingDanceItem *TraingDanceModel::GetTraingDancelistItems() const

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp
index fe9cd72..f67e9ad 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 ec71410..ac979c2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp
@@ -3,6 +3,7 @@
 #include "traing/include/TraingModel.h"
 #include "traing/Training_UiConfig.h"
 
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "wearable_log.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h
index ac714dc..b09bbf3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h
@@ -16,6 +16,7 @@
 #include "components/ui_label.h"
 #include "components/ui_checkbox.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 
 // 列表的适配器
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h
index 62eccfd..84520c5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h
@@ -10,6 +10,7 @@
 #include "traing/training_list_ice/include/TraingIceAdapter.h"
 #include "components/ui_label_button.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "ohos_types.h"
 
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceModel.h
index 1988a7b..52283f7 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceModel.h
@@ -5,6 +5,8 @@
 #include <cstdint>
 #include <map>
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "TraingIcePresenter.h"
 #include "traing/training_list_ice/include/TraingIceAdapter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp
index 779f5d5..451389b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp
@@ -2,6 +2,7 @@
 #include "traing/training_list_ice/include/TraingIceItemView.h"
 #include "traing/include/TraingModel.h"
 #include "traing/Training_UiConfig.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp
index 12fcd06..b760679 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp
@@ -9,9 +9,11 @@
 
 #include "traing/training_list_ice/include/TraingIceModel.h"
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 namespace OHOS
 {
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp
index 4f902f7..ad8e29e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 2201ad0..5785680 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp
@@ -3,6 +3,7 @@
 #include "traing/include/TraingModel.h"
 #include "traing/Training_UiConfig.h"
 
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "wearable_log.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h
index 2e84993..ab0da9d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h
@@ -16,6 +16,7 @@
 #include "components/ui_label.h"
 #include "components/ui_checkbox.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 
 // 列表的适配器
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h
index 729b58f..005c9c3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h
@@ -17,6 +17,7 @@
 #include "traing/training_list_limit/include/TraingLimitAdapter.h"
 #include "components/ui_label_button.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "ohos_types.h"
 
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h
index cb8433a..4a41a4b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h
@@ -5,6 +5,8 @@
 #include <cstdint>
 #include <map>
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "TraingLimitPresenter.h"
 #include "traing/training_list_limit/include/TraingLimitAdapter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp
index d584b22..a6075e1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp
@@ -2,6 +2,7 @@
 #include "traing/training_list_limit/include/TraingLimitItemView.h"
 #include "traing/include/TraingModel.h"
 #include "traing/Training_UiConfig.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp
index 48a67e5..f733476 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp
@@ -9,9 +9,11 @@
 
 #include "traing/training_list_limit/include/TraingLimitModel.h"
 #include "common/image_cache_manager.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 namespace OHOS
 {
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp
index 11593e4..236f0ae 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp
@@ -16,6 +16,7 @@
  */\r
 \r
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include <iostream>\r

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 18d6a84..8972c69 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp
@@ -3,6 +3,7 @@
 #include "traing/include/TraingModel.h"\r
 #include "traing/Training_UiConfig.h"\r
 \r
+#include "components/ui_label_ext.h"\r
 #include "UiConfig.h"\r
 #include "wearable_log.h"\r
 \r

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 021f61b..bed56e9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include <iostream>\r

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 7bc5b8b..f601c71 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_more/src/TraingMoreView.cpp
@@ -4,6 +4,7 @@
 #include "traing/Training_UiConfig.h"\r
 \r
 #include "common/image_cache_manager.h"\r
+#include "components/ui_label_ext.h"\r
 #include "UiConfig.h"\r
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r

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 13a18d0..4711410 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "NativeAbility.h"
 
 #include <iostream>

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 4a37a06..0570ca0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleModel.h
@@ -11,6 +11,7 @@
 #include <cstdint>
 #include <map>
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "UISamplePresenter.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherPresenter.cpp
index 7235195..0b8e89f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/FutureWeatherPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 \r
 #include "weather/include/FutureWeatherPresenter.h"\r

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 6fffd00..60d9bbf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/GetWeatherDataErrorPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 #include "weather/include/GetWeatherDataErrorPresenter.h"\r
 \r

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 39553f8..4c6897e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/MainWeatherPresenter.cpp
@@ -1,4 +1,5 @@
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "NativeAbility.h"\r
 #include "weather/include/MainWeatherPresenter.h"\r
 #include "common/key_code.h"\r

diff --git a/code/sdk/application/wearable/nativeabilityfwk/include/ChangeSliceListener.h b/code/sdk/application/wearable/nativeabilityfwk/include/ChangeSliceListener.h
index fed36e4..35b6b85 100755 (executable)
--- a/code/sdk/application/wearable/nativeabilityfwk/include/ChangeSliceListener.h
+++ b/code/sdk/application/wearable/nativeabilityfwk/include/ChangeSliceListener.h
@@ -18,6 +18,7 @@
 #include <cstdint>
 
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "components/ui_view.h"
 #include "NativeAbility.h"
 

diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
index cbf6159..c34e4a9 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
+++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
@@ -17,6 +17,7 @@
 #ifndef NATIVE_LAUNCHER_H
 #define NATIVE_LAUNCHER_H
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 
 namespace OHOS {
 class NativeLauncher {

diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/src/slices/main/MainView.cpp b/code/sdk/application/wearable/nativeapp/nativelauncher/src/slices/main/MainView.cpp
index f180f6e..3e79969 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativelauncher/src/slices/main/MainView.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativelauncher/src/slices/main/MainView.cpp
@@ -15,6 +15,7 @@
 
 #include "MainView.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 
 #include "wearable_log.h"
 

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h b/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h
index 91d856c..1f7958c 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayList/AlipayListView.h
@@ -18,6 +18,7 @@
 #include "components/icon_adapter.h"
 #include "AlipayPresenter.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "AlipayListAdapter.h"
 #include "AlipayListItem.h"

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h b/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h
index b38739a..61f50ca 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h
@@ -19,6 +19,7 @@
 #include "components/icon_adapter.h"
 #include "AlipayPresenter.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "AlipayTransListAdapter.h"
 #include "AlipayTransListItem.h"

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/applist/include/ApplistModel.h b/code/sdk/application/wearable/nativeapp/nativeui/applist/include/ApplistModel.h
index 57db8ce..c0a5d91 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/applist/include/ApplistModel.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/applist/include/ApplistModel.h
@@ -10,6 +10,7 @@
 
 #include "bundle_info.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "ohos_types.h"
 
 #define APP_MAX_NUM 50

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/callerlog/include/CallerLogModel.h b/code/sdk/application/wearable/nativeapp/nativeui/callerlog/include/CallerLogModel.h
index ad21adb..9786748 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/callerlog/include/CallerLogModel.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/callerlog/include/CallerLogModel.h
@@ -11,6 +11,7 @@
 #include "string"\r
 #include "PhoneService.h"\r
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "message.h"\r
 #include "msg_center.h"\r
 \r

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/compass/include/CompassPresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/compass/include/CompassPresenter.h
index 68d6877..aa93af2 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/compass/include/CompassPresenter.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/compass/include/CompassPresenter.h
@@ -13,6 +13,7 @@
 #include "ohos_types.h"\r
 #include "UiConfig.h"\r
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "CompassView.h"\r
 \r
 namespace OHOS {\r

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/compass/include/MainCompassPresenter.h b/code/sdk/application/wearable/nativeapp/nativeui/compass/include/MainCompassPresenter.h
index 0fc7061..00c389a 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/compass/include/MainCompassPresenter.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/compass/include/MainCompassPresenter.h
@@ -12,6 +12,7 @@
 #include "ohos_types.h"\r
 #include "UiConfig.h"\r
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "CompassView.h"\r
 #include "CompassPresenter.h"\r
 #include "CompassModel.h"\r

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/key/src/KeyInputListener.cpp b/code/sdk/application/wearable/nativeapp/nativeui/key/src/KeyInputListener.cpp
index 310fcf3..d70e633 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/key/src/KeyInputListener.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/key/src/KeyInputListener.cpp
@@ -8,6 +8,7 @@
 #include "KeyInputListener.h"
 #include "common/key_code.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "View.h"
 #include "MainViewSample.h"
 #include "wearable_log.h"

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistModel.cpp b/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistModel.cpp
index 000fd86..c4c704a 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistModel.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistModel.cpp
@@ -9,6 +9,7 @@
 #include "VocassistView.h"
 #include "VocassistModel.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 
 #include "NativeAbility.h"
 #include "graphic_service.h"

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp b/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp
index 98b9712..a158f95 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistPresenter.cpp
@@ -5,6 +5,7 @@
  * Create: 2022-01-18
  */
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "VocassistPresenter.h"
 #include "PlayersModel.h"
 #include "ui_service.h"

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp
index f67c649..ff56910 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/offlinevoice/src/VocassistView.cpp
@@ -8,6 +8,7 @@
 #include <limits>\r
 #include "cmsis_os.h"\r
 #include "AppViewIDs.h"\r
+#include "components/ui_label_ext.h"\r
 #include "PlayersModel.h"\r
 #include "CallerLogModel.h"\r
 #include "VocassistModel.h"\r

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp b/code/sdk/application/wearable/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp
index da2ae2a..07627da 100644 (file)
--- a/code/sdk/application/wearable/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp
+++ b/code/sdk/application/wearable/nativeapp/nativeui/screennotify/src/ui_screennotify.cpp
@@ -9,6 +9,7 @@
 #include "power_display_service.h"
 #include "NativeAbility.h"
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "MainViewSample.h"
 #include "ui_screennotify.h"
 

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/settings/include/SettingModel.h b/code/sdk/application/wearable/nativeapp/nativeui/settings/include/SettingModel.h
index d26280b..be1e4d5 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/settings/include/SettingModel.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/settings/include/SettingModel.h
@@ -11,6 +11,7 @@
 #include <cstdint>
 #include <map>
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "SettingItem.h"
 #include "SettingPresenter.h"

diff --git a/code/sdk/application/wearable/nativeapp/nativeui/uisample/include/UISampleModel.h b/code/sdk/application/wearable/nativeapp/nativeui/uisample/include/UISampleModel.h
index 4a37a06..0570ca0 100755 (executable)
--- a/code/sdk/application/wearable/nativeapp/nativeui/uisample/include/UISampleModel.h
+++ b/code/sdk/application/wearable/nativeapp/nativeui/uisample/include/UISampleModel.h
@@ -11,6 +11,7 @@
 #include <cstdint>
 #include <map>
 #include "AppViewIDs.h"
+#include "components/ui_label_ext.h"
 #include "UiConfig.h"
 #include "UISamplePresenter.h"
 

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/en.lang
index a58e4c0..14a2769 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/en.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/en.lang differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/ui_resource_string.h
index 309da6b..f151970 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/ui_resource_string.h
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/ui_resource_string.h
@@ -10,26 +10,17 @@
 #include <cstdint>
 namespace OHOS {
 enum UIResourceTextId : uint16_t {
-    STR_IMAGE = 0,\r
-    STR_PROGRESSBAR = 1,\r
-    STR_SLIDEUNLOCK = 2,\r
-    STR_LISTBOX = 3,\r
-    STR_BUTTON = 4,\r
-    STR_SCROLLVIEW = 5,\r
-    STR_SCROLLGRID = 6,\r
-    STR_CLOCK = 7,\r
-    STR_DISTURBANCE = 8,\r
-    STR_BRIGHT = 9,\r
-    STR_PHONE = 10,\r
-    STR_LANGAGE = 11,\r
-    STR_ALARM = 12,\r
-    STR_SYSTEM = 13,\r
-    STR_SPO2 = 14,\r
-    STR_COMPASS = 15,\r
-    STR_INDOORWALK = 16,\r
-    STR_WEATHER = 17,\r
-    STR_SYSTEMSETTING = 18,\r
-    STR_MAX_ID = 19,\r
+    STR_DANCING_GENERAL = 0,\r
+    STR_DANCING_BELLY = 1,\r
+    STR_DANCING_JAZZ = 2,\r
+    STR_DANCING_LATIN = 3,\r
+    STR_DANCING_BALLET = 4,\r
+    STR_DANCING_STREET = 5,\r
+    STR_DANCING_PUBLICSQUARE = 6,\r
+    STR_DANCING_ZUMBA = 7,\r
+    STR_DANCING_SOCIALDANCE = 8,\r
+    STR_DANCING_TAPDANCE = 9,\r
+    STR_MAX_ID = 10,\r
 }; // UIResourceTextId\r
 
 enum FontLanguageId : uint8_t {

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/zh.lang
index de8ffb0..99a0a9e 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/zh.lang differ