优化训练开始界面
authorCaisking <3449750381@qq.com>
Mon, 1 Apr 2024 12:44:23 +0000 (20:44 +0800)
committerCaisking <3449750381@qq.com>
Mon, 1 Apr 2024 12:44:23 +0000 (20:44 +0800)
18 files changed:
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_en.txt
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/input_list_zh.txt
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_en.xml
code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/language_zh.xml
code/sdk/application/wearable/fd230app/nativeui/language/font/en.lang
code/sdk/application/wearable/fd230app/nativeui/language/font/ui_resource_string.h
code/sdk/application/wearable/fd230app/nativeui/language/font/zh.lang
code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/language/src/LanguageSwitchView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingNomalView.h
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang

index 1932217..53d9d99 100644 (file)
@@ -19,7 +19,7 @@ STR_EXERCISE_OUTDOORWALKING$Walk
 STR_EXERCISE_OUTDOORRUNNING$Run\r
 STR_EXERCISE_INDOORWALKING$Indoor walking\r
 STR_EXERCISE_INDOORRUNNING$Indoor running\r
-STR_EXERCISE_OUTDOORBIKING$Biking\r
+STR_EXERCISE_OUTDOORBIKING$ Biking\r
 STR_EXERCISE_JUMPINGROPE$Jumping rope\r
 STR_EXERCISE_PILATES$Pilates\r
 STR_EXERCISE_CROSS_FIT$Cross fit\r
@@ -35,7 +35,7 @@ STR_EXERCISE_BODYCOMBAT$Body Combat
 STR_EXERCISE_KENDO$Kendo\r
 STR_EXERCISE_HORIZONTALBAR$Horizontal bar\r
 STR_EXERCISE_PARALLELBARS$Parallel bars\r
-STR_EXERCISE_CROSSFIT$Circuit training\r
+STR_EXERCISE_CIRCUIT$Circuit training\r
 STR_EXERCISE_AEROBICS$Aerobics\r
 STR_EXERCISE_CALISTHENICE$Calisthenice\r
 STR_EXERCISE_P90X$P90X\r
@@ -187,9 +187,8 @@ STR_BALL_LIST_TITLE$Ball Sport
 STR_OTHER_TITLE$Other Sport\r
 STR_EXERCISE_TITLE$Exercise Sport\r
 STR_TRAINING$Training\r
-STR_LANGUAGE$Language\r
 STR_RAPID_TRAINING$Rapid training\r
-STR_SET_GOALS$Set goals\r
+STR_SET_GOALS$Set goals >\r
 STR_DURATION$duration\r
 STR_DURATION_SETTING$Duration setting\r
 STR_MINUTES$minutes\r
@@ -213,14 +212,14 @@ STR_MEDIUM_STRENGTH$Medium strength
 STR_HIGH_STRENGTH$High strength\r
 STR_ULTRA_HIGH_STRENGTH$Ultra-high strength\r
 STR_TRAINING_INTENSITY$Training intensity\r
-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.\r
-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\r
+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.\r
+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\r
 STR_TRAINING_STATE_MEANING$The meaning of the training state\r
 STR_WARM_UP_EXERCISE$Warm-up exercise\r
 STR_FAT_BURNING_ZONE$Fat-burning zone\r
 STR_IMPROVE_CARDIOPULMONARY_FUNCTION$Improve cardiopulmonary function\r
 STR_PROFESSIONAL_ATHLETE$Professional athlete\r
-STR_TRAINING_INTENSITY_NOTE$Note: This training intensity is not a professional sports assessment$ and the data is for reference only\r
+STR_TRAINING_INTENSITY_NOTE$Note: This training intensity is not a professional sports assessment, and the data is for reference only\r
 STR_TRAINING_IN_PROGRESS$Training in progress\r
 STR_BREAK_TRAINING$Break training\r
 STR_FINISH$finish\r
index 7e7a845..d51ffc1 100644 (file)
@@ -35,7 +35,7 @@ STR_EXERCISE_BODYCOMBAT$拳击有氧
 STR_EXERCISE_KENDO$剑道\r
 STR_EXERCISE_HORIZONTALBAR$单杠\r
 STR_EXERCISE_PARALLELBARS$双杠\r
-STR_EXERCISE_CROSSFIT$循环训练\r
+STR_EXERCISE_CIRCUIT$循环训练\r
 STR_EXERCISE_AEROBICS$有氧运动\r
 STR_EXERCISE_CALISTHENICE$健美操\r
 STR_EXERCISE_P90X$P90X\r
@@ -187,9 +187,8 @@ STR_BALL_LIST_TITLE$球类运动
 STR_OTHER_TITLE$其他运动\r
 STR_EXERCISE_TITLE$健身运动\r
 STR_TRAINING$训练\r
-STR_LANGUAGE$语言\r
 STR_RAPID_TRAINING$快速训练\r
-STR_SET_GOALS$设置目标\r
+STR_SET_GOALS$设置目标 >\r
 STR_DURATION$时长\r
 STR_DURATION_SETTING$时长设定\r
 STR_MINUTES$分钟\r
@@ -230,7 +229,7 @@ STR_GOAL_ACHIEVED$目标已达成
 STR_ACCOMPLISH_GOAL$完成目标\r
 STR_OK$确定\r
 STR_LOOK_OUT$注意\r
-STR_INSUFFICIENT_EXERCISE_AMOUNT$当前运动量太小,无法记录.是否结束运动\r
+STR_INSUFFICIENT_EXERCISE_AMOUNT$当前运动量太小,无法记录。是否结束运动\r
 STR_END_MOVEMENT$结束运动\r
 STR_END_THIS_MOVEMENT$是否结束本次运动\r
 STR_GOAL_ACCOMPLISHMENT_DEGREE$目标完成度\r
index e10e23d..38a0890 100644 (file)
@@ -20,7 +20,7 @@
        <lanstr id="STR_EXERCISE_OUTDOORRUNNING" value="Run"/>
        <lanstr id="STR_EXERCISE_INDOORWALKING" value="Indoor walking"/>
        <lanstr id="STR_EXERCISE_INDOORRUNNING" value="Indoor running"/>
-       <lanstr id="STR_EXERCISE_OUTDOORBIKING" value="Biking"/>
+       <lanstr id="STR_EXERCISE_OUTDOORBIKING" value=" Biking"/>
        <lanstr id="STR_EXERCISE_JUMPINGROPE" value="Jumping rope"/>
        <lanstr id="STR_EXERCISE_PILATES" value="Pilates"/>
        <lanstr id="STR_EXERCISE_CROSS_FIT" value="Cross fit"/>
@@ -36,7 +36,7 @@
        <lanstr id="STR_EXERCISE_KENDO" value="Kendo"/>
        <lanstr id="STR_EXERCISE_HORIZONTALBAR" value="Horizontal bar"/>
        <lanstr id="STR_EXERCISE_PARALLELBARS" value="Parallel bars"/>
