冰上运动列表适配多国语言

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

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayList/AlipayListView.h
index 1f7958c..afeb6d9 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
@@ -19,6 +19,7 @@
 #include "AlipayPresenter.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "AlipayListAdapter.h"
 #include "AlipayListItem.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h b/code/sdk/application/wearable/fd230app/nativeui/alipay/include/AlipayTrans/AlipayTransListView.h
index 61f50ca..c000bc1 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
@@ -20,6 +20,7 @@
 #include "AlipayPresenter.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "AlipayTransListAdapter.h"
 #include "AlipayTransListItem.h"

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

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

diff --git a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h
index 3d52d90..fc7bce0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/callerlog/include/CallerLogModel.h
@@ -12,6 +12,7 @@
 #include "PhoneService.h"\r
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 26c238d..fafb264 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 4e0bff9..121b77a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/compass/include/CompassPresenter.h
@@ -14,6 +14,7 @@
 #include "UiConfig.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "CompassView.h"
 
 namespace OHOS {

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

diff --git a/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdatePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/dialupdate/src/DialUpdatePresenter.cpp
index 2bea004..152b447 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,5 +1,6 @@
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "NativeAbility.h"
 #include "DialViewGroup.h"
 #include "dialupdate/include/DialUpdatePresenter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp b/code/sdk/application/wearable/fd230app/nativeui/displaybrightness/src/DisplayBrightnessPresent.cpp
index d9fbff5..e7b06f4 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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/include/FindPhoneView.h b/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhoneView.h
index 6340d3c..af94c3c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhoneView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/findphone/include/FindPhoneView.h
@@ -5,6 +5,7 @@
 #include "View.h"
 #include "components/ui_view_group.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "components/ui_image_animator.h"
 #include "components/ui_label_button_ext.h"
 #include "components/ui_image_view.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp
index e15ce42..50aeb34 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/findphone/src/FindPhonePresenter.cpp
@@ -7,6 +7,7 @@
  */
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "NativeAbility.h"
 #include "findphone/include/FindPhonePresenter.h"
 #include "common/key_code.h"

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

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp b/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp
index 8f91327..86570cf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/LanguageInit.cpp
@@ -51,8 +51,8 @@ namespace OHOS
         {"uz", "O‘zbek", "乌兹别克语"},
         {"az", "Azərbaycan dili", "阿塞拜疆语"}};
 
