From: Caisking <3449750381@qq.com> Date: Fri, 29 Mar 2024 03:25:51 +0000 (+0800) Subject: 适配极限运动列表多国语言 X-Git-Tag: release_V1.2.70_20241020_135402~1241^2~19^2~4 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=4a65592ab807c3e93895c4d9f0ce59a0c76ab931;p=mirrors%2FFD230.git 适配极限运动列表多国语言 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml index a59185b7c..8335b6820 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml @@ -1,178 +1,178 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml index 7bb73555b..b07ed1e7c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml @@ -1,178 +1,178 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang index eb687d040..37b2acd3b 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h index d0c2d220b..8a10510c1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h +++ b/code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h @@ -1,15 +1,15 @@ -/* -* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved. -* Description: language -* Author: Graphic develop team -* Create: 2021-07-06 -*/ - -#ifndef UI_RESOURCE_STRING_H -#define UI_RESOURCE_STRING_H -#include -namespace OHOS { -enum UIResourceTextId : uint16_t { +/* +* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved. +* Description: language +* Author: Graphic develop team +* Create: 2021-07-06 +*/ + +#ifndef UI_RESOURCE_STRING_H +#define UI_RESOURCE_STRING_H +#include +namespace OHOS { +enum UIResourceTextId : uint16_t { STR_EXERCISE_GENERAL = 0, STR_EXERCISE_FREETRAINING = 1, STR_EXERCISE_RESISTANCETRAINING = 2, @@ -187,10 +187,10 @@ enum UIResourceTextId : uint16_t { STR_OTHER_WHEELCHAIR = 174, STR_MAX_ID = 175, }; // UIResourceTextId - -enum FontLanguageId : uint8_t { - LANGUAGE_ID_EN, + +enum FontLanguageId : uint8_t { LANGUAGE_ID_ZH, + LANGUAGE_ID_EN, LANGUAGE_ID_MAX }; // UITextLanguageTextId } diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang index a9aa37ad9..fd08c5908 100644 Binary files a/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang and b/code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang differ diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp index 726ad8660..8cc02f27a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceModel.cpp @@ -44,7 +44,7 @@ namespace OHOS 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}; + TraingIces[11] = {VIEW_TRAININGNOMAL, STR_ICE_SNOWSPORTS}; } const TraingIceItem *TraingIceModel::GetTraingIcelistItems() const 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 369720570..80751618e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h @@ -1,8 +1,8 @@ -/*** +/*** * @Author: Caisking 3449750381@qq.com * @Date: 2024-03-26 17:04:41 * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-03-26 18:17:03 + * @LastEditTime: 2024-03-29 11:16:42 * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitAdapter.h * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -17,7 +17,7 @@ #include "components/ui_checkbox.h" #include "AppViewIDs.h" #include "components/ui_label_ext.h" -#include"language/font/ui_resource_string.h" +#include "language/font/ui_resource_string.h" // 列表的适配器 namespace OHOS @@ -26,7 +26,7 @@ namespace OHOS typedef struct { AppViewId id; - const char *label; // 标签 + UIResourceTextId labelid; // 标签 } TraingLimitItem; class TraingLimitAdapter : public AbstractAdapter 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 f8e683249..f144c8d94 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitItemView.h @@ -36,8 +36,8 @@ namespace OHOS TraingLimitItemView(const TraingLimitItemView &); UIImageView sbackground; // 背景 UIImageView sicon; // 箭头 - UILabel sLabel; // 标签 - TraingLimitItem sItemInfo = {VIEW_INVALID, nullptr}; + UILabelExt sLabel; // 标签 + TraingLimitItem sItemInfo = {VIEW_INVALID, STR_EXERCISE_GENERAL}; }; } 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 31e63b229..d93ad1870 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/include/TraingLimitModel.h @@ -30,7 +30,7 @@ namespace OHOS TraingLimitModel &operator=(const TraingLimitModel &); virtual ~TraingLimitModel(); static const uint16_t TraingLimitListMaxNum = 10; - TraingLimitItem TraingLimits[TraingLimitListMaxNum] = {VIEW_INVALID, nullptr}; + TraingLimitItem TraingLimits[TraingLimitListMaxNum] = {VIEW_INVALID, STR_EXERCISE_GENERAL}; // std::map TraingLimitIdToViewId; bool btConnectStatus{false}; }; 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 ab62dd3e7..1ad774fb2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp @@ -1,3 +1,11 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-26 17:05:30 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-29 11:18:05 + * @FilePath: /sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitItemView.cpp + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #include "traing/training_list_limit/include/TraingLimitItemView.h" #include "traing/include/TraingModel.h" @@ -32,7 +40,7 @@ namespace OHOS void TraingLimitItemView::SetItemInfo(const TraingLimitItem 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_limit/src/TraingLimitModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp index 3a3f29b73..44808af05 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitModel.cpp @@ -10,12 +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 "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" +#include "language/font/ui_resource_string.h" namespace OHOS { @@ -33,16 +33,16 @@ namespace OHOS void TraingLimitModel::InitTraingLimitListItem() { - TraingLimits[0] = {VIEW_TRAININGNOMAL, "一般极限运动"}; - TraingLimits[1] = {VIEW_TRAININGNOMAL, "滑板"}; - TraingLimits[2] = {VIEW_TRAININGNOMAL, "攀岩"}; - TraingLimits[3] = {VIEW_TRAININGNOMAL, "高空弹跳/蹦极"}; - TraingLimits[4] = {VIEW_TRAININGNOMAL, "跑酷"}; - TraingLimits[5] = {VIEW_TRAININGNOMAL, "BMX"}; - TraingLimits[6] = {VIEW_TRAININGNOMAL, "定向越野"}; - TraingLimits[7] = {VIEW_TRAININGNOMAL, "跳伞"}; - TraingLimits[8] = {VIEW_TRAININGNOMAL, "赛车"}; - TraingLimits[9] = {VIEW_TRAININGNOMAL, "铁人三项运动"}; + TraingLimits[0] = {VIEW_TRAININGNOMAL, STR_EXTREME_SPORTS}; + TraingLimits[1] = {VIEW_TRAININGNOMAL, STR_EXTREME_SKATEBOARDING}; + TraingLimits[2] = {VIEW_TRAININGNOMAL, STR_EXTREME_ROCKCLIMBING}; + TraingLimits[3] = {VIEW_TRAININGNOMAL, STR_EXTREME_BUNGEEJUMPING}; + TraingLimits[4] = {VIEW_TRAININGNOMAL, STR_EXTREME_PARKOUR}; + TraingLimits[5] = {VIEW_TRAININGNOMAL, STR_EXTREME_BMX}; + TraingLimits[6] = {VIEW_TRAININGNOMAL, STR_EXTREME_ORIENTEERING}; + TraingLimits[7] = {VIEW_TRAININGNOMAL, STR_EXTREME_PARACHUTE}; + TraingLimits[8] = {VIEW_TRAININGNOMAL, STR_EXTREME_RACING}; + TraingLimits[9] = {VIEW_TRAININGNOMAL, STR_EXTREME_TRIATHLONS}; } const TraingLimitItem *TraingLimitModel::GetTraingLimitlistItems() const