-       <lanstr id="STR_EXERCISE_CROSSFIT" value="Circuit training"/>
+       <lanstr id="STR_EXERCISE_CIRCUIT" value="Circuit training"/>
        <lanstr id="STR_EXERCISE_AEROBICS" value="Aerobics"/>
        <lanstr id="STR_EXERCISE_CALISTHENICE" value="Calisthenice"/>
        <lanstr id="STR_EXERCISE_P90X" value="P90X"/>
        <lanstr id="STR_OTHER_TITLE" value="Other Sport"/>
        <lanstr id="STR_EXERCISE_TITLE" value="Exercise Sport"/>
        <lanstr id="STR_TRAINING" value="Training"/>
-       <lanstr id="STR_LANGUAGE" value="Language"/>
        <lanstr id="STR_RAPID_TRAINING" value="Rapid training"/>
-       <lanstr id="STR_SET_GOALS" value="Set goals"/>
+       <lanstr id="STR_SET_GOALS" value="Set goals &gt;"/>
        <lanstr id="STR_DURATION" value="duration"/>
        <lanstr id="STR_DURATION_SETTING" value="Duration setting"/>
        <lanstr id="STR_MINUTES" value="minutes"/>
        <lanstr id="STR_HIGH_STRENGTH" value="High strength"/>
        <lanstr id="STR_ULTRA_HIGH_STRENGTH" value="Ultra-high strength"/>
        <lanstr id="STR_TRAINING_INTENSITY" value="Training intensity"/>
-       <lanstr id="STR_TRAINING_INTENSITY_DESCRIPTION" value="Training intensity is used to determine whether the training is insufficient or too much training"/>
-       <lanstr id="STR_INTENSITY_INTERVAL_DESCRIPTION" value="The intensity interval is a real-time state display of the strength of the corresponding bullseye rate (calculated from personal basic data)"/>
+       <lanstr id="STR_TRAINING_INTENSITY_DESCRIPTION" value="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."/>
+       <lanstr id="STR_INTENSITY_INTERVAL_DESCRIPTION" value="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"/>
        <lanstr id="STR_TRAINING_STATE_MEANING" value="The meaning of the training state"/>
        <lanstr id="STR_WARM_UP_EXERCISE" value="Warm-up exercise"/>
        <lanstr id="STR_FAT_BURNING_ZONE" value="Fat-burning zone"/>
        <lanstr id="STR_IMPROVE_CARDIOPULMONARY_FUNCTION" value="Improve cardiopulmonary function"/>
        <lanstr id="STR_PROFESSIONAL_ATHLETE" value="Professional athlete"/>
-       <lanstr id="STR_TRAINING_INTENSITY_NOTE" value="Note: This training intensity is not a professional sports assessment"/>
+       <lanstr id="STR_TRAINING_INTENSITY_NOTE" value="Note: This training intensity is not a professional sports assessment, and the data is for reference only"/>
        <lanstr id="STR_TRAINING_IN_PROGRESS" value="Training in progress"/>
        <lanstr id="STR_BREAK_TRAINING" value="Break training"/>
        <lanstr id="STR_FINISH" value="finish"/>
index e677336..d8aff3e 100644 (file)
@@ -36,7 +36,7 @@
        <lanstr id="STR_EXERCISE_KENDO" value="剑道"/>
        <lanstr id="STR_EXERCISE_HORIZONTALBAR" value="单杠"/>
        <lanstr id="STR_EXERCISE_PARALLELBARS" value="双杠"/>
-       <lanstr id="STR_EXERCISE_CROSSFIT" value="循环训练"/>
+       <lanstr id="STR_EXERCISE_CIRCUIT" value="循环训练"/>
        <lanstr id="STR_EXERCISE_AEROBICS" value="有氧运动"/>
        <lanstr id="STR_EXERCISE_CALISTHENICE" value="健美操"/>
        <lanstr id="STR_EXERCISE_P90X" value="P90X"/>
        <lanstr id="STR_OTHER_TITLE" value="其他运动"/>
        <lanstr id="STR_EXERCISE_TITLE" value="健身运动"/>
        <lanstr id="STR_TRAINING" value="训练"/>
-       <lanstr id="STR_LANGUAGE" value="语言"/>
        <lanstr id="STR_RAPID_TRAINING" value="快速训练"/>
-       <lanstr id="STR_SET_GOALS" value="设置目标"/>
+       <lanstr id="STR_SET_GOALS" value="设置目标 &gt;"/>
        <lanstr id="STR_DURATION" value="时长"/>
        <lanstr id="STR_DURATION_SETTING" value="时长设定"/>
        <lanstr id="STR_MINUTES" value="分钟"/>
        <lanstr id="STR_ACCOMPLISH_GOAL" value="完成目标"/>
        <lanstr id="STR_OK" value="确定"/>
        <lanstr id="STR_LOOK_OUT" value="注意"/>
-       <lanstr id="STR_INSUFFICIENT_EXERCISE_AMOUNT" value="当前运动量太小,无法记录.是否结束运动"/>
+       <lanstr id="STR_INSUFFICIENT_EXERCISE_AMOUNT" value="当前运动量太小,无法记录。是否结束运动"/>
        <lanstr id="STR_END_MOVEMENT" value="结束运动"/>
        <lanstr id="STR_END_THIS_MOVEMENT" value="是否结束本次运动"/>
        <lanstr id="STR_GOAL_ACCOMPLISHMENT_DEGREE" value="目标完成度"/>