-    static const char *en = "user/res/language_config/font/en.lang";
-    static const char *zh_CN = "user/res/language_config/font/zh.lang";
+    static const char *en = "user/res/font/en.lang";
+    static const char *zh_CN = "user/res/font/zh.lang";
     static const uint8_t langcount = 2;
     const char *resFiles[langcount] = {zh_CN, en};
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang
new file mode 100644 (file)
index 0000000..62c28e1
Binary files /dev/null and b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang differ

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
new file mode 100644 (file)
index 0000000..edb6ce7
--- /dev/null
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
+* Description: language
+* Author: Graphic develop team
+* Create: 2021-07-06
+*/
+
+#ifndef UI_RESOURCE_STRING_H
+#define UI_RESOURCE_STRING_H
+#include <cstdint>
+namespace OHOS {
+enum UIResourceTextId : uint16_t {
+    STR_ICE_SPORTS = 0,\r
+    STR_ICE_SKATING = 1,\r
+    STR_ICE_HOCKEY = 2,\r
+    STR_ICE_CURLING = 3,\r
+    STR_ICE_SNOWMOBILING = 4,\r
+    STR_ICE_SLED = 5,\r
+    STR_ICE_BIATHLON = 6,\r
+    STR_ICE_CROSSCOUNTRYSKING = 7,\r
+    STR_ICE_SKIING = 8,\r
+    STR_ICE_SNOWBOARDING = 9,\r
+    STR_ICE_SNOWSHOEING = 10,\r
+    STR_ICE_SNOWSPORTS = 11,\r
+    STR_DANCING_GENERAL = 12,\r
+    STR_DANCING_BELLY = 13,\r
+    STR_DANCING_JAZZ = 14,\r
+    STR_DANCING_LATIN = 15,\r
+    STR_DANCING_BALLET = 16,\r
+    STR_DANCING_STREET = 17,\r
+    STR_DANCING_PUBLICSQUARE = 18,\r
+    STR_DANCING_ZUMBA = 19,\r
+    STR_DANCING_SOCIALDANCE = 20,\r
+    STR_DANCING_TAPDANCE = 21,\r
+    STR_ICE_SNOW_SPORTS = 22,\r
+    STR_MAX_ID = 23,\r
+}; // UIResourceTextId\r
+
+enum FontLanguageId : uint8_t {
+    LANGUAGE_ID_ZH,\r
+    LANGUAGE_ID_EN,\r
+    LANGUAGE_ID_MAX\r
+}; // UITextLanguageTextId\r
+}\r
+#endif  /* UI_RESOURCE_STRING_H */\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang
new file mode 100644 (file)
index 0000000..c56ee17
Binary files /dev/null and b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang differ

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/config.json b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/config.json
deleted file mode 100644 (file)
index 005a9cb..0000000
--- a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/config.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "languages": {
-        "zh": {
-            "path": "user/res/language_config/font/zh.lang"
-        },
-        "en": {
-            "path": "user/res/language_config/font/en.lang"
-        }
-    },
-    "languages_satuas": 0
-}
\ No newline at end of file

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

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/ui_resource_string.h
deleted file mode 100644 (file)
index f151970..0000000
--- a/code/sdk/application/wearable/fd230app/nativeui/language/language_config/font/ui_resource_string.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
-* Description: language
-* Author: Graphic develop team
-* Create: 2021-07-06
-*/
-
-#ifndef UI_RESOURCE_STRING_H
-#define UI_RESOURCE_STRING_H
-#include <cstdint>
-namespace OHOS {
-enum UIResourceTextId : uint16_t {
-    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 {
-    LANGUAGE_ID_ZH,\r
-    LANGUAGE_ID_EN,\r
-    LANGUAGE_ID_MAX\r
-}; // UITextLanguageTextId\r
-}\r
-#endif  /* UI_RESOURCE_STRING_H */\r

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

diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/language_en.xml b/code/sdk/application/wearable/fd230app/nativeui/language/language_en.xml
index 1f95633..af555a6 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,4 +1,18 @@
 <language id="language" direct="ltf" languageinfo="en">
+
+    <lanstr id="STR_ICE_SPORTS" value="Ice Sports" />
+    <lanstr id="STR_ICE_SKATING" value="Skating" />
+    <lanstr id="STR_ICE_HOCKEY" value="Hockey" />
+    <lanstr id="STR_ICE_CURLING" value="Curling" />
+    <lanstr id="STR_ICE_SNOWMOBILING" value="Snowmobiling" />
+    <lanstr id="STR_ICE_SLED" value="Sled" />
+    <lanstr id="STR_ICE_BIATHLON" value="Biathlon" />
+    <lanstr id="STR_ICE_CROSSCOUNTRYSKING" value="Cross-country Skiing" />
+    <lanstr id="STR_ICE_SKIING" value="Skiing" />
+    <lanstr id="STR_ICE_SNOWBOARDING" value="Snowboarding" />
+    <lanstr id="STR_ICE_SNOWSHOEING" value="Snowshoeing" />
+    <lanstr id="STR_ICE_SNOW_SPORTS" value="Ice Snow Sports" />
+
     <lanstr id="STR_DANCING_GENERAL" value="General Dance" />
     <lanstr id="STR_DANCING_BELLY" value="Belly Dance" />
     <lanstr id="STR_DANCING_JAZZ" value="Jazz Dance" />
@@ -9,4 +23,6 @@
     <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 4ae8a1f..ddec467 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,4 +1,18 @@
 <language id="language" direct="lft" languageinfo="zh">
+
+    <lanstr id="STR_ICE_SPORTS" value="一般冰上运动" />
+    <lanstr id="STR_ICE_SKATING" value="溜冰" />
+    <lanstr id="STR_ICE_HOCKEY" value="冰球" />
+    <lanstr id="STR_ICE_CURLING" value="冰石壶/冰壶" />
+    <lanstr id="STR_ICE_SNOWMOBILING" value="雪上摩托车" />
+    <lanstr id="STR_ICE_SLED" value="雪橇" />
+    <lanstr id="STR_ICE_BIATHLON" value="冬季两项" />
+    <lanstr id="STR_ICE_CROSSCOUNTRYSKING" value="越野滑雪" />
+    <lanstr id="STR_ICE_SKIING" value="滑雪" />
+    <lanstr id="STR_ICE_SNOWBOARDING" value="单板滑雪/滑雪板" />
+    <lanstr id="STR_ICE_SNOWSHOEING" value="雪鞋健行" />
+    <lanstr id="STR_ICE_SNOWSPORTS" value="雪地运动" />
+
     <lanstr id="STR_DANCING_GENERAL" value="一般舞蹈" />
     <lanstr id="STR_DANCING_BELLY" value="肚皮舞" />
     <lanstr id="STR_DANCING_JAZZ" value="爵士舞" />

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

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp
index 8855fde..8ba26d1 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,6 +1,7 @@
 
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "NativeAbility.h"
 #include "message/include/MessagePresenter.h"
 #include "message/include/MessageAdapter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp
index c4c704a..23d4f3c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistModel.cpp
@@ -10,6 +10,7 @@
 #include "VocassistModel.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 
 #include "NativeAbility.h"
 #include "graphic_service.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp
index da6f21a..a394a59 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistPresenter.cpp
@@ -6,6 +6,7 @@
  */
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "VocassistPresenter.h"
 #include "PlayersModel.h"
 #include "ui_service.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp
index e9a094a..1780bd6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/offlinevoice/src/VocassistView.cpp
@@ -9,6 +9,7 @@
 #include "cmsis_os.h"\r
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 55b9b04..62a93c5 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 0240b4c..95a17c7 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 d521f20..300d683 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 8d8be57..bf2466d 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 08ec440..4252bce 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 dc6aefc..38fdf2d 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 51eac07..3559420 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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/include/RecordDeleteView.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordDeleteView.h
index 0487760..92fc218 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordDeleteView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordDeleteView.h
@@ -8,6 +8,7 @@
 #include "components/ui_image_view.h"\r
 #include "components/ui_button.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.h"\r
 namespace OHOS\r
 {\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPlayerView.h b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPlayerView.h
index e9d0b78..9a05c2d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPlayerView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/record/include/RecordingPlayerView.h
@@ -9,6 +9,7 @@
 #include "components/ui_circle_progress.h"\r
 #include "components/ui_checkbox.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.h"\r
 #include "components/ui_button.h"\r
 #define APP_RES_PATH "/user/res"\r
 namespace OHOS\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 2d95ec3..f85bd55 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 eb12881..3be61c1 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,5 +1,6 @@
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "NativeAbility.h"
 
 #include "rotate/include/RotatePresenter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/saveele/src/SaveBatPresenter.cpp
index 6eec6f5..8732423 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,6 +1,7 @@
 \r
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 72e1d60..bf9e632 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 4405689..117e72d 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
@@ -10,6 +10,7 @@
 #include "NativeAbility.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "MainViewSample.h"
 #include "ui_screennotify.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingAttentionPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/secondaryfunction/src/FastTrainingAttentionPresenter.cpp
index 86ff4f3..fc8d59c 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 7fc99d3..aa1e2e6 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 444fd4f..febc7af 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,6 +1,7 @@
 \r
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 a191979..385566a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/settings/include/SettingModel.h
@@ -12,6 +12,7 @@
 #include <map>
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "SettingItem.h"
 #include "SettingPresenter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/CallVolumePresenter.cpp
index b7d672a..69e7f0f 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 9b7bcda..84bde07 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 7be9ac5..9ff5d09 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/soundandvibration/src/SoundAndVibrationPresenter.cpp
@@ -8,6 +8,7 @@
 \r
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 f9f56ac..151f972 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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/include/SystemLanguageView.h b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLanguageView.h
index a84c792..9c3f07c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLanguageView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/system/include/SystemLanguageView.h
@@ -8,6 +8,7 @@
 #include "components/ui_radio_button.h"\r
 #include "components/ui_image_view.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.h"\r
 namespace OHOS\r
 {\r
     class SystemLanguageView\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 becd823..f3c48e3 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.h"\r
 #include "NativeAbility.h"\r
 #include "graphic_math.h"\r
 #include "string.h"\r
@@ -11,7 +12,7 @@
 #include "common/key_code.h"\r
 #include "custom_utils.h"\r
 #include "language/LanguageInit.h"\r
-#include "language/language_config/font/ui_resource_string.h"\r
+#include "language/font/ui_resource_string.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -198,8 +199,8 @@ namespace OHOS
     bool RadiobuttonOnChangeListener::OnChange(UICheckBox::UICheckBoxState state)\r
     {\r
         language *g_planguage;\r
-        // static const char *en = "user/res/language_config/font/en.lang";\r
-        // static const char *zh_CN = "user/res/language_config/font/zh.lang";\r
+        // static const char *en = "user/res/font/en.lang";\r
+        // static const char *zh_CN = "user/res/font/zh.lang";\r
         switch (state)\r
         {\r
         case UICheckBox::SELECTED:\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
index 0e10842..1e80cc1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
@@ -22,6 +22,7 @@
 #include "traing/include/TraingModel.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 
 #include "traing/include/TraingModel.h"
 #include "traing/Training_UiConfig.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlPresenter.cpp
index 14fe107..67b9a1e 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 a538694..5578ead 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp
@@ -3,6 +3,7 @@
 \r
 #include "common/image_cache_manager.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 d1d6d9c..9e73e69 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,6 +1,7 @@
 \r
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 81b4e07..53f7903 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp
@@ -3,6 +3,7 @@
 \r
 #include "common/image_cache_manager.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 8dda507..20f24f0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailPresenter.cpp
@@ -2,6 +2,7 @@
 \r
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 511fdd0..5470ca0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp
@@ -3,6 +3,7 @@
 \r
 #include "common/image_cache_manager.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 a66979e..983459f 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,5 +1,6 @@
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 f61af20..f83b6f9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
@@ -3,6 +3,7 @@
 
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 a095a63..d924430 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,5 +1,6 @@
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 7c1092a..3332c87 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp
@@ -3,6 +3,7 @@
 
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 579a454..e7e8448 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,5 +1,6 @@
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 a5a8743..b6c99ea 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp
@@ -3,6 +3,7 @@
 
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 cc33cbb..65dd187 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,5 +1,6 @@
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 e92aeb9..f209447 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMusicView.cpp
@@ -3,6 +3,7 @@
 #include <ui_scroll_view.h>
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 01bd0b2..bfcf6bf 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,6 +1,7 @@
 \r
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 9a5092d..9ba235b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
@@ -3,6 +3,7 @@
 
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 8e7b519..472b82c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingPresenter.cpp
@@ -2,6 +2,7 @@
 
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "NativeAbility.h"
 
 #include <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 21792d0..b1731ea 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 7951e09..06141f6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp
@@ -3,6 +3,7 @@
 \r
 #include "common/image_cache_manager.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 8933844..02e391a 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,5 +1,6 @@
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 7227bae..bcbaf84 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp
@@ -3,6 +3,7 @@
 
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 c71b7f6..dde17f2 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 8f1c38d..20d0976 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,5 +1,6 @@
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 77b5b44..1c6408f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp
@@ -3,6 +3,7 @@
 
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 8a9d0fc..36f58ef 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 1f6fa7e..f2d761b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp
@@ -3,6 +3,7 @@
 \r
 #include "common/image_cache_manager.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 02b3a27..1203ece 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
@@ -3,6 +3,7 @@
 \r
 #include "common/image_cache_manager.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 dd40b8c..288e0d8 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,6 +1,7 @@
 
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 f2a6f83..e810e23 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp
@@ -3,6 +3,7 @@
 
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 8e6632b..c71226b 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,6 +1,7 @@
 
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 16ad8be..bbd9a44 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp
@@ -3,6 +3,7 @@
 
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 ba0db55..62c4b85 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,6 +1,7 @@
 
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 a9392e1..1c0712e 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
@@ -3,6 +3,7 @@
 
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 c0f0d2a..2517296 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,5 +1,6 @@
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 cff68a3..9ba146b 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
@@ -3,6 +3,7 @@
 
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 3136d91..876edf7 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,6 +1,7 @@
 
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 c368e60..e6bd415 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
@@ -3,6 +3,7 @@
 
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 befcc3c..0b0a5d0 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,5 +1,6 @@
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 50478aa..b7c2462 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
@@ -3,6 +3,7 @@
 
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 e0f367d..8443054 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,6 +1,7 @@
 
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 802f92f..bc53b07 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
@@ -3,6 +3,7 @@
 
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 3026483..2828566 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,5 +1,6 @@
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 811207e..cb8fbe8 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
@@ -3,6 +3,7 @@
 
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include <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 46b2874..3279404 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
@@ -2,6 +2,7 @@
 \r
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 6812d31..f4425a7 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
@@ -2,6 +2,7 @@
 #include "traing/training_card/include/TraingCardView.h"\r
 #include "common/image_cache_manager.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 dfe9ee4..b9c7d60 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
@@ -12,8 +12,10 @@
 
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "NativeAbility.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "wearable_log.h"
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp
index 0d37b10..4856389 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
@@ -3,6 +3,7 @@
 \r
 #include "common/image_cache_manager.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 e1c00f2..c6fd188 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
@@ -17,7 +17,8 @@
 #include "components/ui_checkbox.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
-#include "language/language_config/font/ui_resource_string.h"
+#include"language/font/ui_resource_string.h"
+#include "language/font/ui_resource_string.h"
 // 列表的适配器
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceItemView.h
index f5ba629..2fd7194 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
@@ -26,7 +26,9 @@
 #include "components/ui_label_button.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "ohos_types.h"
 
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceModel.h
index 0201b66..5cae108 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
@@ -14,7 +14,9 @@
 #include <map>
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "TraingDancePresenter.h"
 #include "traing/training_list_dance/include/TraingDanceAdapter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceView.h
index be6094c..484b4e3 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/include/TraingDanceView.h
@@ -11,6 +11,7 @@
 #include "traing/training_list_dance/include/TraingDanceModel.h"
 #include "components/ui_label_button_ext.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceItemView.cpp
index dae01e2..4b907bd 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
@@ -3,6 +3,7 @@
 #include "traing/include/TraingModel.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp
index 073773b..6e4535d 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
@@ -18,10 +18,12 @@
 #include "traing/training_list_dance/include/TraingDanceModel.h"
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 namespace OHOS
 {
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDancePresenter.cpp
index f67e9ad..deda177 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
@@ -17,6 +17,7 @@
 
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 ac979c2..d0db319 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
@@ -4,6 +4,7 @@
 #include "traing/Training_UiConfig.h"
 
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "wearable_log.h"
 
@@ -80,8 +81,8 @@ namespace OHOS
         TraingDanceList->SetMaxScrollDistance(MAX_SCR_DIS);
 
         // 增加表冠控制
-        TraingDanceList->SetRotateFactor(2);
-        TraingDanceList->RequestFocus();
+        scrollView->SetRotateFactor(2);
+        scrollView->RequestFocus();
     }
     UIList *TraingDanceView::GetList()
     {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessView.h
index 557378d..3c54bda 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessView.h
@@ -11,6 +11,7 @@
 #include "traing/training_list_fitness/include/TraingFitnessModel.h"
 #include "components/ui_label_button_ext.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h
index b09bbf3..50e8363 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
@@ -1,8 +1,8 @@
-/*** 
+/***
  * @Author: Caisking 3449750381@qq.com
  * @Date: 2024-03-27 11:09:52
  * @LastEditors: Caisking 3449750381@qq.com
- * @LastEditTime: 2024-03-27 15:25:46
+ * @LastEditTime: 2024-03-28 19:54:05
  * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceAdapter.h
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -17,6 +17,7 @@
 #include "components/ui_checkbox.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 
 // 列表的适配器
 namespace OHOS
@@ -25,7 +26,7 @@ namespace OHOS
     typedef struct
     {
         AppViewId id;
-        const char *label;       // 标签
+        UIResourceTextId labelid; // 标签
     } TraingIceItem;
 
     class TraingIceAdapter : public AbstractAdapter

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceItemView.h
index 84520c5..aa1cbe6 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
@@ -11,6 +11,7 @@
 #include "components/ui_label_button.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "ohos_types.h"
 
 namespace OHOS
@@ -28,8 +29,8 @@ namespace OHOS
         TraingIceItemView(const TraingIceItemView &);
         UIImageView sbackground; // 背景
         UIImageView sicon;        // 箭头
-        UILabel sLabel;          // 标签
-        TraingIceItem sItemInfo = {VIEW_INVALID, nullptr};
+        UILabelExt sLabel;          // 标签
+        TraingIceItem sItemInfo = {VIEW_INVALID, STR_ICE_SPORTS};
     };
 
 }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceModel.h
index 52283f7..fef4cf7 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
@@ -6,7 +6,9 @@
 #include <map>
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "TraingIcePresenter.h"
 #include "traing/training_list_ice/include/TraingIceAdapter.h"
@@ -28,7 +30,7 @@ namespace OHOS
         TraingIceModel &operator=(const TraingIceModel &);
         virtual ~TraingIceModel();
         static const uint16_t TraingIceListMaxNum = 12;
-        TraingIceItem TraingIces[TraingIceListMaxNum] = {VIEW_INVALID, nullptr};
+        TraingIceItem TraingIces[TraingIceListMaxNum] = {VIEW_INVALID, STR_ICE_SPORTS};
         // std::map<int, AppViewId> TraingIceIdToViewId;
         bool btConnectStatus{false};
     };

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceView.h
index c23d7e3..f768e7a 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/include/TraingIceView.h
@@ -11,6 +11,7 @@
 #include "traing/training_list_ice/include/TraingIceModel.h"
 #include "components/ui_label_button_ext.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceItemView.cpp
index 451389b..d159a94 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
@@ -3,6 +3,7 @@
 #include "traing/include/TraingModel.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 namespace OHOS
 {
@@ -31,7 +32,7 @@ namespace OHOS
     void TraingIceItemView::SetItemInfo(const TraingIceItem itemInfo)
     {
         sItemInfo = itemInfo;
-        sLabel.SetText(itemInfo.label);
+        sLabel.SetTextId(itemInfo.labelid);
     }
 
     /// @brief 设置每一个itemview上的组件

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp
index b760679..726ad86 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
@@ -10,10 +10,12 @@
 #include "traing/training_list_ice/include/TraingIceModel.h"
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include "language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include "language/font/ui_resource_string.h"
 namespace OHOS
 {
 
@@ -31,21 +33,20 @@ namespace OHOS
 
     void TraingIceModel::InitTraingIceListItem()
     {
-        TraingIces[0] = {VIEW_TRAININGNOMAL, "一般冰上运动"};
-        TraingIces[1] = {VIEW_TRAININGNOMAL, "溜冰"};
-        TraingIces[2] = {VIEW_TRAININGNOMAL, "冰球"};
-        TraingIces[3] = {VIEW_TRAININGNOMAL, "冰石壶/冰壶"};
-        TraingIces[4] = {VIEW_TRAININGNOMAL, "雪上摩托车"};
-        TraingIces[5] = {VIEW_TRAININGNOMAL, "雪橇"};
-        TraingIces[6] = {VIEW_TRAININGNOMAL, "冬季两项"};
-        TraingIces[7] = {VIEW_TRAININGNOMAL, "越野滑雪"};
-        TraingIces[8] = {VIEW_TRAININGNOMAL, "滑雪"};
-        TraingIces[9] = {VIEW_TRAININGNOMAL, "单板滑雪/滑雪板"};
-        TraingIces[10] = {VIEW_TRAININGNOMAL, "雪鞋健行"};
-        TraingIces[11] = {VIEW_TRAININGNOMAL, "雪地运动"};
+        TraingIces[0] = {VIEW_TRAININGNOMAL, STR_ICE_SPORTS};
+        TraingIces[1] = {VIEW_TRAININGNOMAL, STR_ICE_SKATING};
+        TraingIces[2] = {VIEW_TRAININGNOMAL, STR_ICE_HOCKEY};
+        TraingIces[3] = {VIEW_TRAININGNOMAL, STR_ICE_CURLING};
+        TraingIces[4] = {VIEW_TRAININGNOMAL, STR_ICE_SNOWMOBILING};
+        TraingIces[5] = {VIEW_TRAININGNOMAL, STR_ICE_SLED};
+        TraingIces[6] = {VIEW_TRAININGNOMAL, STR_ICE_BIATHLON};
+        TraingIces[7] = {VIEW_TRAININGNOMAL, STR_ICE_CROSSCOUNTRYSKING};
+        TraingIces[8] = {VIEW_TRAININGNOMAL, STR_ICE_SKIING};
+        TraingIces[9] = {VIEW_TRAININGNOMAL, STR_ICE_SNOWBOARDING};
+        TraingIces[10] = {VIEW_TRAININGNOMAL, STR_ICE_SNOWSHOEING};
+        TraingIces[11] = {VIEW_TRAININGNOMAL, STR_ICE_SNOW_SPORTS};
     }
 
-
     const TraingIceItem *TraingIceModel::GetTraingIcelistItems() const
     {
         return TraingIces;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIcePresenter.cpp
index ad8e29e..ebe797c 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
@@ -17,6 +17,7 @@
 
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 5785680..f6f4464 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
@@ -1,9 +1,18 @@
+/*** 
+ * @Author: Caisking 3449750381@qq.com
+ * @Date: 2024-03-26 09:46:17
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-03-28 19:59:38
+ * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 #include "traing/training_list_ice/include/TraingIceView.h"
 #include "traing/training_list_ice/include/TraingIcePresenter.h"
 #include "traing/include/TraingModel.h"
 #include "traing/Training_UiConfig.h"
 
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "wearable_log.h"
 
@@ -80,8 +89,8 @@ namespace OHOS
         TraingIceList->SetMaxScrollDistance(MAX_SCR_DIS);
 
         // 增加表冠控制
-        TraingIceList->SetRotateFactor(2);
-        TraingIceList->RequestFocus();
+        scrollView->SetRotateFactor(2);
+        scrollView->RequestFocus();
     }
     UIList *TraingIceView::GetList()
     {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h
index ab0da9d..3697205 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
@@ -17,6 +17,7 @@
 #include "components/ui_checkbox.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 
 // 列表的适配器
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h
index 005c9c3..f8e6832 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
@@ -18,6 +18,7 @@
 #include "components/ui_label_button.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "ohos_types.h"
 
 namespace OHOS

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h
index 4a41a4b..31e63b2 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
@@ -6,7 +6,9 @@
 #include <map>
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "TraingLimitPresenter.h"
 #include "traing/training_list_limit/include/TraingLimitAdapter.h"

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitView.h
index 3fcc7fb..19597cf 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitView.h
@@ -19,6 +19,7 @@
 #include "traing/training_list_limit/include/TraingLimitModel.h"
 #include "components/ui_label_button_ext.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp
index a6075e1..ab62dd3 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
@@ -3,6 +3,7 @@
 #include "traing/include/TraingModel.h"
 #include "traing/Training_UiConfig.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 namespace OHOS
 {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp
index f733476..3a3f29b 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
@@ -10,10 +10,12 @@
 #include "traing/training_list_limit/include/TraingLimitModel.h"
 #include "common/image_cache_manager.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "ui_resource_image.h"
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 namespace OHOS
 {
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitPresenter.cpp
index 236f0ae..04e338f 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
@@ -17,6 +17,7 @@
 \r
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 8972c69..234cf21 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
@@ -4,6 +4,7 @@
 #include "traing/Training_UiConfig.h"\r
 \r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 bed56e9..fc22065 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 f601c71..f06465c 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
@@ -5,6 +5,7 @@
 \r
 #include "common/image_cache_manager.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 4711410..22a0c8b 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,5 +1,6 @@
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.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 0570ca0..556d8fc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/uisample/include/UISampleModel.h
@@ -12,6 +12,7 @@
 #include <map>
 #include "AppViewIDs.h"
 #include "components/ui_label_ext.h"
+#include"language/font/ui_resource_string.h"
 #include "UiConfig.h"
 #include "UISamplePresenter.h"
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherReportView.h b/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherReportView.h
index bf8272b..07ef3b5 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherReportView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/weather/include/WeatherReportView.h
@@ -7,6 +7,7 @@
 #include "components/ui_view_group.h"\r
 #include "components/ui_scroll_view.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.h"\r
 #include "components/ui_image_animator.h"\r
 #include "config/include/ConfigModel.h"\r
 namespace OHOS\r

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 0b8e89f..cddd76b 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 60d9bbf..4169b7b 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.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 4c6897e..43bf11f 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,5 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
+#include"language/font/ui_resource_string.h"\r
 #include "NativeAbility.h"\r
 #include "weather/include/MainWeatherPresenter.h"\r
 #include "common/key_code.h"\r

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
new file mode 100644 (file)
index 0000000..62c28e1
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
new file mode 100644 (file)
index 0000000..edb6ce7
--- /dev/null
+++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
@@ -0,0 +1,45 @@
+/*
+* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
+* Description: language
+* Author: Graphic develop team
+* Create: 2021-07-06
+*/
+
+#ifndef UI_RESOURCE_STRING_H
+#define UI_RESOURCE_STRING_H
+#include <cstdint>
+namespace OHOS {
+enum UIResourceTextId : uint16_t {
+    STR_ICE_SPORTS = 0,\r
+    STR_ICE_SKATING = 1,\r
+    STR_ICE_HOCKEY = 2,\r
+    STR_ICE_CURLING = 3,\r
+    STR_ICE_SNOWMOBILING = 4,\r
+    STR_ICE_SLED = 5,\r
+    STR_ICE_BIATHLON = 6,\r
+    STR_ICE_CROSSCOUNTRYSKING = 7,\r
+    STR_ICE_SKIING = 8,\r
+    STR_ICE_SNOWBOARDING = 9,\r
+    STR_ICE_SNOWSHOEING = 10,\r
+    STR_ICE_SNOWSPORTS = 11,\r
+    STR_DANCING_GENERAL = 12,\r
+    STR_DANCING_BELLY = 13,\r
+    STR_DANCING_JAZZ = 14,\r
+    STR_DANCING_LATIN = 15,\r
+    STR_DANCING_BALLET = 16,\r
+    STR_DANCING_STREET = 17,\r
+    STR_DANCING_PUBLICSQUARE = 18,\r
+    STR_DANCING_ZUMBA = 19,\r
+    STR_DANCING_SOCIALDANCE = 20,\r
+    STR_DANCING_TAPDANCE = 21,\r
+    STR_ICE_SNOW_SPORTS = 22,\r
+    STR_MAX_ID = 23,\r
+}; // UIResourceTextId\r
+
+enum FontLanguageId : uint8_t {
+    LANGUAGE_ID_ZH,\r
+    LANGUAGE_ID_EN,\r
+    LANGUAGE_ID_MAX\r
+}; // UITextLanguageTextId\r
+}\r
+#endif  /* UI_RESOURCE_STRING_H */\r

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang
new file mode 100644 (file)
index 0000000..c56ee17
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/config.json b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/config.json
deleted file mode 100644 (file)
index 005a9cb..0000000
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/config.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "languages": {
-        "zh": {
-            "path": "user/res/language_config/font/zh.lang"
-        },
-        "en": {
-            "path": "user/res/language_config/font/en.lang"
-        }
-    },
-    "languages_satuas": 0
-}
\ No newline at end of file

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

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/ui_resource_string.h b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/ui_resource_string.h
deleted file mode 100644 (file)
index f151970..0000000
--- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/language_config/font/ui_resource_string.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
-* Description: language
-* Author: Graphic develop team
-* Create: 2021-07-06
-*/
-
-#ifndef UI_RESOURCE_STRING_H
-#define UI_RESOURCE_STRING_H
-#include <cstdint>
-namespace OHOS {
-enum UIResourceTextId : uint16_t {
-    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 {
-    LANGUAGE_ID_ZH,\r
-    LANGUAGE_ID_EN,\r
-    LANGUAGE_ID_MAX\r
-}; // UITextLanguageTextId\r
-}\r
-#endif  /* UI_RESOURCE_STRING_H */\r

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