From: Caisking <3449750381@qq.com> Date: Mon, 1 Apr 2024 12:44:23 +0000 (+0800) Subject: 优化训练开始界面 X-Git-Tag: release_V1.2.70_20241020_135402~1237^2~3 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=411c033c8a6fd2cbc9933aceeaf1c4c7159fb640;p=mirrors%2FFD230.git 优化训练开始界面 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt index 193221731..53d9d994b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt @@ -19,7 +19,7 @@ STR_EXERCISE_OUTDOORWALKING$Walk STR_EXERCISE_OUTDOORRUNNING$Run STR_EXERCISE_INDOORWALKING$Indoor walking STR_EXERCISE_INDOORRUNNING$Indoor running -STR_EXERCISE_OUTDOORBIKING$Biking +STR_EXERCISE_OUTDOORBIKING$ Biking STR_EXERCISE_JUMPINGROPE$Jumping rope STR_EXERCISE_PILATES$Pilates STR_EXERCISE_CROSS_FIT$Cross fit @@ -35,7 +35,7 @@ STR_EXERCISE_BODYCOMBAT$Body Combat STR_EXERCISE_KENDO$Kendo STR_EXERCISE_HORIZONTALBAR$Horizontal bar STR_EXERCISE_PARALLELBARS$Parallel bars -STR_EXERCISE_CROSSFIT$Circuit training +STR_EXERCISE_CIRCUIT$Circuit training STR_EXERCISE_AEROBICS$Aerobics STR_EXERCISE_CALISTHENICE$Calisthenice STR_EXERCISE_P90X$P90X @@ -187,9 +187,8 @@ STR_BALL_LIST_TITLE$Ball Sport STR_OTHER_TITLE$Other Sport STR_EXERCISE_TITLE$Exercise Sport STR_TRAINING$Training -STR_LANGUAGE$Language STR_RAPID_TRAINING$Rapid training -STR_SET_GOALS$Set goals +STR_SET_GOALS$Set goals > STR_DURATION$duration STR_DURATION_SETTING$Duration setting STR_MINUTES$minutes @@ -213,14 +212,14 @@ STR_MEDIUM_STRENGTH$Medium strength STR_HIGH_STRENGTH$High strength STR_ULTRA_HIGH_STRENGTH$Ultra-high strength STR_TRAINING_INTENSITY$Training intensity -STR_TRAINING_INTENSITY_DESCRIPTION$Training intensity is used to determine whether the training is insufficient or too much training$ and how much exercise intensity is appropriate to increase the heart rate. -STR_INTENSITY_INTERVAL_DESCRIPTION$The intensity interval is a real-time state display of the strength of the corresponding bullseye rate (calculated from personal basic data)$ which is helpful to improve the quality of training +STR_TRAINING_INTENSITY_DESCRIPTION$Training intensity is used to determine whether the training is insufficient or too much training, and how much exercise intensity is appropriate to increase the heart rate. +STR_INTENSITY_INTERVAL_DESCRIPTION$The intensity interval is a real-time state display of the strength of the corresponding bullseye rate (calculated from personal basic data), which is helpful to improve the quality of training STR_TRAINING_STATE_MEANING$The meaning of the training state STR_WARM_UP_EXERCISE$Warm-up exercise STR_FAT_BURNING_ZONE$Fat-burning zone STR_IMPROVE_CARDIOPULMONARY_FUNCTION$Improve cardiopulmonary function STR_PROFESSIONAL_ATHLETE$Professional athlete -STR_TRAINING_INTENSITY_NOTE$Note: This training intensity is not a professional sports assessment$ and the data is for reference only +STR_TRAINING_INTENSITY_NOTE$Note: This training intensity is not a professional sports assessment, and the data is for reference only STR_TRAINING_IN_PROGRESS$Training in progress STR_BREAK_TRAINING$Break training STR_FINISH$finish diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt index 7e7a8451a..d51ffc1bd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt +++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt @@ -35,7 +35,7 @@ STR_EXERCISE_BODYCOMBAT$拳击有氧 STR_EXERCISE_KENDO$剑道 STR_EXERCISE_HORIZONTALBAR$单杠 STR_EXERCISE_PARALLELBARS$双杠 -STR_EXERCISE_CROSSFIT$循环训练 +STR_EXERCISE_CIRCUIT$循环训练 STR_EXERCISE_AEROBICS$有氧运动 STR_EXERCISE_CALISTHENICE$健美操 STR_EXERCISE_P90X$P90X @@ -187,9 +187,8 @@ STR_BALL_LIST_TITLE$球类运动 STR_OTHER_TITLE$其他运动 STR_EXERCISE_TITLE$健身运动 STR_TRAINING$训练 -STR_LANGUAGE$语言 STR_RAPID_TRAINING$快速训练 -STR_SET_GOALS$设置目标 +STR_SET_GOALS$设置目标 > STR_DURATION$时长 STR_DURATION_SETTING$时长设定 STR_MINUTES$分钟 @@ -230,7 +229,7 @@ STR_GOAL_ACHIEVED$目标已达成 STR_ACCOMPLISH_GOAL$完成目标 STR_OK$确定 STR_LOOK_OUT$注意 -STR_INSUFFICIENT_EXERCISE_AMOUNT$当前运动量太小，无法记录.是否结束运动 +STR_INSUFFICIENT_EXERCISE_AMOUNT$当前运动量太小，无法记录。是否结束运动 STR_END_MOVEMENT$结束运动 STR_END_THIS_MOVEMENT$是否结束本次运动 STR_GOAL_ACCOMPLISHMENT_DEGREE$目标完成度 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 e10e23d03..38a089019 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 @@ -20,7 +20,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -188,9 +188,8 @@ - - + @@ -214,14 +213,14 @@ - - + + - + 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 e677336a2..d8aff3e0c 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 @@ -36,7 +36,7 @@ - + @@ -188,9 +188,8 @@ - - + @@ -231,7 +230,7 @@ - + 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 a61b10894..bd25ae2c5 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 bd78e0587..62f10104b 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 @@ -47,158 +47,158 @@ enum UIResourceTextId : uint16_t { STR_EXERCISE_KENDO = 34, STR_EXERCISE_HORIZONTALBAR = 35, STR_EXERCISE_PARALLELBARS = 36, - STR_EXERCISE_AEROBICS = 37, - STR_EXERCISE_CALISTHENICE = 38, - STR_EXERCISE_P90X = 39, - STR_EXERCISE_KETTLEBELLTRAINING = 40, - STR_EXERCISE_MIXEDMARTIALARTS = 41, - STR_EXERCISE_STAIRCLIMBINGMACHINE = 42, - STR_EXERCISE_WEIGHTLIFTING = 43, - STR_EXERCISE_BARRE = 44, - STR_EXERCISE_HANDCYCLING = 45, - STR_EXERCISE_TRACKFIELD = 46, - STR_EXERCISE_WRESTLING = 47, - STR_EXERCISE_MINDBODY = 48, - STR_EXERCISE_FLEXIBILITY = 49, - STR_EXERCISE_MIXEDCARDIO = 50, - STR_EXERCISE_TRADITIONALSTRENGTHTRAINING = 51, - STR_EXERCISE_CROSSTRAINING = 52, - STR_EXERCISE_GYMNASTICS = 53, - STR_EXERCISE_STEPTRAINING = 54, - STR_EXERCISE_ELLIPTICALTRAINER = 55, - STR_EXERCISE_ROWINGMACHINE = 56, - STR_DANCING_GENERAL = 57, - STR_DANCING_BELLY = 58, - STR_DANCING_JAZZ = 59, - STR_DANCING_LATIN = 60, - STR_DANCING_BALLET = 61, - STR_DANCING_STREET = 62, - STR_DANCING_PUBLICSQUARE = 63, - STR_DANCING_ZUMBA = 64, - STR_DANCING_SOCIALDANCE = 65, - STR_DANCING_TAPDANCE = 66, - STR_RECREATIONAL_SPORTS = 67, - STR_RECREATIONAL_SKATING = 68, - STR_RECREATIONAL_MARTIALARTS = 69, - STR_RECREATIONAL_TAICHI = 70, - STR_RECREATIONAL_HULAHOOP = 71, - STR_RECREATIONAL_DISCSPORT = 72, - STR_RECREATIONAL_DARTS = 73, - STR_RECREATIONAL_ARCHERY = 74, - STR_RECREATIONAL_HORSERIDING = 75, - STR_RECREATIONAL_BATTLEGAME = 76, - STR_RECREATIONAL_KITE = 77, - STR_RECREATIONAL_TUGOFWAR = 78, - STR_RECREATIONAL_SWING = 79, - STR_RECREATIONAL_STAIRCLIMBING = 80, - STR_RECREATIONAL_OBSTACLERACE = 81, - STR_RECREATIONAL_FISHING = 82, - STR_RECREATIONAL_HUNTING = 83, - STR_RECREATIONAL_SCOOTERRIDING = 84, - STR_RECREATIONAL_PARAGLIDING = 85, - STR_RECREATIONAL_TEAMSPORTS = 86, - STR_RECREATIONAL_FINESSGAMING = 87, - STR_RECREATIONAL_HIKING = 88, - STR_RECREATIONAL_EQUESTRIANSPORTS = 89, - STR_RECREATIONAL_PLAY = 90, - STR_BALL_GAMES = 91, - STR_BALL_BADMINTON = 92, - STR_BALL_TABLETENNIS = 93, - STR_BALL_TENNIS = 94, - STR_BALL_BILLIARDS = 95, - STR_BALL_BOWLING = 96, - STR_BALL_VOLLEYBALL = 97, - STR_BALL_SHUTTLECOCK = 98, - STR_BALL_HANDBALL = 99, - STR_BALL_BASEBALL = 100, - STR_BALL_SOFTBALL = 101, - STR_BALL_CRICKET = 102, - STR_BALL_FOOTBALL = 103, - STR_BALL_BEACHSOCCER = 104, - STR_BALL_BEACHVOLLEYBALL = 105, - STR_BALL_CROQUET = 106, - STR_BALL_HOCKEY = 107, - STR_BALL_SQUASH = 108, - STR_BALL_SEPAKTAKRAW = 109, - STR_BALL_DODGEBALL = 110, - STR_BALL_BASKETBALL = 111, - STR_BALL_SOCCER = 112, - STR_BALL_GOLF = 113, - STR_BALL_POLO = 114, - STR_BALL_RACQUETBALL = 115, - STR_BALL_RUGBY = 116, - STR_BALL_GATEBALL = 117, - STR_BALL_PICKLEBALL = 118, - STR_BALL_LACROSSE = 119, - STR_WATER_ACTIVITIES = 120, - STR_WATER_SAILING = 121, - STR_WATER_SURFING = 122, - STR_WATER_WHITEWATERRAFTING = 123, - STR_WATER_CANOEING = 124, - STR_WATER_KAYAKING = 125, - STR_WATER_ROWING = 126, - STR_WATER_MOTORBOAT = 127, - STR_WATER_SUP = 128, - STR_WATER_SCUBADIVING = 129, - STR_WATER_DIVING = 130, - STR_WATER_KITESURFING = 131, - STR_WATER_WAKEBOARDING = 132, - STR_WATER_POLO = 133, - STR_WATER_WINDSURFING = 134, - STR_WATER_DRIFTING = 135, - STR_WATER_FITNESS = 136, - STR_WATER_SPORTS = 137, - STR_WATER_OUTDOORSWIM = 138, - STR_WATER_INDOORSWIM = 139, - STR_WATER_SWIMFREESTYLE = 140, - STR_WATER_SWIMBREASTSTROKE = 141, - STR_WATER_SWIMBACKSTROKE = 142, - STR_WATER_SWIMBUTTERFLY = 143, - STR_ICE_SPORTS = 144, - STR_ICE_SKATING = 145, - STR_ICE_HOCKEY = 146, - STR_ICE_CURLING = 147, - STR_ICE_SNOWMOBILING = 148, - STR_ICE_SLED = 149, - STR_ICE_BIATHLON = 150, - STR_ICE_CROSSCOUNTRYSKING = 151, - STR_ICE_SKIING = 152, - STR_ICE_SNOWBOARDING = 153, - STR_ICE_SNOWSHOEING = 154, - STR_ICE_SNOWSPORTS = 155, - STR_EXTREME_SPORTS = 156, - STR_EXTREME_SKATEBOARDING = 157, - STR_EXTREME_ROCKCLIMBING = 158, - STR_EXTREME_BUNGEEJUMPING = 159, - STR_EXTREME_PARKOUR = 160, - STR_EXTREME_BMX = 161, - STR_EXTREME_ORIENTEERING = 162, - STR_EXTREME_PARACHUTE = 163, - STR_EXTREME_RACING = 164, - STR_EXTREME_TRIATHLONS = 165, - STR_OTHER_ELEVATOR = 166, - STR_OTHER_ESCALATOR = 167, - STR_OTHER_GARDENING = 168, - STR_OTHER_HORSEWORK = 169, - STR_OTHER_INVEHICLE = 170, - STR_OTHER_MEDITATION = 171, - STR_OTHER_STILL = 172, - STR_OTHER_TILTING = 173, - STR_OTHER_WHEELCHAIR = 174, - STR_EXERCISE_LIST = 175, - STR_BALL_LIST = 176, - STR_WATER_LIST = 177, - STR_DANCING_LIST = 178, - STR_EXTREME_LIST = 179, - STR_ICE_LIST = 180, - STR_RECREATIONAL_LIST = 181, - STR_OTHER_LIST = 182, - STR_DANCING_TITLE = 183, - STR_BALL_LIST_TITLE = 184, - STR_OTHER_TITLE = 185, - STR_EXERCISE_TITLE = 186, - STR_TRAINING = 187, - STR_LANGUAGE = 188, + STR_EXERCISE_CIRCUIT = 37, + STR_EXERCISE_AEROBICS = 38, + STR_EXERCISE_CALISTHENICE = 39, + STR_EXERCISE_P90X = 40, + STR_EXERCISE_KETTLEBELLTRAINING = 41, + STR_EXERCISE_MIXEDMARTIALARTS = 42, + STR_EXERCISE_STAIRCLIMBINGMACHINE = 43, + STR_EXERCISE_WEIGHTLIFTING = 44, + STR_EXERCISE_BARRE = 45, + STR_EXERCISE_HANDCYCLING = 46, + STR_EXERCISE_TRACKFIELD = 47, + STR_EXERCISE_WRESTLING = 48, + STR_EXERCISE_MINDBODY = 49, + STR_EXERCISE_FLEXIBILITY = 50, + STR_EXERCISE_MIXEDCARDIO = 51, + STR_EXERCISE_TRADITIONALSTRENGTHTRAINING = 52, + STR_EXERCISE_CROSSTRAINING = 53, + STR_EXERCISE_GYMNASTICS = 54, + STR_EXERCISE_STEPTRAINING = 55, + STR_EXERCISE_ELLIPTICALTRAINER = 56, + STR_EXERCISE_ROWINGMACHINE = 57, + STR_DANCING_GENERAL = 58, + STR_DANCING_BELLY = 59, + STR_DANCING_JAZZ = 60, + STR_DANCING_LATIN = 61, + STR_DANCING_BALLET = 62, + STR_DANCING_STREET = 63, + STR_DANCING_PUBLICSQUARE = 64, + STR_DANCING_ZUMBA = 65, + STR_DANCING_SOCIALDANCE = 66, + STR_DANCING_TAPDANCE = 67, + STR_RECREATIONAL_SPORTS = 68, + STR_RECREATIONAL_SKATING = 69, + STR_RECREATIONAL_MARTIALARTS = 70, + STR_RECREATIONAL_TAICHI = 71, + STR_RECREATIONAL_HULAHOOP = 72, + STR_RECREATIONAL_DISCSPORT = 73, + STR_RECREATIONAL_DARTS = 74, + STR_RECREATIONAL_ARCHERY = 75, + STR_RECREATIONAL_HORSERIDING = 76, + STR_RECREATIONAL_BATTLEGAME = 77, + STR_RECREATIONAL_KITE = 78, + STR_RECREATIONAL_TUGOFWAR = 79, + STR_RECREATIONAL_SWING = 80, + STR_RECREATIONAL_STAIRCLIMBING = 81, + STR_RECREATIONAL_OBSTACLERACE = 82, + STR_RECREATIONAL_FISHING = 83, + STR_RECREATIONAL_HUNTING = 84, + STR_RECREATIONAL_SCOOTERRIDING = 85, + STR_RECREATIONAL_PARAGLIDING = 86, + STR_RECREATIONAL_TEAMSPORTS = 87, + STR_RECREATIONAL_FINESSGAMING = 88, + STR_RECREATIONAL_HIKING = 89, + STR_RECREATIONAL_EQUESTRIANSPORTS = 90, + STR_RECREATIONAL_PLAY = 91, + STR_BALL_GAMES = 92, + STR_BALL_BADMINTON = 93, + STR_BALL_TABLETENNIS = 94, + STR_BALL_TENNIS = 95, + STR_BALL_BILLIARDS = 96, + STR_BALL_BOWLING = 97, + STR_BALL_VOLLEYBALL = 98, + STR_BALL_SHUTTLECOCK = 99, + STR_BALL_HANDBALL = 100, + STR_BALL_BASEBALL = 101, + STR_BALL_SOFTBALL = 102, + STR_BALL_CRICKET = 103, + STR_BALL_FOOTBALL = 104, + STR_BALL_BEACHSOCCER = 105, + STR_BALL_BEACHVOLLEYBALL = 106, + STR_BALL_CROQUET = 107, + STR_BALL_HOCKEY = 108, + STR_BALL_SQUASH = 109, + STR_BALL_SEPAKTAKRAW = 110, + STR_BALL_DODGEBALL = 111, + STR_BALL_BASKETBALL = 112, + STR_BALL_SOCCER = 113, + STR_BALL_GOLF = 114, + STR_BALL_POLO = 115, + STR_BALL_RACQUETBALL = 116, + STR_BALL_RUGBY = 117, + STR_BALL_GATEBALL = 118, + STR_BALL_PICKLEBALL = 119, + STR_BALL_LACROSSE = 120, + STR_WATER_ACTIVITIES = 121, + STR_WATER_SAILING = 122, + STR_WATER_SURFING = 123, + STR_WATER_WHITEWATERRAFTING = 124, + STR_WATER_CANOEING = 125, + STR_WATER_KAYAKING = 126, + STR_WATER_ROWING = 127, + STR_WATER_MOTORBOAT = 128, + STR_WATER_SUP = 129, + STR_WATER_SCUBADIVING = 130, + STR_WATER_DIVING = 131, + STR_WATER_KITESURFING = 132, + STR_WATER_WAKEBOARDING = 133, + STR_WATER_POLO = 134, + STR_WATER_WINDSURFING = 135, + STR_WATER_DRIFTING = 136, + STR_WATER_FITNESS = 137, + STR_WATER_SPORTS = 138, + STR_WATER_OUTDOORSWIM = 139, + STR_WATER_INDOORSWIM = 140, + STR_WATER_SWIMFREESTYLE = 141, + STR_WATER_SWIMBREASTSTROKE = 142, + STR_WATER_SWIMBACKSTROKE = 143, + STR_WATER_SWIMBUTTERFLY = 144, + STR_ICE_SPORTS = 145, + STR_ICE_SKATING = 146, + STR_ICE_HOCKEY = 147, + STR_ICE_CURLING = 148, + STR_ICE_SNOWMOBILING = 149, + STR_ICE_SLED = 150, + STR_ICE_BIATHLON = 151, + STR_ICE_CROSSCOUNTRYSKING = 152, + STR_ICE_SKIING = 153, + STR_ICE_SNOWBOARDING = 154, + STR_ICE_SNOWSHOEING = 155, + STR_ICE_SNOWSPORTS = 156, + STR_EXTREME_SPORTS = 157, + STR_EXTREME_SKATEBOARDING = 158, + STR_EXTREME_ROCKCLIMBING = 159, + STR_EXTREME_BUNGEEJUMPING = 160, + STR_EXTREME_PARKOUR = 161, + STR_EXTREME_BMX = 162, + STR_EXTREME_ORIENTEERING = 163, + STR_EXTREME_PARACHUTE = 164, + STR_EXTREME_RACING = 165, + STR_EXTREME_TRIATHLONS = 166, + STR_OTHER_ELEVATOR = 167, + STR_OTHER_ESCALATOR = 168, + STR_OTHER_GARDENING = 169, + STR_OTHER_HORSEWORK = 170, + STR_OTHER_INVEHICLE = 171, + STR_OTHER_MEDITATION = 172, + STR_OTHER_STILL = 173, + STR_OTHER_TILTING = 174, + STR_OTHER_WHEELCHAIR = 175, + STR_EXERCISE_LIST = 176, + STR_BALL_LIST = 177, + STR_WATER_LIST = 178, + STR_DANCING_LIST = 179, + STR_EXTREME_LIST = 180, + STR_ICE_LIST = 181, + STR_RECREATIONAL_LIST = 182, + STR_OTHER_LIST = 183, + STR_DANCING_TITLE = 184, + STR_BALL_LIST_TITLE = 185, + STR_OTHER_TITLE = 186, + STR_EXERCISE_TITLE = 187, + STR_TRAINING = 188, STR_RAPID_TRAINING = 189, STR_SET_GOALS = 190, STR_DURATION = 191, 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 4360731cc..68dfe8412 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/language/src/LanguageSwitchPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp index 50a757f37..ba1114321 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp @@ -114,7 +114,7 @@ namespace OHOS else { g_planguage->ChangeLanguage(p_LanguageSwitchModel->GetCurLanguageCode()); - m_labelext->SetTextId(STR_LANGUAGE); + //m_labelext->SetTextId(STR_LANGUAGE); m_labelext->ForceResetText(); // 强制刷新 p_UILabelButtonExt->SetImageSrc(SelectedImg, SelectedImg); diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp index 55dcc12fc..6c0b5116a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp @@ -94,7 +94,7 @@ namespace OHOS LanguageSwitchViewTitleLabel->SetStyle(STYLE_TEXT_FONT, TITLE_LABEL_TEXT_FONT); LanguageSwitchViewTitleLabel->SetStyle(STYLE_LINE_HEIGHT, TITLE_LABEL_LINE_HEIGHT); // LanguageSwitchViewTitleLabel->SetText("语言"); - LanguageSwitchViewTitleLabel->SetTextId(STR_LANGUAGE); + // LanguageSwitchViewTitleLabel->SetTextId(STR_LANGUAGE); LanguageSwitchViewTitleLabel->SetLineBreakMode(UILabel::LINE_BREAK_MARQUEE); LanguageSwitchViewTitleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); LanguageSwitchViewTitleLabel->SetRollSpeed(TITLE_LABEL_TEXT_ROLLSPEED); 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 21590c0a7..eb86b43d6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h @@ -67,6 +67,7 @@ namespace OHOS bool InitLabel(UILabelExt *&label, int left, int top, int width, int height, const char *viewId, const char *text, const char *fontName, int fontSize); bool InitLabelExt(UILabelExt *&label, int left, int top, int width, int height, const char *viewId, UIResourceTextId id, const char *fontName, int fontSize); bool InitButton(UIButton *&button, int left, int top, int width, int height, const char *viewId); + bool InitButtonExt(UILabelButtonExt *&button, int left, int top, int width, int height, const char *viewId, UIResourceTextId id, int fontSize); bool InitImageView(UIImageView *&imageView, int left, int top, int width, int height, const char *viewId, const char *imagePath); void InitList(); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h index 07c0fb79a..ae995acea 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h @@ -41,7 +41,7 @@ namespace OHOS void OnStop() override; void InitView(); void DeInit(); - + void InitList(); void PreLoad(void); @@ -51,10 +51,9 @@ namespace OHOS TraingNomalView &operator=(TraingNomalView &&) = delete; UIViewGroup *container_ = nullptr; - UILabelExt *label1_ = nullptr; - UILabelExt *label2_ = nullptr; - UIButton *button1_ = nullptr; - UIButton *button2_ = nullptr; + UILabelExt *sporttitle_ = nullptr; + UIButton *buttonGo_ = nullptr; + UILabelButtonExt *buttonSet_ = nullptr; bool viewiInitStatus{false}; }; } // namespace OHOS diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp index 07496416b..584fde2a6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -189,7 +189,32 @@ namespace OHOS // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::InitButton is succeed"); return true; } + bool TraingModel::InitButtonExt(UILabelButtonExt *&button, int left, int top, int width, int height, const char *viewId, UIResourceTextId id, int fontSize) + { + // 创建新按钮（如果当前按钮为空） + if (button == nullptr) + { + button = new UILabelButtonExt(); + } + if (button == nullptr) + { + return false; // 内存分配失败，返回false + } + button->SetPosition(left, top); + button->Resize(width, height); + button->SetViewId(viewId); + button->SetTextId(id); + + button->SetStyle(STYLE_TEXT_FONT, fontSize); + button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, fontSize); + button->SetStyle(STYLE_BACKGROUND_COLOR, DEFAULT_BACKGROUND_COLOR); + button->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BACKGROUND_COLOR, UIButton::PRESSED); + button->SetStyleForState(STYLE_BORDER_COLOR, PRESSED_BORDER_COLOR, UIButton::PRESSED); + button->SetVisible(true); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::InitButton is succeed"); + return true; + } /*** * @description: * @param {UIImageView} * 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 131c57e61..95f635b88 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp @@ -3,7 +3,7 @@ #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 @@ -32,7 +32,7 @@ namespace OHOS return g_pTraingNomalView; } - + /* InitView:初始化界面*/ void TraingNomalView ::InitView() { @@ -43,44 +43,42 @@ namespace OHOS container_->SetStyle(STYLE_BACKGROUND_OPA, 0); } - UIResourceTextId sport_id = TraingModel::GetInstance()->GetSportEvent(); + UIResourceTextId sport_id = TraingModel::GetInstance()->GetSportEvent(); // 初始化Lable - TraingModel::GetInstance()->InitLabelExt(label1_, 137, 52, 195, 35, "label1", sport_id, DEFAULT_VECTOR_FONT_FILENAME, 30); - container_->Add(label1_); - TraingModel::GetInstance()->InitLabel(label2_, 160, 370, 146, 35, "label2", "设定目标 >", DEFAULT_VECTOR_FONT_FILENAME, 30); - container_->Add(label2_); + TraingModel::GetInstance()->InitLabelExt(sporttitle_, 137, 52, 200, 200, "label1", sport_id, DEFAULT_VECTOR_FONT_FILENAME, 30); + container_->Add(sporttitle_); // 初始化Button - TraingModel::GetInstance()->InitButton(button1_, 133, 133, 200, 200, BUTTONGO); + TraingModel::GetInstance()->InitButton(buttonGo_, 133, 133, 200, 200, BUTTONGO); // Set additional property - button1_->SetImageSrc(GO_1_IMAGE, nullptr); + buttonGo_->SetImageSrc(GO_1_IMAGE, nullptr); - TraingModel::GetInstance()->InitButton(button2_, 160, 370, 146, 35, BUTTONSET); - button2_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);//设置为透明按键 - button2_->SetStyle(STYLE_BACKGROUND_OPA, 0x00); - button2_->SetStyleForState(STYLE_BACKGROUND_OPA, 0x80, UIButton::PRESSED); // 设置按下时的透明度为半透明 + TraingModel::GetInstance()->InitButtonExt(buttonSet_, 160, 370, 150, 50, BUTTONSET, STR_SET_GOALS, 30); + buttonSet_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); // 设置为透明按键 + buttonSet_->SetStyle(STYLE_BACKGROUND_OPA, 0x00); + buttonSet_->SetStyleForState(STYLE_BACKGROUND_OPA, 0x80, UIButton::PRESSED); // 设置按下时的透明度为半透明 - button1_->SetOnClickListener(static_cast(TraingNomalPresenter::GetInstance())); - button2_->SetOnClickListener(static_cast(TraingNomalPresenter::GetInstance())); - container_->Add(button1_); - container_->Add(button2_); + buttonGo_->SetOnClickListener(static_cast(TraingNomalPresenter::GetInstance())); + buttonSet_->SetOnClickListener(static_cast(TraingNomalPresenter::GetInstance())); + container_->Add(buttonGo_); + container_->Add(buttonSet_); } /* DeInit：删除组件*/ void TraingNomalView::DeInit() { - if (label1_ != nullptr) + if (sporttitle_ != nullptr) { - delete label1_; - label1_ = nullptr; + delete sporttitle_; + sporttitle_ = nullptr; } - if (button1_ != nullptr) + if (buttonGo_ != nullptr) { - delete button1_; - button1_ = nullptr; + delete buttonGo_; + buttonGo_ = nullptr; } - if (button2_ != nullptr) + if (buttonSet_ != nullptr) { - delete button2_; - button2_ = nullptr; + delete buttonSet_; + buttonSet_ = nullptr; } if (container_ != nullptr) { 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 c39389a68..544ca6141 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp @@ -14,7 +14,7 @@ namespace OHOS { - + static QuickTraining *data = new QuickTraining; bool TraingOnClickListener::OnClick(UIView &view, const ClickEvent &event) { UNUSED(event); @@ -28,14 +28,17 @@ namespace OHOS if (strcmp(view.GetViewId(), BUTTON1) == 0) { NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + TraingModel::GetInstance()->SetSportEvent(data->training1_Text); } if (strcmp(view.GetViewId(), BUTTON2) == 0) { NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + TraingModel::GetInstance()->SetSportEvent(data->training2_Text); } if (strcmp(view.GetViewId(), BUTTON3) == 0) { NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL); + TraingModel::GetInstance()->SetSportEvent(data->training3_Text); } if (strcmp(view.GetViewId(), BUTTONMORE) == 0) { 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 e9f0264a9..d25d5e15c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp @@ -17,16 +17,16 @@ namespace OHOS { - static Training_CardView *g_pTraining_CardView{nullptr}; - static QuickTraining *data = new QuickTraining; + static Training_CardView *g_pTraining_CardView{nullptr}; + QuickTraining *data = new QuickTraining; Training_CardView::Training_CardView() { -WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::Training_CardView"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::Training_CardView"); SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION); g_pTraining_CardView = this; data = TraingModel::GetInstance()->GetQuickTraining(); - } + } Training_CardView::~Training_CardView() { @@ -41,9 +41,9 @@ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::Training_CardView"); { return g_pTraining_CardView; } -bool Training_CardView::InitLable() + bool Training_CardView::InitLable() { - // 初始化标签 + // 初始化标签 TraingModel::GetInstance()->InitLabelExt(titleLabel, 130, 52, 200, 60, "title_label", STR_RAPID_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30); Add(titleLabel); return true; @@ -132,16 +132,16 @@ bool Training_CardView::InitLable() return true; } - + bool Training_CardView::InitImage() { struct ImageInfo { UIImageView *image; - const int imagePath; + const int imagePath; uint16_t posX; uint16_t posY; - const char *viewId; + const char *viewId; }; ImageInfo images[] = { @@ -168,7 +168,7 @@ bool Training_CardView::InitLable() return true; } -/* -------------------------------------------------------------------------- */ + /* -------------------------------------------------------------------------- */ bool Training_CardView::InitView() { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::InitView()"); @@ -187,30 +187,30 @@ bool Training_CardView::InitLable() // SetCoverable(true); return true; } - + void Training_CardView::DeInit() - { - UIImageView *imageViews[] = {image1, image2, image3}; + { + UIImageView *imageViews[] = {image1, image2, image3}; UIButton *buttons[] = {ButtonMore, Button1, Button3, Button2}; for (auto &imageView : imageViews) { if (imageView != nullptr) - { - delete imageView; + { + delete imageView; imageView = nullptr; - } + } } for (auto &button : buttons) { if (button != nullptr) - { - delete button; + { + delete button; button = nullptr; -} + } } - + if (titleLabel != nullptr) { delete titleLabel; @@ -225,7 +225,7 @@ bool Training_CardView::InitLable() InitView(); viewiInitStatus = true; } - // if (!resLoadStatus) + // if (!resLoadStatus) // { // resLoadStatus = true; // } @@ -233,7 +233,7 @@ bool Training_CardView::InitLable() void Training_CardView::UnLoad(void) { -// if (resLoadStatus) + // if (resLoadStatus) // { // //ImageCacheManager::GetInstance().UnloadAllInMultiRes(TRAINING_IAMGES); // resLoadStatus = false; 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 index a61b10894..bd25ae2c5 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang 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 index bd78e0587..62f10104b 100644 --- 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 @@ -47,158 +47,158 @@ enum UIResourceTextId : uint16_t { STR_EXERCISE_KENDO = 34, STR_EXERCISE_HORIZONTALBAR = 35, STR_EXERCISE_PARALLELBARS = 36, - STR_EXERCISE_AEROBICS = 37, - STR_EXERCISE_CALISTHENICE = 38, - STR_EXERCISE_P90X = 39, - STR_EXERCISE_KETTLEBELLTRAINING = 40, - STR_EXERCISE_MIXEDMARTIALARTS = 41, - STR_EXERCISE_STAIRCLIMBINGMACHINE = 42, - STR_EXERCISE_WEIGHTLIFTING = 43, - STR_EXERCISE_BARRE = 44, - STR_EXERCISE_HANDCYCLING = 45, - STR_EXERCISE_TRACKFIELD = 46, - STR_EXERCISE_WRESTLING = 47, - STR_EXERCISE_MINDBODY = 48, - STR_EXERCISE_FLEXIBILITY = 49, - STR_EXERCISE_MIXEDCARDIO = 50, - STR_EXERCISE_TRADITIONALSTRENGTHTRAINING = 51, - STR_EXERCISE_CROSSTRAINING = 52, - STR_EXERCISE_GYMNASTICS = 53, - STR_EXERCISE_STEPTRAINING = 54, - STR_EXERCISE_ELLIPTICALTRAINER = 55, - STR_EXERCISE_ROWINGMACHINE = 56, - STR_DANCING_GENERAL = 57, - STR_DANCING_BELLY = 58, - STR_DANCING_JAZZ = 59, - STR_DANCING_LATIN = 60, - STR_DANCING_BALLET = 61, - STR_DANCING_STREET = 62, - STR_DANCING_PUBLICSQUARE = 63, - STR_DANCING_ZUMBA = 64, - STR_DANCING_SOCIALDANCE = 65, - STR_DANCING_TAPDANCE = 66, - STR_RECREATIONAL_SPORTS = 67, - STR_RECREATIONAL_SKATING = 68, - STR_RECREATIONAL_MARTIALARTS = 69, - STR_RECREATIONAL_TAICHI = 70, - STR_RECREATIONAL_HULAHOOP = 71, - STR_RECREATIONAL_DISCSPORT = 72, - STR_RECREATIONAL_DARTS = 73, - STR_RECREATIONAL_ARCHERY = 74, - STR_RECREATIONAL_HORSERIDING = 75, - STR_RECREATIONAL_BATTLEGAME = 76, - STR_RECREATIONAL_KITE = 77, - STR_RECREATIONAL_TUGOFWAR = 78, - STR_RECREATIONAL_SWING = 79, - STR_RECREATIONAL_STAIRCLIMBING = 80, - STR_RECREATIONAL_OBSTACLERACE = 81, - STR_RECREATIONAL_FISHING = 82, - STR_RECREATIONAL_HUNTING = 83, - STR_RECREATIONAL_SCOOTERRIDING = 84, - STR_RECREATIONAL_PARAGLIDING = 85, - STR_RECREATIONAL_TEAMSPORTS = 86, - STR_RECREATIONAL_FINESSGAMING = 87, - STR_RECREATIONAL_HIKING = 88, - STR_RECREATIONAL_EQUESTRIANSPORTS = 89, - STR_RECREATIONAL_PLAY = 90, - STR_BALL_GAMES = 91, - STR_BALL_BADMINTON = 92, - STR_BALL_TABLETENNIS = 93, - STR_BALL_TENNIS = 94, - STR_BALL_BILLIARDS = 95, - STR_BALL_BOWLING = 96, - STR_BALL_VOLLEYBALL = 97, - STR_BALL_SHUTTLECOCK = 98, - STR_BALL_HANDBALL = 99, - STR_BALL_BASEBALL = 100, - STR_BALL_SOFTBALL = 101, - STR_BALL_CRICKET = 102, - STR_BALL_FOOTBALL = 103, - STR_BALL_BEACHSOCCER = 104, - STR_BALL_BEACHVOLLEYBALL = 105, - STR_BALL_CROQUET = 106, - STR_BALL_HOCKEY = 107, - STR_BALL_SQUASH = 108, - STR_BALL_SEPAKTAKRAW = 109, - STR_BALL_DODGEBALL = 110, - STR_BALL_BASKETBALL = 111, - STR_BALL_SOCCER = 112, - STR_BALL_GOLF = 113, - STR_BALL_POLO = 114, - STR_BALL_RACQUETBALL = 115, - STR_BALL_RUGBY = 116, - STR_BALL_GATEBALL = 117, - STR_BALL_PICKLEBALL = 118, - STR_BALL_LACROSSE = 119, - STR_WATER_ACTIVITIES = 120, - STR_WATER_SAILING = 121, - STR_WATER_SURFING = 122, - STR_WATER_WHITEWATERRAFTING = 123, - STR_WATER_CANOEING = 124, - STR_WATER_KAYAKING = 125, - STR_WATER_ROWING = 126, - STR_WATER_MOTORBOAT = 127, - STR_WATER_SUP = 128, - STR_WATER_SCUBADIVING = 129, - STR_WATER_DIVING = 130, - STR_WATER_KITESURFING = 131, - STR_WATER_WAKEBOARDING = 132, - STR_WATER_POLO = 133, - STR_WATER_WINDSURFING = 134, - STR_WATER_DRIFTING = 135, - STR_WATER_FITNESS = 136, - STR_WATER_SPORTS = 137, - STR_WATER_OUTDOORSWIM = 138, - STR_WATER_INDOORSWIM = 139, - STR_WATER_SWIMFREESTYLE = 140, - STR_WATER_SWIMBREASTSTROKE = 141, - STR_WATER_SWIMBACKSTROKE = 142, - STR_WATER_SWIMBUTTERFLY = 143, - STR_ICE_SPORTS = 144, - STR_ICE_SKATING = 145, - STR_ICE_HOCKEY = 146, - STR_ICE_CURLING = 147, - STR_ICE_SNOWMOBILING = 148, - STR_ICE_SLED = 149, - STR_ICE_BIATHLON = 150, - STR_ICE_CROSSCOUNTRYSKING = 151, - STR_ICE_SKIING = 152, - STR_ICE_SNOWBOARDING = 153, - STR_ICE_SNOWSHOEING = 154, - STR_ICE_SNOWSPORTS = 155, - STR_EXTREME_SPORTS = 156, - STR_EXTREME_SKATEBOARDING = 157, - STR_EXTREME_ROCKCLIMBING = 158, - STR_EXTREME_BUNGEEJUMPING = 159, - STR_EXTREME_PARKOUR = 160, - STR_EXTREME_BMX = 161, - STR_EXTREME_ORIENTEERING = 162, - STR_EXTREME_PARACHUTE = 163, - STR_EXTREME_RACING = 164, - STR_EXTREME_TRIATHLONS = 165, - STR_OTHER_ELEVATOR = 166, - STR_OTHER_ESCALATOR = 167, - STR_OTHER_GARDENING = 168, - STR_OTHER_HORSEWORK = 169, - STR_OTHER_INVEHICLE = 170, - STR_OTHER_MEDITATION = 171, - STR_OTHER_STILL = 172, - STR_OTHER_TILTING = 173, - STR_OTHER_WHEELCHAIR = 174, - STR_EXERCISE_LIST = 175, - STR_BALL_LIST = 176, - STR_WATER_LIST = 177, - STR_DANCING_LIST = 178, - STR_EXTREME_LIST = 179, - STR_ICE_LIST = 180, - STR_RECREATIONAL_LIST = 181, - STR_OTHER_LIST = 182, - STR_DANCING_TITLE = 183, - STR_BALL_LIST_TITLE = 184, - STR_OTHER_TITLE = 185, - STR_EXERCISE_TITLE = 186, - STR_TRAINING = 187, - STR_LANGUAGE = 188, + STR_EXERCISE_CIRCUIT = 37, + STR_EXERCISE_AEROBICS = 38, + STR_EXERCISE_CALISTHENICE = 39, + STR_EXERCISE_P90X = 40, + STR_EXERCISE_KETTLEBELLTRAINING = 41, + STR_EXERCISE_MIXEDMARTIALARTS = 42, + STR_EXERCISE_STAIRCLIMBINGMACHINE = 43, + STR_EXERCISE_WEIGHTLIFTING = 44, + STR_EXERCISE_BARRE = 45, + STR_EXERCISE_HANDCYCLING = 46, + STR_EXERCISE_TRACKFIELD = 47, + STR_EXERCISE_WRESTLING = 48, + STR_EXERCISE_MINDBODY = 49, + STR_EXERCISE_FLEXIBILITY = 50, + STR_EXERCISE_MIXEDCARDIO = 51, + STR_EXERCISE_TRADITIONALSTRENGTHTRAINING = 52, + STR_EXERCISE_CROSSTRAINING = 53, + STR_EXERCISE_GYMNASTICS = 54, + STR_EXERCISE_STEPTRAINING = 55, + STR_EXERCISE_ELLIPTICALTRAINER = 56, + STR_EXERCISE_ROWINGMACHINE = 57, + STR_DANCING_GENERAL = 58, + STR_DANCING_BELLY = 59, + STR_DANCING_JAZZ = 60, + STR_DANCING_LATIN = 61, + STR_DANCING_BALLET = 62, + STR_DANCING_STREET = 63, + STR_DANCING_PUBLICSQUARE = 64, + STR_DANCING_ZUMBA = 65, + STR_DANCING_SOCIALDANCE = 66, + STR_DANCING_TAPDANCE = 67, + STR_RECREATIONAL_SPORTS = 68, + STR_RECREATIONAL_SKATING = 69, + STR_RECREATIONAL_MARTIALARTS = 70, + STR_RECREATIONAL_TAICHI = 71, + STR_RECREATIONAL_HULAHOOP = 72, + STR_RECREATIONAL_DISCSPORT = 73, + STR_RECREATIONAL_DARTS = 74, + STR_RECREATIONAL_ARCHERY = 75, + STR_RECREATIONAL_HORSERIDING = 76, + STR_RECREATIONAL_BATTLEGAME = 77, + STR_RECREATIONAL_KITE = 78, + STR_RECREATIONAL_TUGOFWAR = 79, + STR_RECREATIONAL_SWING = 80, + STR_RECREATIONAL_STAIRCLIMBING = 81, + STR_RECREATIONAL_OBSTACLERACE = 82, + STR_RECREATIONAL_FISHING = 83, + STR_RECREATIONAL_HUNTING = 84, + STR_RECREATIONAL_SCOOTERRIDING = 85, + STR_RECREATIONAL_PARAGLIDING = 86, + STR_RECREATIONAL_TEAMSPORTS = 87, + STR_RECREATIONAL_FINESSGAMING = 88, + STR_RECREATIONAL_HIKING = 89, + STR_RECREATIONAL_EQUESTRIANSPORTS = 90, + STR_RECREATIONAL_PLAY = 91, + STR_BALL_GAMES = 92, + STR_BALL_BADMINTON = 93, + STR_BALL_TABLETENNIS = 94, + STR_BALL_TENNIS = 95, + STR_BALL_BILLIARDS = 96, + STR_BALL_BOWLING = 97, + STR_BALL_VOLLEYBALL = 98, + STR_BALL_SHUTTLECOCK = 99, + STR_BALL_HANDBALL = 100, + STR_BALL_BASEBALL = 101, + STR_BALL_SOFTBALL = 102, + STR_BALL_CRICKET = 103, + STR_BALL_FOOTBALL = 104, + STR_BALL_BEACHSOCCER = 105, + STR_BALL_BEACHVOLLEYBALL = 106, + STR_BALL_CROQUET = 107, + STR_BALL_HOCKEY = 108, + STR_BALL_SQUASH = 109, + STR_BALL_SEPAKTAKRAW = 110, + STR_BALL_DODGEBALL = 111, + STR_BALL_BASKETBALL = 112, + STR_BALL_SOCCER = 113, + STR_BALL_GOLF = 114, + STR_BALL_POLO = 115, + STR_BALL_RACQUETBALL = 116, + STR_BALL_RUGBY = 117, + STR_BALL_GATEBALL = 118, + STR_BALL_PICKLEBALL = 119, + STR_BALL_LACROSSE = 120, + STR_WATER_ACTIVITIES = 121, + STR_WATER_SAILING = 122, + STR_WATER_SURFING = 123, + STR_WATER_WHITEWATERRAFTING = 124, + STR_WATER_CANOEING = 125, + STR_WATER_KAYAKING = 126, + STR_WATER_ROWING = 127, + STR_WATER_MOTORBOAT = 128, + STR_WATER_SUP = 129, + STR_WATER_SCUBADIVING = 130, + STR_WATER_DIVING = 131, + STR_WATER_KITESURFING = 132, + STR_WATER_WAKEBOARDING = 133, + STR_WATER_POLO = 134, + STR_WATER_WINDSURFING = 135, + STR_WATER_DRIFTING = 136, + STR_WATER_FITNESS = 137, + STR_WATER_SPORTS = 138, + STR_WATER_OUTDOORSWIM = 139, + STR_WATER_INDOORSWIM = 140, + STR_WATER_SWIMFREESTYLE = 141, + STR_WATER_SWIMBREASTSTROKE = 142, + STR_WATER_SWIMBACKSTROKE = 143, + STR_WATER_SWIMBUTTERFLY = 144, + STR_ICE_SPORTS = 145, + STR_ICE_SKATING = 146, + STR_ICE_HOCKEY = 147, + STR_ICE_CURLING = 148, + STR_ICE_SNOWMOBILING = 149, + STR_ICE_SLED = 150, + STR_ICE_BIATHLON = 151, + STR_ICE_CROSSCOUNTRYSKING = 152, + STR_ICE_SKIING = 153, + STR_ICE_SNOWBOARDING = 154, + STR_ICE_SNOWSHOEING = 155, + STR_ICE_SNOWSPORTS = 156, + STR_EXTREME_SPORTS = 157, + STR_EXTREME_SKATEBOARDING = 158, + STR_EXTREME_ROCKCLIMBING = 159, + STR_EXTREME_BUNGEEJUMPING = 160, + STR_EXTREME_PARKOUR = 161, + STR_EXTREME_BMX = 162, + STR_EXTREME_ORIENTEERING = 163, + STR_EXTREME_PARACHUTE = 164, + STR_EXTREME_RACING = 165, + STR_EXTREME_TRIATHLONS = 166, + STR_OTHER_ELEVATOR = 167, + STR_OTHER_ESCALATOR = 168, + STR_OTHER_GARDENING = 169, + STR_OTHER_HORSEWORK = 170, + STR_OTHER_INVEHICLE = 171, + STR_OTHER_MEDITATION = 172, + STR_OTHER_STILL = 173, + STR_OTHER_TILTING = 174, + STR_OTHER_WHEELCHAIR = 175, + STR_EXERCISE_LIST = 176, + STR_BALL_LIST = 177, + STR_WATER_LIST = 178, + STR_DANCING_LIST = 179, + STR_EXTREME_LIST = 180, + STR_ICE_LIST = 181, + STR_RECREATIONAL_LIST = 182, + STR_OTHER_LIST = 183, + STR_DANCING_TITLE = 184, + STR_BALL_LIST_TITLE = 185, + STR_OTHER_TITLE = 186, + STR_EXERCISE_TITLE = 187, + STR_TRAINING = 188, STR_RAPID_TRAINING = 189, STR_SET_GOALS = 190, STR_DURATION = 191, 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 index 4360731cc..68dfe8412 100644 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang differ