index a61b108..bd25ae2 100644 (file)
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
index bd78e05..62f1010 100644 (file)
@@ -47,158 +47,158 @@ enum UIResourceTextId : uint16_t {
     STR_EXERCISE_KENDO = 34,\r
     STR_EXERCISE_HORIZONTALBAR = 35,\r
     STR_EXERCISE_PARALLELBARS = 36,\r
-    STR_EXERCISE_AEROBICS = 37,\r
-    STR_EXERCISE_CALISTHENICE = 38,\r
-    STR_EXERCISE_P90X = 39,\r
-    STR_EXERCISE_KETTLEBELLTRAINING = 40,\r
-    STR_EXERCISE_MIXEDMARTIALARTS = 41,\r
-    STR_EXERCISE_STAIRCLIMBINGMACHINE = 42,\r
-    STR_EXERCISE_WEIGHTLIFTING = 43,\r
-    STR_EXERCISE_BARRE = 44,\r
-    STR_EXERCISE_HANDCYCLING = 45,\r
-    STR_EXERCISE_TRACKFIELD = 46,\r
-    STR_EXERCISE_WRESTLING = 47,\r
-    STR_EXERCISE_MINDBODY = 48,\r
-    STR_EXERCISE_FLEXIBILITY = 49,\r
-    STR_EXERCISE_MIXEDCARDIO = 50,\r
-    STR_EXERCISE_TRADITIONALSTRENGTHTRAINING = 51,\r
-    STR_EXERCISE_CROSSTRAINING = 52,\r
-    STR_EXERCISE_GYMNASTICS = 53,\r
-    STR_EXERCISE_STEPTRAINING = 54,\r
-    STR_EXERCISE_ELLIPTICALTRAINER = 55,\r
-    STR_EXERCISE_ROWINGMACHINE = 56,\r
-    STR_DANCING_GENERAL = 57,\r
-    STR_DANCING_BELLY = 58,\r
-    STR_DANCING_JAZZ = 59,\r
-    STR_DANCING_LATIN = 60,\r
-    STR_DANCING_BALLET = 61,\r
-    STR_DANCING_STREET = 62,\r
-    STR_DANCING_PUBLICSQUARE = 63,\r
-    STR_DANCING_ZUMBA = 64,\r
-    STR_DANCING_SOCIALDANCE = 65,\r
-    STR_DANCING_TAPDANCE = 66,\r
-    STR_RECREATIONAL_SPORTS = 67,\r
-    STR_RECREATIONAL_SKATING = 68,\r
-    STR_RECREATIONAL_MARTIALARTS = 69,\r
-    STR_RECREATIONAL_TAICHI = 70,\r
-    STR_RECREATIONAL_HULAHOOP = 71,\r
-    STR_RECREATIONAL_DISCSPORT = 72,\r
-    STR_RECREATIONAL_DARTS = 73,\r
-    STR_RECREATIONAL_ARCHERY = 74,\r
-    STR_RECREATIONAL_HORSERIDING = 75,\r
-    STR_RECREATIONAL_BATTLEGAME = 76,\r
-    STR_RECREATIONAL_KITE = 77,\r
-    STR_RECREATIONAL_TUGOFWAR = 78,\r
-    STR_RECREATIONAL_SWING = 79,\r
-    STR_RECREATIONAL_STAIRCLIMBING = 80,\r
-    STR_RECREATIONAL_OBSTACLERACE = 81,\r
-    STR_RECREATIONAL_FISHING = 82,\r
-    STR_RECREATIONAL_HUNTING = 83,\r
-    STR_RECREATIONAL_SCOOTERRIDING = 84,\r
-    STR_RECREATIONAL_PARAGLIDING = 85,\r
-    STR_RECREATIONAL_TEAMSPORTS = 86,\r
-    STR_RECREATIONAL_FINESSGAMING = 87,\r
-    STR_RECREATIONAL_HIKING = 88,\r
-    STR_RECREATIONAL_EQUESTRIANSPORTS = 89,\r
-    STR_RECREATIONAL_PLAY = 90,\r
-    STR_BALL_GAMES = 91,\r
-    STR_BALL_BADMINTON = 92,\r
-    STR_BALL_TABLETENNIS = 93,\r
-    STR_BALL_TENNIS = 94,\r
-    STR_BALL_BILLIARDS = 95,\r
-    STR_BALL_BOWLING = 96,\r
-    STR_BALL_VOLLEYBALL = 97,\r
-    STR_BALL_SHUTTLECOCK = 98,\r
-    STR_BALL_HANDBALL = 99,\r
-    STR_BALL_BASEBALL = 100,\r
-    STR_BALL_SOFTBALL = 101,\r
-    STR_BALL_CRICKET = 102,\r
-    STR_BALL_FOOTBALL = 103,\r
-    STR_BALL_BEACHSOCCER = 104,\r
-    STR_BALL_BEACHVOLLEYBALL = 105,\r
-    STR_BALL_CROQUET = 106,\r
-    STR_BALL_HOCKEY = 107,\r
-    STR_BALL_SQUASH = 108,\r
-    STR_BALL_SEPAKTAKRAW = 109,\r
-    STR_BALL_DODGEBALL = 110,\r
-    STR_BALL_BASKETBALL = 111,\r
-    STR_BALL_SOCCER = 112,\r
-    STR_BALL_GOLF = 113,\r
-    STR_BALL_POLO = 114,\r
-    STR_BALL_RACQUETBALL = 115,\r
-    STR_BALL_RUGBY = 116,\r
-    STR_BALL_GATEBALL = 117,\r
-    STR_BALL_PICKLEBALL = 118,\r
-    STR_BALL_LACROSSE = 119,\r
-    STR_WATER_ACTIVITIES = 120,\r
-    STR_WATER_SAILING = 121,\r
-    STR_WATER_SURFING = 122,\r
-    STR_WATER_WHITEWATERRAFTING = 123,\r
-    STR_WATER_CANOEING = 124,\r
-    STR_WATER_KAYAKING = 125,\r
-    STR_WATER_ROWING = 126,\r
-    STR_WATER_MOTORBOAT = 127,\r
-    STR_WATER_SUP = 128,\r
-    STR_WATER_SCUBADIVING = 129,\r
-    STR_WATER_DIVING = 130,\r
-    STR_WATER_KITESURFING = 131,\r
-    STR_WATER_WAKEBOARDING = 132,\r
-    STR_WATER_POLO = 133,\r
-    STR_WATER_WINDSURFING = 134,\r
-    STR_WATER_DRIFTING = 135,\r
-    STR_WATER_FITNESS = 136,\r
-    STR_WATER_SPORTS = 137,\r
-    STR_WATER_OUTDOORSWIM = 138,\r
-    STR_WATER_INDOORSWIM = 139,\r
-    STR_WATER_SWIMFREESTYLE = 140,\r
-    STR_WATER_SWIMBREASTSTROKE = 141,\r
-    STR_WATER_SWIMBACKSTROKE = 142,\r
-    STR_WATER_SWIMBUTTERFLY = 143,\r
-    STR_ICE_SPORTS = 144,\r
-    STR_ICE_SKATING = 145,\r
-    STR_ICE_HOCKEY = 146,\r
-    STR_ICE_CURLING = 147,\r
-    STR_ICE_SNOWMOBILING = 148,\r
-    STR_ICE_SLED = 149,\r
-    STR_ICE_BIATHLON = 150,\r
-    STR_ICE_CROSSCOUNTRYSKING = 151,\r
-    STR_ICE_SKIING = 152,\r
-    STR_ICE_SNOWBOARDING = 153,\r
-    STR_ICE_SNOWSHOEING = 154,\r
-    STR_ICE_SNOWSPORTS = 155,\r
-    STR_EXTREME_SPORTS = 156,\r
-    STR_EXTREME_SKATEBOARDING = 157,\r
-    STR_EXTREME_ROCKCLIMBING = 158,\r
-    STR_EXTREME_BUNGEEJUMPING = 159,\r
-    STR_EXTREME_PARKOUR = 160,\r
-    STR_EXTREME_BMX = 161,\r
-    STR_EXTREME_ORIENTEERING = 162,\r
-    STR_EXTREME_PARACHUTE = 163,\r
-    STR_EXTREME_RACING = 164,\r
-    STR_EXTREME_TRIATHLONS = 165,\r
-    STR_OTHER_ELEVATOR = 166,\r
-    STR_OTHER_ESCALATOR = 167,\r
-    STR_OTHER_GARDENING = 168,\r
-    STR_OTHER_HORSEWORK = 169,\r
-    STR_OTHER_INVEHICLE = 170,\r
-    STR_OTHER_MEDITATION = 171,\r
-    STR_OTHER_STILL = 172,\r
-    STR_OTHER_TILTING = 173,\r
-    STR_OTHER_WHEELCHAIR = 174,\r
-    STR_EXERCISE_LIST = 175,\r
-    STR_BALL_LIST = 176,\r
-    STR_WATER_LIST = 177,\r
-    STR_DANCING_LIST = 178,\r
-    STR_EXTREME_LIST = 179,\r
-    STR_ICE_LIST = 180,\r
-    STR_RECREATIONAL_LIST = 181,\r
-    STR_OTHER_LIST = 182,\r
-    STR_DANCING_TITLE = 183,\r
-    STR_BALL_LIST_TITLE = 184,\r
-    STR_OTHER_TITLE = 185,\r
-    STR_EXERCISE_TITLE = 186,\r
-    STR_TRAINING = 187,\r
-    STR_LANGUAGE = 188,\r
+    STR_EXERCISE_CIRCUIT = 37,\r
+    STR_EXERCISE_AEROBICS = 38,\r
+    STR_EXERCISE_CALISTHENICE = 39,\r
+    STR_EXERCISE_P90X = 40,\r
+    STR_EXERCISE_KETTLEBELLTRAINING = 41,\r
+    STR_EXERCISE_MIXEDMARTIALARTS = 42,\r
+    STR_EXERCISE_STAIRCLIMBINGMACHINE = 43,\r
+    STR_EXERCISE_WEIGHTLIFTING = 44,\r
+    STR_EXERCISE_BARRE = 45,\r
+    STR_EXERCISE_HANDCYCLING = 46,\r
+    STR_EXERCISE_TRACKFIELD = 47,\r
+    STR_EXERCISE_WRESTLING = 48,\r
+    STR_EXERCISE_MINDBODY = 49,\r
+    STR_EXERCISE_FLEXIBILITY = 50,\r
+    STR_EXERCISE_MIXEDCARDIO = 51,\r
+    STR_EXERCISE_TRADITIONALSTRENGTHTRAINING = 52,\r
+    STR_EXERCISE_CROSSTRAINING = 53,\r
+    STR_EXERCISE_GYMNASTICS = 54,\r
+    STR_EXERCISE_STEPTRAINING = 55,\r
+    STR_EXERCISE_ELLIPTICALTRAINER = 56,\r
+    STR_EXERCISE_ROWINGMACHINE = 57,\r
+    STR_DANCING_GENERAL = 58,\r
+    STR_DANCING_BELLY = 59,\r
+    STR_DANCING_JAZZ = 60,\r
+    STR_DANCING_LATIN = 61,\r
+    STR_DANCING_BALLET = 62,\r
+    STR_DANCING_STREET = 63,\r
+    STR_DANCING_PUBLICSQUARE = 64,\r
+    STR_DANCING_ZUMBA = 65,\r
+    STR_DANCING_SOCIALDANCE = 66,\r
+    STR_DANCING_TAPDANCE = 67,\r
+    STR_RECREATIONAL_SPORTS = 68,\r
+    STR_RECREATIONAL_SKATING = 69,\r
+    STR_RECREATIONAL_MARTIALARTS = 70,\r
+    STR_RECREATIONAL_TAICHI = 71,\r
+    STR_RECREATIONAL_HULAHOOP = 72,\r
+    STR_RECREATIONAL_DISCSPORT = 73,\r
+    STR_RECREATIONAL_DARTS = 74,\r
+    STR_RECREATIONAL_ARCHERY = 75,\r
+    STR_RECREATIONAL_HORSERIDING = 76,\r
+    STR_RECREATIONAL_BATTLEGAME = 77,\r
+    STR_RECREATIONAL_KITE = 78,\r
+    STR_RECREATIONAL_TUGOFWAR = 79,\r
+    STR_RECREATIONAL_SWING = 80,\r
+    STR_RECREATIONAL_STAIRCLIMBING = 81,\r
+    STR_RECREATIONAL_OBSTACLERACE = 82,\r
+    STR_RECREATIONAL_FISHING = 83,\r
+    STR_RECREATIONAL_HUNTING = 84,\r
+    STR_RECREATIONAL_SCOOTERRIDING = 85,\r
+    STR_RECREATIONAL_PARAGLIDING = 86,\r
+    STR_RECREATIONAL_TEAMSPORTS = 87,\r
+    STR_RECREATIONAL_FINESSGAMING = 88,\r
+    STR_RECREATIONAL_HIKING = 89,\r
+    STR_RECREATIONAL_EQUESTRIANSPORTS = 90,\r
+    STR_RECREATIONAL_PLAY = 91,\r
+    STR_BALL_GAMES = 92,\r
+    STR_BALL_BADMINTON = 93,\r
+    STR_BALL_TABLETENNIS = 94,\r
+    STR_BALL_TENNIS = 95,\r
+    STR_BALL_BILLIARDS = 96,\r
+    STR_BALL_BOWLING = 97,\r
+    STR_BALL_VOLLEYBALL = 98,\r
+    STR_BALL_SHUTTLECOCK = 99,\r
+    STR_BALL_HANDBALL = 100,\r
+    STR_BALL_BASEBALL = 101,\r
+    STR_BALL_SOFTBALL = 102,\r
+    STR_BALL_CRICKET = 103,\r
+    STR_BALL_FOOTBALL = 104,\r
+    STR_BALL_BEACHSOCCER = 105,\r
+    STR_BALL_BEACHVOLLEYBALL = 106,\r
+    STR_BALL_CROQUET = 107,\r
+    STR_BALL_HOCKEY = 108,\r
+    STR_BALL_SQUASH = 109,\r
+    STR_BALL_SEPAKTAKRAW = 110,\r
+    STR_BALL_DODGEBALL = 111,\r
+    STR_BALL_BASKETBALL = 112,\r
+    STR_BALL_SOCCER = 113,\r
+    STR_BALL_GOLF = 114,\r
+    STR_BALL_POLO = 115,\r
+    STR_BALL_RACQUETBALL = 116,\r
+    STR_BALL_RUGBY = 117,\r
+    STR_BALL_GATEBALL = 118,\r
+    STR_BALL_PICKLEBALL = 119,\r
+    STR_BALL_LACROSSE = 120,\r
+    STR_WATER_ACTIVITIES = 121,\r
+    STR_WATER_SAILING = 122,\r
+    STR_WATER_SURFING = 123,\r
+    STR_WATER_WHITEWATERRAFTING = 124,\r
+    STR_WATER_CANOEING = 125,\r
+    STR_WATER_KAYAKING = 126,\r
+    STR_WATER_ROWING = 127,\r
+    STR_WATER_MOTORBOAT = 128,\r
+    STR_WATER_SUP = 129,\r
+    STR_WATER_SCUBADIVING = 130,\r
+    STR_WATER_DIVING = 131,\r
+    STR_WATER_KITESURFING = 132,\r
+    STR_WATER_WAKEBOARDING = 133,\r
+    STR_WATER_POLO = 134,\r
+    STR_WATER_WINDSURFING = 135,\r
+    STR_WATER_DRIFTING = 136,\r
+    STR_WATER_FITNESS = 137,\r
+    STR_WATER_SPORTS = 138,\r
+    STR_WATER_OUTDOORSWIM = 139,\r
+    STR_WATER_INDOORSWIM = 140,\r
+    STR_WATER_SWIMFREESTYLE = 141,\r
+    STR_WATER_SWIMBREASTSTROKE = 142,\r
+    STR_WATER_SWIMBACKSTROKE = 143,\r
+    STR_WATER_SWIMBUTTERFLY = 144,\r
+    STR_ICE_SPORTS = 145,\r
+    STR_ICE_SKATING = 146,\r
+    STR_ICE_HOCKEY = 147,\r
+    STR_ICE_CURLING = 148,\r
+    STR_ICE_SNOWMOBILING = 149,\r
+    STR_ICE_SLED = 150,\r
+    STR_ICE_BIATHLON = 151,\r
+    STR_ICE_CROSSCOUNTRYSKING = 152,\r
+    STR_ICE_SKIING = 153,\r
+    STR_ICE_SNOWBOARDING = 154,\r
+    STR_ICE_SNOWSHOEING = 155,\r
+    STR_ICE_SNOWSPORTS = 156,\r
+    STR_EXTREME_SPORTS = 157,\r
+    STR_EXTREME_SKATEBOARDING = 158,\r
+    STR_EXTREME_ROCKCLIMBING = 159,\r
+    STR_EXTREME_BUNGEEJUMPING = 160,\r
+    STR_EXTREME_PARKOUR = 161,\r
+    STR_EXTREME_BMX = 162,\r
+    STR_EXTREME_ORIENTEERING = 163,\r
+    STR_EXTREME_PARACHUTE = 164,\r
+    STR_EXTREME_RACING = 165,\r
+    STR_EXTREME_TRIATHLONS = 166,\r
+    STR_OTHER_ELEVATOR = 167,\r
+    STR_OTHER_ESCALATOR = 168,\r
+    STR_OTHER_GARDENING = 169,\r
+    STR_OTHER_HORSEWORK = 170,\r
+    STR_OTHER_INVEHICLE = 171,\r
+    STR_OTHER_MEDITATION = 172,\r
+    STR_OTHER_STILL = 173,\r
+    STR_OTHER_TILTING = 174,\r
+    STR_OTHER_WHEELCHAIR = 175,\r
+    STR_EXERCISE_LIST = 176,\r
+    STR_BALL_LIST = 177,\r
+    STR_WATER_LIST = 178,\r
+    STR_DANCING_LIST = 179,\r
+    STR_EXTREME_LIST = 180,\r
+    STR_ICE_LIST = 181,\r
+    STR_RECREATIONAL_LIST = 182,\r
+    STR_OTHER_LIST = 183,\r
+    STR_DANCING_TITLE = 184,\r
+    STR_BALL_LIST_TITLE = 185,\r
+    STR_OTHER_TITLE = 186,\r
+    STR_EXERCISE_TITLE = 187,\r
+    STR_TRAINING = 188,\r
     STR_RAPID_TRAINING = 189,\r
     STR_SET_GOALS = 190,\r
     STR_DURATION = 191,\r
index 4360731..68dfe84 100644 (file)
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
index 50a757f..ba11143 100644 (file)
@@ -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);
index 55dcc12..6c0b511 100644 (file)
@@ -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);
index 21590c0..eb86b43 100644 (file)
@@ -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();
 
index 07c0fb7..ae995ac 100644 (file)
@@ -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
index 0749641..584fde2 100644 (file)
@@ -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} *
index 131c57e..95f635b 100644 (file)
@@ -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 <ui_scroll_view.h>
@@ -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<UIView::OnClickListener *>(TraingNomalPresenter::GetInstance()));
-        button2_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingNomalPresenter::GetInstance()));
-        container_->Add(button1_);
-        container_->Add(button2_);
+        buttonGo_->SetOnClickListener(static_cast<UIView::OnClickListener *>(TraingNomalPresenter::GetInstance()));
+        buttonSet_->SetOnClickListener(static_cast<UIView::OnClickListener *>(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)
         {
index c39389a..544ca61 100644 (file)
@@ -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)
         {
index e9f0264..d25d5e1 100644 (file)
 \r
 namespace OHOS\r
 {\r
-        static Training_CardView *g_pTraining_CardView{nullptr};\r
-    static QuickTraining *data = new QuickTraining;\r
+    static Training_CardView *g_pTraining_CardView{nullptr};\r
+    QuickTraining *data = new QuickTraining;\r
 \r
     Training_CardView::Training_CardView()\r
     {\r
-WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::Training_CardView");\r
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::Training_CardView");\r
         SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
         g_pTraining_CardView = this;\r
         data = TraingModel::GetInstance()->GetQuickTraining();\r
-            }\r
+    }\r
 \r
     Training_CardView::~Training_CardView()\r
     {\r
@@ -41,9 +41,9 @@ WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::Training_CardView");
     {\r
         return g_pTraining_CardView;\r
     }\r
-bool Training_CardView::InitLable()\r
+    bool Training_CardView::InitLable()\r
     {\r
-                //  初始化标签\r
+        //  初始化标签\r
         TraingModel::GetInstance()->InitLabelExt(titleLabel, 130, 52, 200, 60, "title_label", STR_RAPID_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         Add(titleLabel);\r
         return true;\r
@@ -132,16 +132,16 @@ bool Training_CardView::InitLable()
 \r
         return true;\r
     }\r
-    \r
+\r
     bool Training_CardView::InitImage()\r
     {\r
         struct ImageInfo\r
         {\r
             UIImageView *image;\r
-        const int imagePath;\r
+            const int imagePath;\r
             uint16_t posX;\r
             uint16_t posY;\r
-        const char *viewId;\r
+            const char *viewId;\r
         };\r
 \r
         ImageInfo images[] = {\r
@@ -168,7 +168,7 @@ bool Training_CardView::InitLable()
 \r
         return true;\r
     }\r
-/* -------------------------------------------------------------------------- */\r
+    /* -------------------------------------------------------------------------- */\r
     bool Training_CardView::InitView()\r
     {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::InitView()");\r
@@ -187,30 +187,30 @@ bool Training_CardView::InitLable()
         // SetCoverable(true);\r
         return true;\r
     }\r
-        \r
+\r
     void Training_CardView::DeInit()\r
-        {\r
-            UIImageView *imageViews[] = {image1, image2, image3};\r
+    {\r
+        UIImageView *imageViews[] = {image1, image2, image3};\r
         UIButton *buttons[] = {ButtonMore, Button1, Button3, Button2};\r
 \r
         for (auto &imageView : imageViews)\r
         {\r
             if (imageView != nullptr)\r
-        {\r
-            delete imageView;\r
+            {\r
+                delete imageView;\r
                 imageView = nullptr;\r
-        }\r
+            }\r
         }\r
 \r
         for (auto &button : buttons)\r
         {\r
             if (button != nullptr)\r
-        {\r
-            delete button;\r
+            {\r
+                delete button;\r
                 button = nullptr;\r
-}\r
+            }\r
         }\r
-        \r
+\r
         if (titleLabel != nullptr)\r
         {\r
             delete titleLabel;\r
@@ -225,7 +225,7 @@ bool Training_CardView::InitLable()
             InitView();\r
             viewiInitStatus = true;\r
         }\r
-    // if (!resLoadStatus)\r
+        // if (!resLoadStatus)\r
         // {\r
         //     resLoadStatus = true;\r
         // }\r
@@ -233,7 +233,7 @@ bool Training_CardView::InitLable()
 \r
     void Training_CardView::UnLoad(void)\r
     {\r
-// if (resLoadStatus)\r
+        // if (resLoadStatus)\r
         // {\r
         //     //ImageCacheManager::GetInstance().UnloadAllInMultiRes(TRAINING_IAMGES);\r
         //     resLoadStatus = false;\r
index a61b108..bd25ae2 100644 (file)
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
index bd78e05..62f1010 100644 (file)
@@ -47,158 +47,158 @@ enum UIResourceTextId : uint16_t {
     STR_EXERCISE_KENDO = 34,\r
     STR_EXERCISE_HORIZONTALBAR = 35,\r
     STR_EXERCISE_PARALLELBARS = 36,\r
-    STR_EXERCISE_AEROBICS = 37,\r
-    STR_EXERCISE_CALISTHENICE = 38,\r
-    STR_EXERCISE_P90X = 39,\r
-    STR_EXERCISE_KETTLEBELLTRAINING = 40,\r
-    STR_EXERCISE_MIXEDMARTIALARTS = 41,\r
-    STR_EXERCISE_STAIRCLIMBINGMACHINE = 42,\r
-    STR_EXERCISE_WEIGHTLIFTING = 43,\r
-    STR_EXERCISE_BARRE = 44,\r
-    STR_EXERCISE_HANDCYCLING = 45,\r
-    STR_EXERCISE_TRACKFIELD = 46,\r
-    STR_EXERCISE_WRESTLING = 47,\r
-    STR_EXERCISE_MINDBODY = 48,\r
-    STR_EXERCISE_FLEXIBILITY = 49,\r
-    STR_EXERCISE_MIXEDCARDIO = 50,\r
-    STR_EXERCISE_TRADITIONALSTRENGTHTRAINING = 51,\r
-    STR_EXERCISE_CROSSTRAINING = 52,\r
-    STR_EXERCISE_GYMNASTICS = 53,\r
-    STR_EXERCISE_STEPTRAINING = 54,\r
-    STR_EXERCISE_ELLIPTICALTRAINER = 55,\r
-    STR_EXERCISE_ROWINGMACHINE = 56,\r
-    STR_DANCING_GENERAL = 57,\r
-    STR_DANCING_BELLY = 58,\r
-    STR_DANCING_JAZZ = 59,\r
-    STR_DANCING_LATIN = 60,\r
-    STR_DANCING_BALLET = 61,\r
-    STR_DANCING_STREET = 62,\r
-    STR_DANCING_PUBLICSQUARE = 63,\r
-    STR_DANCING_ZUMBA = 64,\r
-    STR_DANCING_SOCIALDANCE = 65,\r
-    STR_DANCING_TAPDANCE = 66,\r
-    STR_RECREATIONAL_SPORTS = 67,\r
-    STR_RECREATIONAL_SKATING = 68,\r
-    STR_RECREATIONAL_MARTIALARTS = 69,\r
-    STR_RECREATIONAL_TAICHI = 70,\r
-    STR_RECREATIONAL_HULAHOOP = 71,\r
-    STR_RECREATIONAL_DISCSPORT = 72,\r
-    STR_RECREATIONAL_DARTS = 73,\r
-    STR_RECREATIONAL_ARCHERY = 74,\r
-    STR_RECREATIONAL_HORSERIDING = 75,\r
-    STR_RECREATIONAL_BATTLEGAME = 76,\r
-    STR_RECREATIONAL_KITE = 77,\r
-    STR_RECREATIONAL_TUGOFWAR = 78,\r
-    STR_RECREATIONAL_SWING = 79,\r
-    STR_RECREATIONAL_STAIRCLIMBING = 80,\r
-    STR_RECREATIONAL_OBSTACLERACE = 81,\r
-    STR_RECREATIONAL_FISHING = 82,\r
-    STR_RECREATIONAL_HUNTING = 83,\r
-    STR_RECREATIONAL_SCOOTERRIDING = 84,\r
-    STR_RECREATIONAL_PARAGLIDING = 85,\r
-    STR_RECREATIONAL_TEAMSPORTS = 86,\r
-    STR_RECREATIONAL_FINESSGAMING = 87,\r
-    STR_RECREATIONAL_HIKING = 88,\r
-    STR_RECREATIONAL_EQUESTRIANSPORTS = 89,\r
-    STR_RECREATIONAL_PLAY = 90,\r
-    STR_BALL_GAMES = 91,\r
-    STR_BALL_BADMINTON = 92,\r
-    STR_BALL_TABLETENNIS = 93,\r
-    STR_BALL_TENNIS = 94,\r
-    STR_BALL_BILLIARDS = 95,\r
-    STR_BALL_BOWLING = 96,\r
-    STR_BALL_VOLLEYBALL = 97,\r
-    STR_BALL_SHUTTLECOCK = 98,\r
-    STR_BALL_HANDBALL = 99,\r
-    STR_BALL_BASEBALL = 100,\r
-    STR_BALL_SOFTBALL = 101,\r
-    STR_BALL_CRICKET = 102,\r
-    STR_BALL_FOOTBALL = 103,\r
-    STR_BALL_BEACHSOCCER = 104,\r
-    STR_BALL_BEACHVOLLEYBALL = 105,\r
-    STR_BALL_CROQUET = 106,\r
-    STR_BALL_HOCKEY = 107,\r
-    STR_BALL_SQUASH = 108,\r
-    STR_BALL_SEPAKTAKRAW = 109,\r
-    STR_BALL_DODGEBALL = 110,\r
-    STR_BALL_BASKETBALL = 111,\r
-    STR_BALL_SOCCER = 112,\r
-    STR_BALL_GOLF = 113,\r
-    STR_BALL_POLO = 114,\r
-    STR_BALL_RACQUETBALL = 115,\r
-    STR_BALL_RUGBY = 116,\r
-    STR_BALL_GATEBALL = 117,\r
-    STR_BALL_PICKLEBALL = 118,\r
-    STR_BALL_LACROSSE = 119,\r
-    STR_WATER_ACTIVITIES = 120,\r
-    STR_WATER_SAILING = 121,\r
-    STR_WATER_SURFING = 122,\r
-    STR_WATER_WHITEWATERRAFTING = 123,\r
-    STR_WATER_CANOEING = 124,\r
-    STR_WATER_KAYAKING = 125,\r
-    STR_WATER_ROWING = 126,\r
-    STR_WATER_MOTORBOAT = 127,\r
-    STR_WATER_SUP = 128,\r
-    STR_WATER_SCUBADIVING = 129,\r
-    STR_WATER_DIVING = 130,\r
-    STR_WATER_KITESURFING = 131,\r
-    STR_WATER_WAKEBOARDING = 132,\r
-    STR_WATER_POLO = 133,\r
-    STR_WATER_WINDSURFING = 134,\r
-    STR_WATER_DRIFTING = 135,\r
-    STR_WATER_FITNESS = 136,\r
-    STR_WATER_SPORTS = 137,\r
-    STR_WATER_OUTDOORSWIM = 138,\r
-    STR_WATER_INDOORSWIM = 139,\r
-    STR_WATER_SWIMFREESTYLE = 140,\r
-    STR_WATER_SWIMBREASTSTROKE = 141,\r
-    STR_WATER_SWIMBACKSTROKE = 142,\r
-    STR_WATER_SWIMBUTTERFLY = 143,\r
-    STR_ICE_SPORTS = 144,\r
-    STR_ICE_SKATING = 145,\r
-    STR_ICE_HOCKEY = 146,\r
-    STR_ICE_CURLING = 147,\r
-    STR_ICE_SNOWMOBILING = 148,\r
-    STR_ICE_SLED = 149,\r
-    STR_ICE_BIATHLON = 150,\r
-    STR_ICE_CROSSCOUNTRYSKING = 151,\r
-    STR_ICE_SKIING = 152,\r
-    STR_ICE_SNOWBOARDING = 153,\r
-    STR_ICE_SNOWSHOEING = 154,\r
-    STR_ICE_SNOWSPORTS = 155,\r
-    STR_EXTREME_SPORTS = 156,\r
-    STR_EXTREME_SKATEBOARDING = 157,\r
-    STR_EXTREME_ROCKCLIMBING = 158,\r
-    STR_EXTREME_BUNGEEJUMPING = 159,\r
-    STR_EXTREME_PARKOUR = 160,\r
-    STR_EXTREME_BMX = 161,\r
-    STR_EXTREME_ORIENTEERING = 162,\r
-    STR_EXTREME_PARACHUTE = 163,\r
-    STR_EXTREME_RACING = 164,\r
-    STR_EXTREME_TRIATHLONS = 165,\r
-    STR_OTHER_ELEVATOR = 166,\r
-    STR_OTHER_ESCALATOR = 167,\r
-    STR_OTHER_GARDENING = 168,\r
-    STR_OTHER_HORSEWORK = 169,\r
-    STR_OTHER_INVEHICLE = 170,\r
-    STR_OTHER_MEDITATION = 171,\r
-    STR_OTHER_STILL = 172,\r
-    STR_OTHER_TILTING = 173,\r
-    STR_OTHER_WHEELCHAIR = 174,\r
-    STR_EXERCISE_LIST = 175,\r
-    STR_BALL_LIST = 176,\r
-    STR_WATER_LIST = 177,\r
-    STR_DANCING_LIST = 178,\r
-    STR_EXTREME_LIST = 179,\r
-    STR_ICE_LIST = 180,\r
-    STR_RECREATIONAL_LIST = 181,\r
-    STR_OTHER_LIST = 182,\r
-    STR_DANCING_TITLE = 183,\r
-    STR_BALL_LIST_TITLE = 184,\r
-    STR_OTHER_TITLE = 185,\r
-    STR_EXERCISE_TITLE = 186,\r
-    STR_TRAINING = 187,\r
-    STR_LANGUAGE = 188,\r
+    STR_EXERCISE_CIRCUIT = 37,\r
+    STR_EXERCISE_AEROBICS = 38,\r
+    STR_EXERCISE_CALISTHENICE = 39,\r
+    STR_EXERCISE_P90X = 40,\r
+    STR_EXERCISE_KETTLEBELLTRAINING = 41,\r
+    STR_EXERCISE_MIXEDMARTIALARTS = 42,\r
+    STR_EXERCISE_STAIRCLIMBINGMACHINE = 43,\r
+    STR_EXERCISE_WEIGHTLIFTING = 44,\r
+    STR_EXERCISE_BARRE = 45,\r
+    STR_EXERCISE_HANDCYCLING = 46,\r
+    STR_EXERCISE_TRACKFIELD = 47,\r
+    STR_EXERCISE_WRESTLING = 48,\r
+    STR_EXERCISE_MINDBODY = 49,\r
+    STR_EXERCISE_FLEXIBILITY = 50,\r
+    STR_EXERCISE_MIXEDCARDIO = 51,\r
+    STR_EXERCISE_TRADITIONALSTRENGTHTRAINING = 52,\r
+    STR_EXERCISE_CROSSTRAINING = 53,\r
+    STR_EXERCISE_GYMNASTICS = 54,\r
+    STR_EXERCISE_STEPTRAINING = 55,\r
+    STR_EXERCISE_ELLIPTICALTRAINER = 56,\r
+    STR_EXERCISE_ROWINGMACHINE = 57,\r
+    STR_DANCING_GENERAL = 58,\r
+    STR_DANCING_BELLY = 59,\r
+    STR_DANCING_JAZZ = 60,\r
+    STR_DANCING_LATIN = 61,\r
+    STR_DANCING_BALLET = 62,\r
+    STR_DANCING_STREET = 63,\r
+    STR_DANCING_PUBLICSQUARE = 64,\r
+    STR_DANCING_ZUMBA = 65,\r
+    STR_DANCING_SOCIALDANCE = 66,\r
+    STR_DANCING_TAPDANCE = 67,\r
+    STR_RECREATIONAL_SPORTS = 68,\r
+    STR_RECREATIONAL_SKATING = 69,\r
+    STR_RECREATIONAL_MARTIALARTS = 70,\r
+    STR_RECREATIONAL_TAICHI = 71,\r
+    STR_RECREATIONAL_HULAHOOP = 72,\r
+    STR_RECREATIONAL_DISCSPORT = 73,\r
+    STR_RECREATIONAL_DARTS = 74,\r
+    STR_RECREATIONAL_ARCHERY = 75,\r
+    STR_RECREATIONAL_HORSERIDING = 76,\r
+    STR_RECREATIONAL_BATTLEGAME = 77,\r
+    STR_RECREATIONAL_KITE = 78,\r
+    STR_RECREATIONAL_TUGOFWAR = 79,\r
+    STR_RECREATIONAL_SWING = 80,\r
+    STR_RECREATIONAL_STAIRCLIMBING = 81,\r
+    STR_RECREATIONAL_OBSTACLERACE = 82,\r
+    STR_RECREATIONAL_FISHING = 83,\r
+    STR_RECREATIONAL_HUNTING = 84,\r
+    STR_RECREATIONAL_SCOOTERRIDING = 85,\r
+    STR_RECREATIONAL_PARAGLIDING = 86,\r
+    STR_RECREATIONAL_TEAMSPORTS = 87,\r
+    STR_RECREATIONAL_FINESSGAMING = 88,\r
+    STR_RECREATIONAL_HIKING = 89,\r
+    STR_RECREATIONAL_EQUESTRIANSPORTS = 90,\r
+    STR_RECREATIONAL_PLAY = 91,\r
+    STR_BALL_GAMES = 92,\r
+    STR_BALL_BADMINTON = 93,\r
+    STR_BALL_TABLETENNIS = 94,\r
+    STR_BALL_TENNIS = 95,\r
+    STR_BALL_BILLIARDS = 96,\r
+    STR_BALL_BOWLING = 97,\r
+    STR_BALL_VOLLEYBALL = 98,\r
+    STR_BALL_SHUTTLECOCK = 99,\r
+    STR_BALL_HANDBALL = 100,\r
+    STR_BALL_BASEBALL = 101,\r
+    STR_BALL_SOFTBALL = 102,\r
+    STR_BALL_CRICKET = 103,\r
+    STR_BALL_FOOTBALL = 104,\r
+    STR_BALL_BEACHSOCCER = 105,\r
+    STR_BALL_BEACHVOLLEYBALL = 106,\r
+    STR_BALL_CROQUET = 107,\r
+    STR_BALL_HOCKEY = 108,\r
+    STR_BALL_SQUASH = 109,\r
+    STR_BALL_SEPAKTAKRAW = 110,\r
+    STR_BALL_DODGEBALL = 111,\r
+    STR_BALL_BASKETBALL = 112,\r
+    STR_BALL_SOCCER = 113,\r
+    STR_BALL_GOLF = 114,\r
+    STR_BALL_POLO = 115,\r
+    STR_BALL_RACQUETBALL = 116,\r
+    STR_BALL_RUGBY = 117,\r
+    STR_BALL_GATEBALL = 118,\r
+    STR_BALL_PICKLEBALL = 119,\r
+    STR_BALL_LACROSSE = 120,\r
+    STR_WATER_ACTIVITIES = 121,\r
+    STR_WATER_SAILING = 122,\r
+    STR_WATER_SURFING = 123,\r
+    STR_WATER_WHITEWATERRAFTING = 124,\r
+    STR_WATER_CANOEING = 125,\r
+    STR_WATER_KAYAKING = 126,\r
+    STR_WATER_ROWING = 127,\r
+    STR_WATER_MOTORBOAT = 128,\r
+    STR_WATER_SUP = 129,\r
+    STR_WATER_SCUBADIVING = 130,\r
+    STR_WATER_DIVING = 131,\r
+    STR_WATER_KITESURFING = 132,\r
+    STR_WATER_WAKEBOARDING = 133,\r
+    STR_WATER_POLO = 134,\r
+    STR_WATER_WINDSURFING = 135,\r
+    STR_WATER_DRIFTING = 136,\r
+    STR_WATER_FITNESS = 137,\r
+    STR_WATER_SPORTS = 138,\r
+    STR_WATER_OUTDOORSWIM = 139,\r
+    STR_WATER_INDOORSWIM = 140,\r
+    STR_WATER_SWIMFREESTYLE = 141,\r
+    STR_WATER_SWIMBREASTSTROKE = 142,\r
+    STR_WATER_SWIMBACKSTROKE = 143,\r
+    STR_WATER_SWIMBUTTERFLY = 144,\r
+    STR_ICE_SPORTS = 145,\r
+    STR_ICE_SKATING = 146,\r
+    STR_ICE_HOCKEY = 147,\r
+    STR_ICE_CURLING = 148,\r
+    STR_ICE_SNOWMOBILING = 149,\r
+    STR_ICE_SLED = 150,\r
+    STR_ICE_BIATHLON = 151,\r
+    STR_ICE_CROSSCOUNTRYSKING = 152,\r
+    STR_ICE_SKIING = 153,\r
+    STR_ICE_SNOWBOARDING = 154,\r
+    STR_ICE_SNOWSHOEING = 155,\r
+    STR_ICE_SNOWSPORTS = 156,\r
+    STR_EXTREME_SPORTS = 157,\r
+    STR_EXTREME_SKATEBOARDING = 158,\r
+    STR_EXTREME_ROCKCLIMBING = 159,\r
+    STR_EXTREME_BUNGEEJUMPING = 160,\r
+    STR_EXTREME_PARKOUR = 161,\r
+    STR_EXTREME_BMX = 162,\r
+    STR_EXTREME_ORIENTEERING = 163,\r
+    STR_EXTREME_PARACHUTE = 164,\r
+    STR_EXTREME_RACING = 165,\r
+    STR_EXTREME_TRIATHLONS = 166,\r
+    STR_OTHER_ELEVATOR = 167,\r
+    STR_OTHER_ESCALATOR = 168,\r
+    STR_OTHER_GARDENING = 169,\r
+    STR_OTHER_HORSEWORK = 170,\r
+    STR_OTHER_INVEHICLE = 171,\r
+    STR_OTHER_MEDITATION = 172,\r
+    STR_OTHER_STILL = 173,\r
+    STR_OTHER_TILTING = 174,\r
+    STR_OTHER_WHEELCHAIR = 175,\r
+    STR_EXERCISE_LIST = 176,\r
+    STR_BALL_LIST = 177,\r
+    STR_WATER_LIST = 178,\r
+    STR_DANCING_LIST = 179,\r
+    STR_EXTREME_LIST = 180,\r
+    STR_ICE_LIST = 181,\r
+    STR_RECREATIONAL_LIST = 182,\r
+    STR_OTHER_LIST = 183,\r
+    STR_DANCING_TITLE = 184,\r
+    STR_BALL_LIST_TITLE = 185,\r
+    STR_OTHER_TITLE = 186,\r
+    STR_EXERCISE_TITLE = 187,\r
+    STR_TRAINING = 188,\r
     STR_RAPID_TRAINING = 189,\r
     STR_SET_GOALS = 190,\r
     STR_DURATION = 191,\r
index 4360731..68dfe84 100644 (file)
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