From: Caisking <3449750381@qq.com>
Date: Mon, 1 Apr 2024 08:06:50 +0000 (+0800)
Subject: 1.更新多国语言脚本工具,使用特殊分隔符“$”进行键与键值分割,实现可以使用语句在列表;2.配置主界面卡片多国语言;
X-Git-Tag: release_V1.2.70_20241020_135402~1241^2~2
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=cb02e3fff4d303057df4c6bb787b3a2932e21f1a;p=mirrors%2FFD230.git
1.更新多国语言脚本工具,使用特殊分隔符“$”进行键与键值分割,实现可以使用语句在列表;2.配置主界面卡片多国语言;
3.更新语言列表注意查收
---
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 067d7d641..808961600 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
@@ -1,190 +1,239 @@
-STR_EXERCISE_GENERAL,Exercise general
-STR_EXERCISE_FREETRAINING,Free training
-STR_EXERCISE_RESISTANCETRAINING,Resistance training
-STR_EXERCISE_SPINBIKE,Spin bike
-STR_EXERCISE_TREADMILL,Treadmill
-STR_EXERCISE_STROLLMACHINE,Stroll machine
-STR_EXERCISE_HIIT,High intense interval training
-STR_EXERCISE_CROSSFIT,Crossfit
-STR_EXERCISE_GROUPCALISTHENICS,Group calisthenics
-STR_EXERCISE_YOGA,Yoga
-STR_EXERCISE_YOGACAT,Yoga cat
-STR_EXERCISE_YOGACOW,Yoga cow
-STR_EXERCISE_YOGACOBRA,Yoga cobra
-STR_EXERCISE_YOGAHERO1,Yoga hero1
-STR_EXERCISE_YOGAHERO2,Yoga hero2
-STR_EXERCISE_YOGAHERO3,Yoga hero3
-STR_EXERCISE_YOGAROLLING,Yoga rolling
-STR_EXERCISE_OUTDOORWALKING,Outdoor walking
-STR_EXERCISE_OUTDOORRUNNING,Outdoor running
-STR_EXERCISE_INDOORWALKING,Indoor walking
-STR_EXERCISE_INDOORRUNNING,Indoor running
-STR_EXERCISE_OUTDOORBIKING,Outdoor biking
-STR_EXERCISE_JUMPINGROPE,Jumping rope
-STR_EXERCISE_PILATES,Pilates
-STR_EXERCISE_CROSS_FIT,Cross fit
-STR_EXERCISE_FUNCTIONALTRAINING,Functional training
-STR_EXERCISE_PHYSICALTRAINING,Physical Training
-STR_EXERCISE_TAEKWONDO,Taekwondo
-STR_EXERCISE_BOXING,Boxing
-STR_EXERCISE_KICKBOXING,Kickboxing
-STR_EXERCISE_KARATE,Karate
-STR_EXERCISE_FENCING,Fencing
-STR_EXERCISE_CORETRAINING,Core training
-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_AEROBICS,Aerobics
-STR_EXERCISE_CALISTHENICE,Calisthenice
-STR_EXERCISE_P90X,P90X
-STR_EXERCISE_KETTLEBELLTRAINING,Kettlebell Training
-STR_EXERCISE_MIXEDMARTIALARTS,Mixed martial arts
-STR_EXERCISE_STAIRCLIMBINGMACHINE,Stair climbing machine
-STR_EXERCISE_WEIGHTLIFTING,Weightlifting
-STR_EXERCISE_BARRE,Barre
-STR_EXERCISE_HANDCYCLING,Hand cycling
-STR_EXERCISE_TRACKFIELD,Track field
-STR_EXERCISE_WRESTLING,Wrestling
-STR_EXERCISE_MINDBODY,Mind body
-STR_EXERCISE_FLEXIBILITY,Flexibility
-STR_EXERCISE_MIXEDCARDIO,Mixed cardio
-STR_EXERCISE_TRADITIONALSTRENGTHTRAINING,Traditional strength training
-STR_EXERCISE_CROSSTRAINING,Cross training
-STR_EXERCISE_GYMNASTICS,Gymnastics
-STR_EXERCISE_STEPTRAINING,Step training
-STR_EXERCISE_ELLIPTICALTRAINER,Elliptical trainer
-STR_EXERCISE_ROWINGMACHINE,Rowing machine
-STR_DANCING_GENERAL,Dancing general
-STR_DANCING_BELLY,Belly dance
-STR_DANCING_JAZZ,Jazz dance
-STR_DANCING_LATIN,Latin dance
-STR_DANCING_BALLET,Ballet dance
-STR_DANCING_STREET,Street dance
-STR_DANCING_PUBLICSQUARE,Public square dancing
-STR_DANCING_ZUMBA,Zumba
-STR_DANCING_SOCIALDANCE,Social dance
-STR_DANCING_TAPDANCE,Tap dance
-STR_RECREATIONAL_SPORTS,Recreational Sports
-STR_RECREATIONAL_SKATING,Roller Skating
-STR_RECREATIONAL_MARTIALARTS,Martial arts
-STR_RECREATIONAL_TAICHI,Tai Chi
-STR_RECREATIONAL_HULAHOOP,Hula hoop
-STR_RECREATIONAL_DISCSPORT,Disc sport
-STR_RECREATIONAL_DARTS,Darts
-STR_RECREATIONAL_ARCHERY,Archery
-STR_RECREATIONAL_HORSERIDING,Horse riding
-STR_RECREATIONAL_BATTLEGAME,Battle game
-STR_RECREATIONAL_KITE,Fly a kite
-STR_RECREATIONAL_TUGOFWAR,Tug of war
-STR_RECREATIONAL_SWING,Swing
-STR_RECREATIONAL_STAIRCLIMBING,Stair climbing
-STR_RECREATIONAL_OBSTACLERACE,Obstacle race
-STR_RECREATIONAL_FISHING,Fishing
-STR_RECREATIONAL_HUNTING,Hunting
-STR_RECREATIONAL_SCOOTERRIDING,Scooter Riding
-STR_RECREATIONAL_PARAGLIDING,Paragliding
-STR_RECREATIONAL_TEAMSPORTS,Team sports
-STR_RECREATIONAL_FINESSGAMING,Finess gaming
-STR_RECREATIONAL_HIKING,Hiking
-STR_RECREATIONAL_EQUESTRIANSPORTS,Equestrian sports
-STR_RECREATIONAL_PLAY,Play
-STR_BALL_GAMES,Ball games
-STR_BALL_BADMINTON,Badminton
-STR_BALL_TABLETENNIS,Table tennis
-STR_BALL_TENNIS,Tennis
-STR_BALL_BILLIARDS,Billiards
-STR_BALL_BOWLING,Bowling
-STR_BALL_VOLLEYBALL,Volleyball
-STR_BALL_SHUTTLECOCK,Shuttlecock
-STR_BALL_HANDBALL,Handball
-STR_BALL_BASEBALL,Baseball
-STR_BALL_SOFTBALL,Softball
-STR_BALL_CRICKET,Cricket
-STR_BALL_FOOTBALL,Football
-STR_BALL_BEACHSOCCER,Beach soccer
-STR_BALL_BEACHVOLLEYBALL,Beach volleyball
-STR_BALL_CROQUET,Croquet
-STR_BALL_HOCKEY,Hockey
-STR_BALL_SQUASH,Squash
-STR_BALL_SEPAKTAKRAW,Sepak takraw
-STR_BALL_DODGEBALL,Dodge ball
-STR_BALL_BASKETBALL,Basketball
-STR_BALL_SOCCER,Soccer
-STR_BALL_GOLF,Golf
-STR_BALL_POLO,Polo
-STR_BALL_RACQUETBALL,Racquetball
-STR_BALL_RUGBY,Rugby
-STR_BALL_GATEBALL,Gateball
-STR_BALL_PICKLEBALL,Pickleball
-STR_BALL_LACROSSE,Lacrosse
-STR_WATER_ACTIVITIES,Water activities
-STR_WATER_SAILING,Sailing
-STR_WATER_SURFING,Surfing
-STR_WATER_WHITEWATERRAFTING,Whitewater rafting
-STR_WATER_CANOEING,Canoeing
-STR_WATER_KAYAKING,Kayaking
-STR_WATER_ROWING,Rowing
-STR_WATER_MOTORBOAT,Motorboat
-STR_WATER_SUP,SUP
-STR_WATER_SCUBADIVING,Scuba diving
-STR_WATER_DIVING,Diving
-STR_WATER_KITESURFING,Kitesurfing
-STR_WATER_WAKEBOARDING,Wakeboarding
-STR_WATER_POLO,Water Polo
-STR_WATER_WINDSURFING,Windsurfing
-STR_WATER_DRIFTING,Drifting
-STR_WATER_FITNESS,Water fitness
-STR_WATER_SPORTS,Water sports
-STR_WATER_OUTDOORSWIM,Outdoor swim
-STR_WATER_INDOORSWIM,Indoor swim
-STR_WATER_SWIMFREESTYLE,Swim freestyle
-STR_WATER_SWIMBREASTSTROKE,Swim
-STR_WATER_SWIMBACKSTROKE,Swim
-STR_WATER_SWIMBUTTERFLY,Swim
-STR_ICE_SPORTS,Ice sports
-STR_ICE_SKATING,Skating
-STR_ICE_HOCKEY,Hockey
-STR_ICE_CURLING,Curling
-STR_ICE_SNOWMOBILING,Snow mobiling
-STR_ICE_SLED,Sled
-STR_ICE_BIATHLON,Biathlon
-STR_ICE_CROSSCOUNTRYSKING,Crosscountry sking
-STR_ICE_SKIING,Skiing
-STR_ICE_SNOWBOARDING,Snowboarding
-STR_ICE_SNOWSHOEING,Snowshoeing
-STR_ICE_SNOWSPORTS,Snow sport
-STR_EXTREME_SPORTS,Extreme sports
-STR_EXTREME_SKATEBOARDING,Skateboarding
-STR_EXTREME_ROCKCLIMBING,Rock climbing
-STR_EXTREME_BUNGEEJUMPING,Bungee Jumping
-STR_EXTREME_PARKOUR,Parkour
-STR_EXTREME_BMX,Bike motocross
-STR_EXTREME_ORIENTEERING,Orienteering
-STR_EXTREME_PARACHUTE,Parachute
-STR_EXTREME_RACING,Racing
-STR_EXTREME_TRIATHLONS,Triathlons
-STR_OTHER_ELEVATOR,Elevator
-STR_OTHER_ESCALATOR,Escalator
-STR_OTHER_GARDENING,Gardening
-STR_OTHER_HORSEWORK,House Work
-STR_OTHER_INVEHICLE,In Vehicle
-STR_OTHER_MEDITATION,Meditation
-STR_OTHER_STILL,Still
-STR_OTHER_TILTING,Tilting
-STR_OTHER_WHEELCHAIR,Wheelchair
-STR_EXERCISE_LIST,Exercise
-STR_BALL_LIST,Ball
-STR_WATER_LIST,Water
-STR_DANCING_LIST,Dance
-STR_EXTREME_LIST,Extreme
-STR_ICE_LIST,Ice
-STR_RECREATIONAL_LIST,Recreational
-STR_OTHER_LIST,Other
-STR_DANCING_TITLE,Dance Sport
-STR_BALL_LIST_TITLE,Ball Sport
-STR_OTHER_TITLE,Other Sport
-STR_EXERCISE_TITLE,Exercise Sport
-STR_TRAINING,Training
-STR_LANGUAGE,Language
\ No newline at end of file
+STR_EXERCISE_GENERAL$Exercise general
+STR_EXERCISE_FREETRAINING$Free training
+STR_EXERCISE_RESISTANCETRAINING$Resistance training
+STR_EXERCISE_SPINBIKE$Spin bike
+STR_EXERCISE_TREADMILL$Treadmill
+STR_EXERCISE_STROLLMACHINE$Stroll machine
+STR_EXERCISE_HIIT$High intense interval training
+STR_EXERCISE_CROSSFIT$Crossfit
+STR_EXERCISE_GROUPCALISTHENICS$Group calisthenics
+STR_EXERCISE_YOGA$Yoga
+STR_EXERCISE_YOGACAT$Yoga cat
+STR_EXERCISE_YOGACOW$Yoga cow
+STR_EXERCISE_YOGACOBRA$Yoga cobra
+STR_EXERCISE_YOGAHERO1$Yoga hero1
+STR_EXERCISE_YOGAHERO2$Yoga hero2
+STR_EXERCISE_YOGAHERO3$Yoga hero3
+STR_EXERCISE_YOGAROLLING$Yoga rolling
+STR_EXERCISE_OUTDOORWALKING$Outdoor walking
+STR_EXERCISE_OUTDOORRUNNING$Outdoor running
+STR_EXERCISE_INDOORWALKING$Indoor walking
+STR_EXERCISE_INDOORRUNNING$Indoor running
+STR_EXERCISE_OUTDOORBIKING$Outdoor biking
+STR_EXERCISE_JUMPINGROPE$Jumping rope
+STR_EXERCISE_PILATES$Pilates
+STR_EXERCISE_CROSS_FIT$Cross fit
+STR_EXERCISE_FUNCTIONALTRAINING$Functional training
+STR_EXERCISE_PHYSICALTRAINING$Physical Training
+STR_EXERCISE_TAEKWONDO$Taekwondo
+STR_EXERCISE_BOXING$Boxing
+STR_EXERCISE_KICKBOXING$Kickboxing
+STR_EXERCISE_KARATE$Karate
+STR_EXERCISE_FENCING$Fencing
+STR_EXERCISE_CORETRAINING$Core training
+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_AEROBICS$Aerobics
+STR_EXERCISE_CALISTHENICE$Calisthenice
+STR_EXERCISE_P90X$P90X
+STR_EXERCISE_KETTLEBELLTRAINING$Kettlebell Training
+STR_EXERCISE_MIXEDMARTIALARTS$Mixed martial arts
+STR_EXERCISE_STAIRCLIMBINGMACHINE$Stair climbing machine
+STR_EXERCISE_WEIGHTLIFTING$Weightlifting
+STR_EXERCISE_BARRE$Barre
+STR_EXERCISE_HANDCYCLING$Hand cycling
+STR_EXERCISE_TRACKFIELD$Track field
+STR_EXERCISE_WRESTLING$Wrestling
+STR_EXERCISE_MINDBODY$Mind body
+STR_EXERCISE_FLEXIBILITY$Flexibility
+STR_EXERCISE_MIXEDCARDIO$Mixed cardio
+STR_EXERCISE_TRADITIONALSTRENGTHTRAINING$Traditional strength training
+STR_EXERCISE_CROSSTRAINING$Cross training
+STR_EXERCISE_GYMNASTICS$Gymnastics
+STR_EXERCISE_STEPTRAINING$Step training
+STR_EXERCISE_ELLIPTICALTRAINER$Elliptical trainer
+STR_EXERCISE_ROWINGMACHINE$Rowing machine
+STR_DANCING_GENERAL$Dancing general
+STR_DANCING_BELLY$Belly dance
+STR_DANCING_JAZZ$Jazz dance
+STR_DANCING_LATIN$Latin dance
+STR_DANCING_BALLET$Ballet dance
+STR_DANCING_STREET$Street dance
+STR_DANCING_PUBLICSQUARE$Public square dancing
+STR_DANCING_ZUMBA$Zumba
+STR_DANCING_SOCIALDANCE$Social dance
+STR_DANCING_TAPDANCE$Tap dance
+STR_RECREATIONAL_SPORTS$Recreational Sports
+STR_RECREATIONAL_SKATING$Roller Skating
+STR_RECREATIONAL_MARTIALARTS$Martial arts
+STR_RECREATIONAL_TAICHI$Tai Chi
+STR_RECREATIONAL_HULAHOOP$Hula hoop
+STR_RECREATIONAL_DISCSPORT$Disc sport
+STR_RECREATIONAL_DARTS$Darts
+STR_RECREATIONAL_ARCHERY$Archery
+STR_RECREATIONAL_HORSERIDING$Horse riding
+STR_RECREATIONAL_BATTLEGAME$Battle game
+STR_RECREATIONAL_KITE$Fly a kite
+STR_RECREATIONAL_TUGOFWAR$Tug of war
+STR_RECREATIONAL_SWING$Swing
+STR_RECREATIONAL_STAIRCLIMBING$Stair climbing
+STR_RECREATIONAL_OBSTACLERACE$Obstacle race
+STR_RECREATIONAL_FISHING$Fishing
+STR_RECREATIONAL_HUNTING$Hunting
+STR_RECREATIONAL_SCOOTERRIDING$Scooter Riding
+STR_RECREATIONAL_PARAGLIDING$Paragliding
+STR_RECREATIONAL_TEAMSPORTS$Team sports
+STR_RECREATIONAL_FINESSGAMING$Finess gaming
+STR_RECREATIONAL_HIKING$Hiking
+STR_RECREATIONAL_EQUESTRIANSPORTS$Equestrian sports
+STR_RECREATIONAL_PLAY$Play
+STR_BALL_GAMES$Ball games
+STR_BALL_BADMINTON$Badminton
+STR_BALL_TABLETENNIS$Table tennis
+STR_BALL_TENNIS$Tennis
+STR_BALL_BILLIARDS$Billiards
+STR_BALL_BOWLING$Bowling
+STR_BALL_VOLLEYBALL$Volleyball
+STR_BALL_SHUTTLECOCK$Shuttlecock
+STR_BALL_HANDBALL$Handball
+STR_BALL_BASEBALL$Baseball
+STR_BALL_SOFTBALL$Softball
+STR_BALL_CRICKET$Cricket
+STR_BALL_FOOTBALL$Football
+STR_BALL_BEACHSOCCER$Beach soccer
+STR_BALL_BEACHVOLLEYBALL$Beach volleyball
+STR_BALL_CROQUET$Croquet
+STR_BALL_HOCKEY$Hockey
+STR_BALL_SQUASH$Squash
+STR_BALL_SEPAKTAKRAW$Sepak takraw
+STR_BALL_DODGEBALL$Dodge ball
+STR_BALL_BASKETBALL$Basketball
+STR_BALL_SOCCER$Soccer
+STR_BALL_GOLF$Golf
+STR_BALL_POLO$Polo
+STR_BALL_RACQUETBALL$Racquetball
+STR_BALL_RUGBY$Rugby
+STR_BALL_GATEBALL$Gateball
+STR_BALL_PICKLEBALL$Pickleball
+STR_BALL_LACROSSE$Lacrosse
+STR_WATER_ACTIVITIES$Water activities
+STR_WATER_SAILING$Sailing
+STR_WATER_SURFING$Surfing
+STR_WATER_WHITEWATERRAFTING$Whitewater rafting
+STR_WATER_CANOEING$Canoeing
+STR_WATER_KAYAKING$Kayaking
+STR_WATER_ROWING$Rowing
+STR_WATER_MOTORBOAT$Motorboat
+STR_WATER_SUP$SUP
+STR_WATER_SCUBADIVING$Scuba diving
+STR_WATER_DIVING$Diving
+STR_WATER_KITESURFING$Kitesurfing
+STR_WATER_WAKEBOARDING$Wakeboarding
+STR_WATER_POLO$Water Polo
+STR_WATER_WINDSURFING$Windsurfing
+STR_WATER_DRIFTING$Drifting
+STR_WATER_FITNESS$Water fitness
+STR_WATER_SPORTS$Water sports
+STR_WATER_OUTDOORSWIM$Outdoor swim
+STR_WATER_INDOORSWIM$Indoor swim
+STR_WATER_SWIMFREESTYLE$Swim freestyle
+STR_WATER_SWIMBREASTSTROKE$Swim
+STR_WATER_SWIMBACKSTROKE$Swim
+STR_WATER_SWIMBUTTERFLY$Swim
+STR_ICE_SPORTS$Ice sports
+STR_ICE_SKATING$Skating
+STR_ICE_HOCKEY$Hockey
+STR_ICE_CURLING$Curling
+STR_ICE_SNOWMOBILING$Snow mobiling
+STR_ICE_SLED$Sled
+STR_ICE_BIATHLON$Biathlon
+STR_ICE_CROSSCOUNTRYSKING$Crosscountry sking
+STR_ICE_SKIING$Skiing
+STR_ICE_SNOWBOARDING$Snowboarding
+STR_ICE_SNOWSHOEING$Snowshoeing
+STR_ICE_SNOWSPORTS$Snow sport
+STR_EXTREME_SPORTS$Extreme sports
+STR_EXTREME_SKATEBOARDING$Skateboarding
+STR_EXTREME_ROCKCLIMBING$Rock climbing
+STR_EXTREME_BUNGEEJUMPING$Bungee Jumping
+STR_EXTREME_PARKOUR$Parkour
+STR_EXTREME_BMX$Bike motocross
+STR_EXTREME_ORIENTEERING$Orienteering
+STR_EXTREME_PARACHUTE$Parachute
+STR_EXTREME_RACING$Racing
+STR_EXTREME_TRIATHLONS$Triathlons
+STR_OTHER_ELEVATOR$Elevator
+STR_OTHER_ESCALATOR$Escalator
+STR_OTHER_GARDENING$Gardening
+STR_OTHER_HORSEWORK$House Work
+STR_OTHER_INVEHICLE$In Vehicle
+STR_OTHER_MEDITATION$Meditation
+STR_OTHER_STILL$Still
+STR_OTHER_TILTING$Tilting
+STR_OTHER_WHEELCHAIR$Wheelchair
+STR_EXERCISE_LIST$Exercise
+STR_BALL_LIST$Ball
+STR_WATER_LIST$Water
+STR_DANCING_LIST$Dance
+STR_EXTREME_LIST$Extreme
+STR_ICE_LIST$Ice
+STR_RECREATIONAL_LIST$Recreational
+STR_OTHER_LIST$Other
+STR_DANCING_TITLE$Dance Sport
+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_DURATION$duration
+STR_DURATION_SETTING$Duration setting
+STR_MINUTES$minutes
+STR_CALORIE$calorie
+STR_CALORIE_SETTING$Calorie setting
+STR_KILOCALORIE$kilocalorie
+STR_DISTANCE$distance
+STR_RANGE_SETTING$Range setting
+STR_METER$meter.
+STR_KILOMETRE$kilometre
+STR_STEP_NUMBER$Step number
+STR_STEP_SETTING$Step setting
+STR_STEP$step
+STR_HEART_RATE$Heart rate
+STR_MEAN_HEART_RATE$Mean heart rate
+STR_TIMES_PER_MIN$Times/min
+STR_MEAN_HEART_RATE_MIN$Mean heart rate(Times/min)
+STR_IN_THE$In the
+STR_LOWER_STRENGTH$Lower strength
+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_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_IN_PROGRESS$Training in progress
+STR_BREAK_TRAINING$Break training
+STR_FINISH$finish
+STR_PAUSE$Pause
+STR_RESUME$Resume
+STR_GOAL_ACHIEVED$Goal achieved
+STR_ACCOMPLISH_GOAL$Accomplish the goal
+STR_OK$OK
+STR_LOOK_OUT$Look out
+STR_INSUFFICIENT_EXERCISE_AMOUNT$The current amount of exercise is too small to record whether to end the exercise
+STR_END_MOVEMENT$End movement
+STR_END_THIS_MOVEMENT$Whether to end this movement
+STR_GOAL_ACCOMPLISHMENT_DEGREE$Goal accomplishment degree
+STR_TRAINING_DURATION$Training duration
+STR_OFF$Off
+STR_MORE$More
\ No newline at end of file
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 d3ab46d28..7e7a8451a 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
@@ -1,190 +1,239 @@
-STR_EXERCISE_GENERAL,ä¸è¬é»ç¼
-STR_EXERCISE_FREETRAINING,èªç±è®ç»
-STR_EXERCISE_RESISTANCETRAINING,èåè®ç»
-STR_EXERCISE_SPINBIKE,é£è½®è½¦/室å
å¥èº«è½¦
-STR_EXERCISE_TREADMILL,è¸æ¥æº
-STR_EXERCISE_STROLLMACHINE,æ¼«æ¥æº
-STR_EXERCISE_HIIT,HIIT/é«å¼ºåº¦é´æè®ç»
-STR_EXERCISE_CROSSFIT,å¥èº«
-STR_EXERCISE_GROUPCALISTHENICS,å¢ä½æ
-STR_EXERCISE_YOGA,çç
-STR_EXERCISE_YOGACAT,ççç«å¼
-STR_EXERCISE_YOGACOW,çççå¼
-STR_EXERCISE_YOGACOBRA,ççç¼éèå¼
-STR_EXERCISE_YOGAHERO1,ççè±éå¼1
-STR_EXERCISE_YOGAHERO2,ççè±éå¼2
-STR_EXERCISE_YOGAHERO3,ççè±éå¼3
-STR_EXERCISE_YOGAROLLING,ççæ»è½®
-STR_EXERCISE_OUTDOORWALKING,室å¤èµ°è·¯
-STR_EXERCISE_OUTDOORRUNNING,室å¤è·æ¥
-STR_EXERCISE_INDOORWALKING,室å
èµ°è·¯
-STR_EXERCISE_INDOORRUNNING,室å
è·æ¥
-STR_EXERCISE_OUTDOORBIKING,室å¤éªè¡
-STR_EXERCISE_JUMPINGROPE,跳绳
-STR_EXERCISE_PILATES,ç®æææ¯
-STR_EXERCISE_CROSS_FIT,æ··åå¥èº«
-STR_EXERCISE_FUNCTIONALTRAINING,åè½æ§è®ç»
-STR_EXERCISE_PHYSICALTRAINING,ä½è½è®ç»
-STR_EXERCISE_TAEKWONDO,è·æ³é/踢æ³
-STR_EXERCISE_BOXING,æ³å»
-STR_EXERCISE_KICKBOXING,èªç±æå»
-STR_EXERCISE_KARATE,空æé
-STR_EXERCISE_FENCING,å»å
-STR_EXERCISE_CORETRAINING,æ ¸å¿è®ç»
-STR_EXERCISE_BODYCOMBAT,æ³å»ææ°§
-STR_EXERCISE_KENDO,åé
-STR_EXERCISE_HORIZONTALBAR,åæ
-STR_EXERCISE_PARALLELBARS,åæ
-STR_EXERCISE_CROSSFIT,循ç¯è®ç»
-STR_EXERCISE_AEROBICS,ææ°§è¿å¨
-STR_EXERCISE_CALISTHENICE,å¥ç¾æ
-STR_EXERCISE_P90X,P90X
-STR_EXERCISE_KETTLEBELLTRAINING,壶éè®ç»
-STR_EXERCISE_MIXEDMARTIALARTS,ç»¼åæ ¼æ
-STR_EXERCISE_STAIRCLIMBINGMACHINE,ç¬æ¥¼æ¢¯æº
-STR_EXERCISE_WEIGHTLIFTING,举é
-STR_EXERCISE_BARRE,Barre
-STR_EXERCISE_HANDCYCLING,æè½®
-STR_EXERCISE_TRACKFIELD,ç°å¾
-STR_EXERCISE_WRESTLING,è§å
-STR_EXERCISE_MINDBODY,身å¿è¿å¨
-STR_EXERCISE_FLEXIBILITY,æè½¯æ
-STR_EXERCISE_MIXEDCARDIO,æ··åææ°§
-STR_EXERCISE_TRADITIONALSTRENGTHTRAINING,ä¼ ç»èåè®ç»
-STR_EXERCISE_CROSSTRAINING,交åè®ç»
-STR_EXERCISE_GYMNASTICS,使
-STR_EXERCISE_STEPTRAINING,é¶æ¢¯è®ç»
-STR_EXERCISE_ELLIPTICALTRAINER,æ¤åæº
-STR_EXERCISE_ROWINGMACHINE,åè¹æº
-STR_DANCING_GENERAL,ä¸è¬èè¹
-STR_DANCING_BELLY,èç®è
-STR_DANCING_JAZZ,çµå£«è
-STR_DANCING_LATIN,æä¸è
-STR_DANCING_BALLET,èè¾
-STR_DANCING_STREET,è¡è
-STR_DANCING_PUBLICSQUARE,广åºè
-STR_DANCING_ZUMBA,å°å·´
-STR_DANCING_SOCIALDANCE,社交è
-STR_DANCING_TAPDANCE,踢è¸è
-STR_RECREATIONAL_SPORTS,ä¸è¬ä¼é²è¿å¨
-STR_RECREATIONAL_SKATING,æ»è½®æºå°
-STR_RECREATIONAL_MARTIALARTS,æ¦æ¯
-STR_RECREATIONAL_TAICHI,å¤ªææ³
-STR_RECREATIONAL_HULAHOOP,弿å
-STR_RECREATIONAL_DISCSPORT,é£ç
-STR_RECREATIONAL_DARTS,é£é
-STR_RECREATIONAL_ARCHERY,å°ç®
-STR_RECREATIONAL_HORSERIDING,éªé©¬
-STR_RECREATIONAL_BATTLEGAME,å¯¹ææ¸¸æ
-STR_RECREATIONAL_KITE,æ¾é£ç
-STR_RECREATIONAL_TUGOFWAR,ææ²³
-STR_RECREATIONAL_SWING,é¦é
-STR_RECREATIONAL_STAIRCLIMBING,ç¬æ¥¼æ¢¯
-STR_RECREATIONAL_OBSTACLERACE,éç¢èµ
-STR_RECREATIONAL_FISHING,éé±¼
-STR_RECREATIONAL_HUNTING,æç
-STR_RECREATIONAL_SCOOTERRIDING,æ»æ¿è½¦
-STR_RECREATIONAL_PARAGLIDING,æ»ç¿ä¼
-STR_RECREATIONAL_TEAMSPORTS,å¢éç«æ
-STR_RECREATIONAL_FINESSGAMING,å¥èº«çµç©
-STR_RECREATIONAL_HIKING,å¥è¡
-STR_RECREATIONAL_EQUESTRIANSPORTS,马æ¯è¿å¨
-STR_RECREATIONAL_PLAY,ç©ä¹
-STR_BALL_GAMES,ä¸è¬çç±»è¿å¨
-STR_BALL_BADMINTON,ç¾½æ¯ç
-STR_BALL_TABLETENNIS,ä¹ä¹ç
-STR_BALL_TENNIS,ç½ç
-STR_BALL_BILLIARDS,æç
-STR_BALL_BOWLING,ä¿é¾ç
-STR_BALL_VOLLEYBALL,æç
-STR_BALL_SHUTTLECOCK,毽åç
-STR_BALL_HANDBALL,æç
-STR_BALL_BASEBALL,æ£ç
-STR_BALL_SOFTBALL,åç
-STR_BALL_CRICKET,æ¿ç
-STR_BALL_FOOTBALL,ç¾å¼æ©æ¦ç
-STR_BALL_BEACHSOCCER,æ²æ»©è¶³ç
-STR_BALL_BEACHVOLLEYBALL,æ²æ»©æç
-STR_BALL_CROQUET,æ§ç
-STR_BALL_HOCKEY,æ²æ£ç
-STR_BALL_SQUASH,è±å¼å£ç
-STR_BALL_SEPAKTAKRAW,è¤ç
-STR_BALL_DODGEBALL,躲é¿ç
-STR_BALL_BASKETBALL,篮ç
-STR_BALL_SOCCER,è¶³ç
-STR_BALL_GOLF,é«å°å¤«ç
-STR_BALL_POLO,马ç
-STR_BALL_RACQUETBALL,ç¾å¼å£ç
-STR_BALL_RUGBY,è±å¼æ©æ¦ç
-STR_BALL_GATEBALL,é¨ç
-STR_BALL_PICKLEBALL,å¹å
ç
-STR_BALL_LACROSSE,è¢æ£ç
-STR_WATER_ACTIVITIES,ä¸è¬æ°´ä¸æ´»å¨
-STR_WATER_SAILING,å¸è¹
-STR_WATER_SURFING,岿µª
-STR_WATER_WHITEWATERRAFTING,æ³è
-STR_WATER_CANOEING,åé¾è
-STR_WATER_KAYAKING,è½»è
-STR_WATER_ROWING,èµè
-STR_WATER_MOTORBOAT,æ°´ä¸æ©æè½¦
-STR_WATER_SUP,ç«æ¡¨å²æµª
-STR_WATER_SCUBADIVING,æ½æ°´
-STR_WATER_DIVING,跳水
-STR_WATER_KITESURFING,æ»ç¿ä¼å²æµª
-STR_WATER_WAKEBOARDING,岿µªæ»æ°´
-STR_WATER_POLO,æ°´ç
-STR_WATER_WINDSURFING,é£å¸å²æµª
-STR_WATER_DRIFTING,æ¼æµæ´»å¨
-STR_WATER_FITNESS,æ°´ä¸å¥èº«
-STR_WATER_SPORTS,æ°´ä¸è¿å¨
-STR_WATER_OUTDOORSWIM,æ·å¤æ¸¸æ³³
-STR_WATER_INDOORSWIM,室å
游泳
-STR_WATER_SWIMFREESTYLE,游泳_èªç±å¼
-STR_WATER_SWIMBREASTSTROKE,游泳_èå¼
-STR_WATER_SWIMBACKSTROKE,游泳_ä»°å¼
-STR_WATER_SWIMBUTTERFLY,游泳_è¶å¼
-STR_ICE_SPORTS,ä¸è¬å°ä¸è¿å¨
-STR_ICE_SKATING,æºå°
-STR_ICE_HOCKEY,å°ç
-STR_ICE_CURLING,å°ç³å£¶/å°å£¶
-STR_ICE_SNOWMOBILING,éªä¸æ©æè½¦
-STR_ICE_SLED,éªæ©
-STR_ICE_BIATHLON,å¬å£ä¸¤é¡¹
-STR_ICE_CROSSCOUNTRYSKING,è¶éæ»éª
-STR_ICE_SKIING,æ»éª
-STR_ICE_SNOWBOARDING,åæ¿æ»éª/æ»éªæ¿
-STR_ICE_SNOWSHOEING,éªéå¥è¡
-STR_ICE_SNOWSPORTS,éªå°è¿å¨
-STR_EXTREME_SPORTS,ä¸è¬æéè¿å¨
-STR_EXTREME_SKATEBOARDING,æ»æ¿
-STR_EXTREME_ROCKCLIMBING,æå²©
-STR_EXTREME_BUNGEEJUMPING,é«ç©ºå¼¹è·³/è¹¦ææ´»å¨
-STR_EXTREME_PARKOUR,è·é
·
-STR_EXTREME_BMX,BMX
-STR_EXTREME_ORIENTEERING,å®åè¶é
-STR_EXTREME_PARACHUTE,è·³ä¼
-STR_EXTREME_RACING,èµè½¦
-STR_EXTREME_TRIATHLONS,é人ä¸é¡¹è¿å¨
-STR_OTHER_ELEVATOR,ä¹çµæ¢¯
-STR_OTHER_ESCALATOR,ä¹ææ¶æ¢¯
-STR_OTHER_GARDENING,ååèº
-STR_OTHER_HORSEWORK,åå®¶å¡
-STR_OTHER_INVEHICLE,å¨è½¦é
-STR_OTHER_MEDITATION,奿³
-STR_OTHER_STILL,鿢
-STR_OTHER_TILTING,徿
-STR_OTHER_WHEELCHAIR,åè½®æ¤
ç§»å¨
-STR_EXERCISE_LIST,å¥èº«ç±»
-STR_BALL_LIST,çç±»
-STR_WATER_LIST,æ°´ä¸è¿å¨
-STR_DANCING_LIST,èè¹ç±»
-STR_EXTREME_LIST,æéè¿å¨
-STR_ICE_LIST,å°ä¸è¿å¨
-STR_RECREATIONAL_LIST,ä¼é²è¿å¨
-STR_OTHER_LIST,å
¶ä»
-STR_DANCING_TITLE,èè¹è¿å¨
-STR_BALL_LIST_TITLE,çç±»è¿å¨
-STR_OTHER_TITLE,å
¶ä»è¿å¨
-STR_EXERCISE_TITLE,å¥èº«è¿å¨
-STR_TRAINING,è®ç»
-STR_LANGUAGE,è¯è¨
\ No newline at end of file
+STR_EXERCISE_GENERAL$ä¸è¬é»ç¼
+STR_EXERCISE_FREETRAINING$èªç±è®ç»
+STR_EXERCISE_RESISTANCETRAINING$èåè®ç»
+STR_EXERCISE_SPINBIKE$é£è½®è½¦/室å
å¥èº«è½¦
+STR_EXERCISE_TREADMILL$è¸æ¥æº
+STR_EXERCISE_STROLLMACHINE$æ¼«æ¥æº
+STR_EXERCISE_HIIT$HIIT/é«å¼ºåº¦é´æè®ç»
+STR_EXERCISE_CROSSFIT$å¥èº«
+STR_EXERCISE_GROUPCALISTHENICS$å¢ä½æ
+STR_EXERCISE_YOGA$çç
+STR_EXERCISE_YOGACAT$ççç«å¼
+STR_EXERCISE_YOGACOW$çççå¼
+STR_EXERCISE_YOGACOBRA$ççç¼éèå¼
+STR_EXERCISE_YOGAHERO1$ççè±éå¼1
+STR_EXERCISE_YOGAHERO2$ççè±éå¼2
+STR_EXERCISE_YOGAHERO3$ççè±éå¼3
+STR_EXERCISE_YOGAROLLING$ççæ»è½®
+STR_EXERCISE_OUTDOORWALKING$室å¤èµ°è·¯
+STR_EXERCISE_OUTDOORRUNNING$室å¤è·æ¥
+STR_EXERCISE_INDOORWALKING$室å
èµ°è·¯
+STR_EXERCISE_INDOORRUNNING$室å
è·æ¥
+STR_EXERCISE_OUTDOORBIKING$室å¤éªè¡
+STR_EXERCISE_JUMPINGROPE$跳绳
+STR_EXERCISE_PILATES$ç®æææ¯
+STR_EXERCISE_CROSS_FIT$æ··åå¥èº«
+STR_EXERCISE_FUNCTIONALTRAINING$åè½æ§è®ç»
+STR_EXERCISE_PHYSICALTRAINING$ä½è½è®ç»
+STR_EXERCISE_TAEKWONDO$è·æ³é/踢æ³
+STR_EXERCISE_BOXING$æ³å»
+STR_EXERCISE_KICKBOXING$èªç±æå»
+STR_EXERCISE_KARATE$空æé
+STR_EXERCISE_FENCING$å»å
+STR_EXERCISE_CORETRAINING$æ ¸å¿è®ç»
+STR_EXERCISE_BODYCOMBAT$æ³å»ææ°§
+STR_EXERCISE_KENDO$åé
+STR_EXERCISE_HORIZONTALBAR$åæ
+STR_EXERCISE_PARALLELBARS$åæ
+STR_EXERCISE_CROSSFIT$循ç¯è®ç»
+STR_EXERCISE_AEROBICS$ææ°§è¿å¨
+STR_EXERCISE_CALISTHENICE$å¥ç¾æ
+STR_EXERCISE_P90X$P90X
+STR_EXERCISE_KETTLEBELLTRAINING$壶éè®ç»
+STR_EXERCISE_MIXEDMARTIALARTS$ç»¼åæ ¼æ
+STR_EXERCISE_STAIRCLIMBINGMACHINE$ç¬æ¥¼æ¢¯æº
+STR_EXERCISE_WEIGHTLIFTING$举é
+STR_EXERCISE_BARRE$Barre
+STR_EXERCISE_HANDCYCLING$æè½®
+STR_EXERCISE_TRACKFIELD$ç°å¾
+STR_EXERCISE_WRESTLING$è§å
+STR_EXERCISE_MINDBODY$身å¿è¿å¨
+STR_EXERCISE_FLEXIBILITY$æè½¯æ
+STR_EXERCISE_MIXEDCARDIO$æ··åææ°§
+STR_EXERCISE_TRADITIONALSTRENGTHTRAINING$ä¼ ç»èåè®ç»
+STR_EXERCISE_CROSSTRAINING$交åè®ç»
+STR_EXERCISE_GYMNASTICS$使
+STR_EXERCISE_STEPTRAINING$é¶æ¢¯è®ç»
+STR_EXERCISE_ELLIPTICALTRAINER$æ¤åæº
+STR_EXERCISE_ROWINGMACHINE$åè¹æº
+STR_DANCING_GENERAL$ä¸è¬èè¹
+STR_DANCING_BELLY$èç®è
+STR_DANCING_JAZZ$çµå£«è
+STR_DANCING_LATIN$æä¸è
+STR_DANCING_BALLET$èè¾
+STR_DANCING_STREET$è¡è
+STR_DANCING_PUBLICSQUARE$广åºè
+STR_DANCING_ZUMBA$å°å·´
+STR_DANCING_SOCIALDANCE$社交è
+STR_DANCING_TAPDANCE$踢è¸è
+STR_RECREATIONAL_SPORTS$ä¸è¬ä¼é²è¿å¨
+STR_RECREATIONAL_SKATING$æ»è½®æºå°
+STR_RECREATIONAL_MARTIALARTS$æ¦æ¯
+STR_RECREATIONAL_TAICHI$å¤ªææ³
+STR_RECREATIONAL_HULAHOOP$弿å
+STR_RECREATIONAL_DISCSPORT$é£ç
+STR_RECREATIONAL_DARTS$é£é
+STR_RECREATIONAL_ARCHERY$å°ç®
+STR_RECREATIONAL_HORSERIDING$éªé©¬
+STR_RECREATIONAL_BATTLEGAME$å¯¹ææ¸¸æ
+STR_RECREATIONAL_KITE$æ¾é£ç
+STR_RECREATIONAL_TUGOFWAR$ææ²³
+STR_RECREATIONAL_SWING$é¦é
+STR_RECREATIONAL_STAIRCLIMBING$ç¬æ¥¼æ¢¯
+STR_RECREATIONAL_OBSTACLERACE$éç¢èµ
+STR_RECREATIONAL_FISHING$éé±¼
+STR_RECREATIONAL_HUNTING$æç
+STR_RECREATIONAL_SCOOTERRIDING$æ»æ¿è½¦
+STR_RECREATIONAL_PARAGLIDING$æ»ç¿ä¼
+STR_RECREATIONAL_TEAMSPORTS$å¢éç«æ
+STR_RECREATIONAL_FINESSGAMING$å¥èº«çµç©
+STR_RECREATIONAL_HIKING$å¥è¡
+STR_RECREATIONAL_EQUESTRIANSPORTS$马æ¯è¿å¨
+STR_RECREATIONAL_PLAY$ç©ä¹
+STR_BALL_GAMES$ä¸è¬çç±»è¿å¨
+STR_BALL_BADMINTON$ç¾½æ¯ç
+STR_BALL_TABLETENNIS$ä¹ä¹ç
+STR_BALL_TENNIS$ç½ç
+STR_BALL_BILLIARDS$æç
+STR_BALL_BOWLING$ä¿é¾ç
+STR_BALL_VOLLEYBALL$æç
+STR_BALL_SHUTTLECOCK$毽åç
+STR_BALL_HANDBALL$æç
+STR_BALL_BASEBALL$æ£ç
+STR_BALL_SOFTBALL$åç
+STR_BALL_CRICKET$æ¿ç
+STR_BALL_FOOTBALL$ç¾å¼æ©æ¦ç
+STR_BALL_BEACHSOCCER$æ²æ»©è¶³ç
+STR_BALL_BEACHVOLLEYBALL$æ²æ»©æç
+STR_BALL_CROQUET$æ§ç
+STR_BALL_HOCKEY$æ²æ£ç
+STR_BALL_SQUASH$è±å¼å£ç
+STR_BALL_SEPAKTAKRAW$è¤ç
+STR_BALL_DODGEBALL$躲é¿ç
+STR_BALL_BASKETBALL$篮ç
+STR_BALL_SOCCER$è¶³ç
+STR_BALL_GOLF$é«å°å¤«ç
+STR_BALL_POLO$马ç
+STR_BALL_RACQUETBALL$ç¾å¼å£ç
+STR_BALL_RUGBY$è±å¼æ©æ¦ç
+STR_BALL_GATEBALL$é¨ç
+STR_BALL_PICKLEBALL$å¹å
ç
+STR_BALL_LACROSSE$è¢æ£ç
+STR_WATER_ACTIVITIES$ä¸è¬æ°´ä¸æ´»å¨
+STR_WATER_SAILING$å¸è¹
+STR_WATER_SURFING$岿µª
+STR_WATER_WHITEWATERRAFTING$æ³è
+STR_WATER_CANOEING$åé¾è
+STR_WATER_KAYAKING$è½»è
+STR_WATER_ROWING$èµè
+STR_WATER_MOTORBOAT$æ°´ä¸æ©æè½¦
+STR_WATER_SUP$ç«æ¡¨å²æµª
+STR_WATER_SCUBADIVING$æ½æ°´
+STR_WATER_DIVING$跳水
+STR_WATER_KITESURFING$æ»ç¿ä¼å²æµª
+STR_WATER_WAKEBOARDING$岿µªæ»æ°´
+STR_WATER_POLO$æ°´ç
+STR_WATER_WINDSURFING$é£å¸å²æµª
+STR_WATER_DRIFTING$æ¼æµæ´»å¨
+STR_WATER_FITNESS$æ°´ä¸å¥èº«
+STR_WATER_SPORTS$æ°´ä¸è¿å¨
+STR_WATER_OUTDOORSWIM$æ·å¤æ¸¸æ³³
+STR_WATER_INDOORSWIM$室å
游泳
+STR_WATER_SWIMFREESTYLE$游泳_èªç±å¼
+STR_WATER_SWIMBREASTSTROKE$游泳_èå¼
+STR_WATER_SWIMBACKSTROKE$游泳_ä»°å¼
+STR_WATER_SWIMBUTTERFLY$游泳_è¶å¼
+STR_ICE_SPORTS$ä¸è¬å°ä¸è¿å¨
+STR_ICE_SKATING$æºå°
+STR_ICE_HOCKEY$å°ç
+STR_ICE_CURLING$å°ç³å£¶/å°å£¶
+STR_ICE_SNOWMOBILING$éªä¸æ©æè½¦
+STR_ICE_SLED$éªæ©
+STR_ICE_BIATHLON$å¬å£ä¸¤é¡¹
+STR_ICE_CROSSCOUNTRYSKING$è¶éæ»éª
+STR_ICE_SKIING$æ»éª
+STR_ICE_SNOWBOARDING$åæ¿æ»éª/æ»éªæ¿
+STR_ICE_SNOWSHOEING$éªéå¥è¡
+STR_ICE_SNOWSPORTS$éªå°è¿å¨
+STR_EXTREME_SPORTS$ä¸è¬æéè¿å¨
+STR_EXTREME_SKATEBOARDING$æ»æ¿
+STR_EXTREME_ROCKCLIMBING$æå²©
+STR_EXTREME_BUNGEEJUMPING$é«ç©ºå¼¹è·³/è¹¦ææ´»å¨
+STR_EXTREME_PARKOUR$è·é
·
+STR_EXTREME_BMX$BMX
+STR_EXTREME_ORIENTEERING$å®åè¶é
+STR_EXTREME_PARACHUTE$è·³ä¼
+STR_EXTREME_RACING$èµè½¦
+STR_EXTREME_TRIATHLONS$é人ä¸é¡¹è¿å¨
+STR_OTHER_ELEVATOR$ä¹çµæ¢¯
+STR_OTHER_ESCALATOR$ä¹ææ¶æ¢¯
+STR_OTHER_GARDENING$ååèº
+STR_OTHER_HORSEWORK$åå®¶å¡
+STR_OTHER_INVEHICLE$å¨è½¦é
+STR_OTHER_MEDITATION$奿³
+STR_OTHER_STILL$鿢
+STR_OTHER_TILTING$徿
+STR_OTHER_WHEELCHAIR$åè½®æ¤
ç§»å¨
+STR_EXERCISE_LIST$å¥èº«ç±»
+STR_BALL_LIST$çç±»
+STR_WATER_LIST$æ°´ä¸è¿å¨
+STR_DANCING_LIST$èè¹ç±»
+STR_EXTREME_LIST$æéè¿å¨
+STR_ICE_LIST$å°ä¸è¿å¨
+STR_RECREATIONAL_LIST$ä¼é²è¿å¨
+STR_OTHER_LIST$å
¶ä»
+STR_DANCING_TITLE$èè¹è¿å¨
+STR_BALL_LIST_TITLE$çç±»è¿å¨
+STR_OTHER_TITLE$å
¶ä»è¿å¨
+STR_EXERCISE_TITLE$å¥èº«è¿å¨
+STR_TRAINING$è®ç»
+STR_LANGUAGE$è¯è¨
+STR_RAPID_TRAINING$å¿«éè®ç»
+STR_SET_GOALS$è®¾ç½®ç®æ
+STR_DURATION$æ¶é¿
+STR_DURATION_SETTING$æ¶é¿è®¾å®
+STR_MINUTES$åé
+STR_CALORIE$å¡è·¯é
+STR_CALORIE_SETTING$å¡è·¯é设å®
+STR_KILOCALORIE$åå¡
+STR_DISTANCE$è·ç¦»
+STR_RANGE_SETTING$è·ç¦»è®¾å®
+STR_METER$ç±³
+STR_KILOMETRE$å
Ž
+STR_STEP_NUMBER$æ¥æ°
+STR_STEP_SETTING$æ¥æ°è®¾å®
+STR_STEP$æ¥
+STR_HEART_RATE$å¿ç
+STR_MEAN_HEART_RATE$å¹³åå¿ç
+STR_TIMES_PER_MIN$次/å
+STR_MEAN_HEART_RATE_MIN$å¹³åå¿ç(次/å)
+STR_IN_THE$ä¸
+STR_LOWER_STRENGTH$è¾ä½å¼ºåº¦
+STR_MEDIUM_STRENGTH$ä¸ç强度
+STR_HIGH_STRENGTH$é«ç强度
+STR_ULTRA_HIGH_STRENGTH$è¶
é«å¼ºåº¦
+STR_TRAINING_INTENSITY$è®ç»å¼ºåº¦
+STR_TRAINING_INTENSITY_DESCRIPTION$è®ç»å¼ºåº¦ç¨äºå¤ææ¯å¦è®ç»ä¸è¶³æè
è®ç»å¤ªè¿ï¼å°åºä½¿å¿çå¢å å¤å°çè¿å¨å¼ºåº¦ææ¯æåéçã
+STR_INTENSITY_INTERVAL_DESCRIPTION$该强度åºé´æ¯å¯¹åºé¶å¿çï¼ç±ä¸ªäººåºæ¬èµæè®¡ç®å¾åºï¼å¼ºå¼±ç宿¶ç¶ææ¾ç¤ºï¼æå©äºæé«è®ç»è´¨é
+STR_TRAINING_STATE_MEANING$è®ç»ç¶æä»£è¡¨çæä¹
+STR_WARM_UP_EXERCISE$ç身è¿å¨
+STR_FAT_BURNING_ZONE$çèåº
+STR_IMPROVE_CARDIOPULMONARY_FUNCTION$æåå¿èºæºè½
+STR_PROFESSIONAL_ATHLETE$ä¸ä¸è¿å¨å
+STR_TRAINING_INTENSITY_NOTE$注ï¼è¯¥è®ç»å¼ºåº¦å¹¶éä¸ä¸è¿å¨è¯ä¼°ï¼æ°æ®ä»
ä¾åè
+STR_TRAINING_IN_PROGRESS$è®ç»ä¸
+STR_BREAK_TRAINING$æåè®ç»
+STR_FINISH$ç»æ
+STR_PAUSE$æå
+STR_RESUME$ç»§ç»
+STR_GOAL_ACHIEVED$ç®æ 已达æ
+STR_ACCOMPLISH_GOAL$å®æç®æ
+STR_OK$ç¡®å®
+STR_LOOK_OUT$注æ
+STR_INSUFFICIENT_EXERCISE_AMOUNT$å½åè¿å¨é太å°ï¼æ æ³è®°å½.æ¯å¦ç»æè¿å¨
+STR_END_MOVEMENT$ç»æè¿å¨
+STR_END_THIS_MOVEMENT$æ¯å¦ç»ææ¬æ¬¡è¿å¨
+STR_GOAL_ACCOMPLISHMENT_DEGREE$ç®æ å®æåº¦
+STR_TRAINING_DURATION$è®ç»æ¶é¿
+STR_OFF$å
³é
+STR_MORE$æ´å¤
\ No newline at end of file
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 3dc014ad8..a388d876a 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
@@ -189,4 +189,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 c9ceec399..e677336a2 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
@@ -189,4 +189,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/languagetool.py b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/languagetool.py
index 288bcd2b5..76f0859e3 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/languagetool.py
+++ b/code/sdk/application/wearable/fd230app/nativeui/language/Language_xml/languagetool.py
@@ -1,15 +1,14 @@
-
import xml.dom.minidom
-# ä»å¤é¨æä»¶è¯»ååè¡¨æ°æ®
-def read_list_from_file(file_path):
+# ä»å¤é¨æä»¶è¯»ååè¡¨æ°æ®ï¼ä½¿ç¨ç¹æ®åé符
+def read_list_from_file(file_path, delimiter):
with open(file_path, "r", encoding="utf-8") as f:
lines = f.readlines()
- input_list = [line.strip().split(",") for line in lines]
+ input_list = [line.strip().split(delimiter) for line in lines]
return input_list
-# çæ XML æä»¶
-def generate_xml_from_list(input_list, output_file, lang):
+# çæ XML æä»¶ï¼ä½¿ç¨ç¹æ®åé符
+def generate_xml_from_list(input_list, output_file, lang, delimiter):
dom = xml.dom.minidom.getDOMImplementation().createDocument(None, "language", None)
root = dom.documentElement
root.setAttribute("id", "language")
@@ -29,12 +28,12 @@ def generate_xml_from_list(input_list, output_file, lang):
f.write(root.toprettyxml())
-# ä»å¤é¨æä»¶è¯»åä¸åè¯è¨çåè¡¨æ°æ®
-input_list_en = read_list_from_file("./input_list_en.txt")
-input_list_zh = read_list_from_file("./input_list_zh.txt")
+# ä»å¤é¨æä»¶è¯»åä¸åè¯è¨çåè¡¨æ°æ®ï¼ä½¿ç¨ç¹æ®åé符
+input_list_en = read_list_from_file("./input_list_en.txt", "$")
+input_list_zh = read_list_from_file("./input_list_zh.txt", "$")
-# çæä¸åè¯è¨ç XML æä»¶
-generate_xml_from_list(input_list_en, "./language_en.xml", "en")
-generate_xml_from_list(input_list_zh, "./language_zh.xml", "zh")
+# çæä¸åè¯è¨ç XML æä»¶ï¼ä½¿ç¨ç¹æ®åé符
+generate_xml_from_list(input_list_en, "./language_en.xml", "en", "$")
+generate_xml_from_list(input_list_zh, "./language_zh.xml", "zh", "$")
print("XMLæä»¶çæå®æã")
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 972b11819..b35d38e61 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 150dc6132..bd78e0587 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,
@@ -199,10 +199,59 @@ enum UIResourceTextId : uint16_t {
STR_EXERCISE_TITLE = 186,
STR_TRAINING = 187,
STR_LANGUAGE = 188,
- STR_MAX_ID = 189,
+ STR_RAPID_TRAINING = 189,
+ STR_SET_GOALS = 190,
+ STR_DURATION = 191,
+ STR_DURATION_SETTING = 192,
+ STR_MINUTES = 193,
+ STR_CALORIE = 194,
+ STR_CALORIE_SETTING = 195,
+ STR_KILOCALORIE = 196,
+ STR_DISTANCE = 197,
+ STR_RANGE_SETTING = 198,
+ STR_METER = 199,
+ STR_KILOMETRE = 200,
+ STR_STEP_NUMBER = 201,
+ STR_STEP_SETTING = 202,
+ STR_STEP = 203,
+ STR_HEART_RATE = 204,
+ STR_MEAN_HEART_RATE = 205,
+ STR_TIMES_PER_MIN = 206,
+ STR_MEAN_HEART_RATE_MIN = 207,
+ STR_IN_THE = 208,
+ STR_LOWER_STRENGTH = 209,
+ STR_MEDIUM_STRENGTH = 210,
+ STR_HIGH_STRENGTH = 211,
+ STR_ULTRA_HIGH_STRENGTH = 212,
+ STR_TRAINING_INTENSITY = 213,
+ STR_TRAINING_INTENSITY_DESCRIPTION = 214,
+ STR_INTENSITY_INTERVAL_DESCRIPTION = 215,
+ STR_TRAINING_STATE_MEANING = 216,
+ STR_WARM_UP_EXERCISE = 217,
+ STR_FAT_BURNING_ZONE = 218,
+ STR_IMPROVE_CARDIOPULMONARY_FUNCTION = 219,
+ STR_PROFESSIONAL_ATHLETE = 220,
+ STR_TRAINING_INTENSITY_NOTE = 221,
+ STR_TRAINING_IN_PROGRESS = 222,
+ STR_BREAK_TRAINING = 223,
+ STR_FINISH = 224,
+ STR_PAUSE = 225,
+ STR_RESUME = 226,
+ STR_GOAL_ACHIEVED = 227,
+ STR_ACCOMPLISH_GOAL = 228,
+ STR_OK = 229,
+ STR_LOOK_OUT = 230,
+ STR_INSUFFICIENT_EXERCISE_AMOUNT = 231,
+ STR_END_MOVEMENT = 232,
+ STR_END_THIS_MOVEMENT = 233,
+ STR_GOAL_ACCOMPLISHMENT_DEGREE = 234,
+ STR_TRAINING_DURATION = 235,
+ STR_OFF = 236,
+ STR_MORE = 237,
+ STR_MAX_ID = 238,
}; // UIResourceTextId
-
-enum FontLanguageId : uint8_t {
+
+enum FontLanguageId : uint8_t {
LANGUAGE_ID_ZH,
LANGUAGE_ID_EN,
LANGUAGE_ID_MAX
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 98c9f70fa..4360731cc 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/rebootdevice/include/ShutDownAnimatorView.h b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/ShutDownAnimatorView.h
index 351457b6c..77e2daf3e 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/ShutDownAnimatorView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/rebootdevice/include/ShutDownAnimatorView.h
@@ -18,7 +18,7 @@ namespace OHOS
static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_Y = 0;
static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_W = 466;
static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_H = 466;
- static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 30; // å¾ç帧æ°
+ static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_VIEW_NUM_FRAMES = 36; // å¾ç帧æ°
static constexpr int16_t SHUTDOWN_IMAGE_ANIMATOR_TIME = 150; // å¾çæ´æ°é´é
static constexpr char *ShutDownPaths = "/user/res/RebootAndShutDown/ShutDown/"; //å
³æºå¾çè·¯å¾
class ShutDownAnimatorView
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 14c370689..1b3c051f7 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
@@ -39,17 +39,18 @@
struct QuickTraining
{
- std::string training1_Text;
+ OHOS::UIResourceTextId training1_Text;
+ OHOS::UIResourceTextId training2_Text;
+ OHOS::UIResourceTextId training3_Text;
+
std::string training1_Image;
- std::string training2_Text;
std::string training2_Image;
- std::string training3_Text;
std::string training3_Image;
QuickTraining()
- : training1_Text("å¥èµ°"),
- training2_Text("éªè¡"),
- training3_Text("è·æ¥"),
+ : training1_Text(STR_EXERCISE_OUTDOORWALKING),
+ training2_Text(STR_EXERCISE_OUTDOORBIKING),
+ training3_Text(STR_EXERCISE_OUTDOORRUNNING),
training1_Image(OHOS::WALKING_60_IMAGE),
training2_Image(OHOS::RIDING_60_IMAGE),
training3_Image(OHOS::RUNNING_60_IMAGE) {}
@@ -83,8 +84,8 @@ namespace OHOS
TraingModel(const TraingModel &) = delete;
TraingModel &operator=(const TraingModel &) = delete;
- std::string trainingTimer_; // è®ç»æ¶é¿
- UIResourceTextId sportId_ = STR_EXTREME_SPORTS; // è®ç»é¡¹ç®
+ std::string trainingTimer_; // è®ç»æ¶é¿
+ UIResourceTextId sportId_ = STR_EXTREME_SPORTS; // è®ç»é¡¹ç®
};
}
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetPresenter.h
index f1e647a4b..8d600b2fa 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetPresenter.h
@@ -9,8 +9,8 @@ namespace OHOS
class TraingSetView;
class TraingSetPresenter : public Presenter,
- public UIView::OnClickListener,
- public UIView::OnDragListener
+ public UIView::OnClickListener,
+ public UIView::OnDragListener
{
public:
TraingSetPresenter();
@@ -27,7 +27,7 @@ namespace OHOS
// å 为继æ¿äºOnClickListenerï¼æä»¥æOnClick屿§ï¼è³äºåæ°,å彿°ä¹è¿æ ·ç´æ¥ç»§æ¿;
bool OnClick(UIView &view, const ClickEvent &event) override;
bool OnDrag(UIView &view, const DragEvent &event) override;
- //bool OnDragEnd(UIView& view, const DragEvent& event) override;
+ bool OnDragEnd(UIView &view, const DragEvent &event) override;
};
} // namespace OHOS
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
index a4bdc234b..e0bbd862c 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
@@ -2,7 +2,7 @@
#include "AppViewIDs.h"
#include "components/ui_label_ext.h"
-#include"language/font/ui_resource_string.h"
+#include "language/font/ui_resource_string.h"
#include "NativeAbility.h"
#include
@@ -74,6 +74,11 @@ namespace OHOS
// MainViewSample::GetInstance()->SetPage(CardId::TRAINING);
return true;
}
+ if (preSlice == VIEW_TRAININGSET)
+ {
+ // åå°è®ç»å表
+ NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE);
+ }
else
{
NativeAbility::GetInstance().ChangeSlice(preSlice);
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
index dde17f27e..4adb8a570 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
@@ -1,6 +1,6 @@
#include "AppViewIDs.h"
#include "components/ui_label_ext.h"
-#include"language/font/ui_resource_string.h"
+#include "language/font/ui_resource_string.h"
#include "NativeAbility.h"
#include
@@ -58,12 +58,17 @@ namespace OHOS
}
bool TraingSetPresenter::OnDrag(UIView &view, const DragEvent &event)
+ {
+ return true;
+ }
+
+ bool TraingSetPresenter::OnDragEnd(UIView &view, const DragEvent &event)
{
if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT &&
(event.GetDeltaX() > 40) && (event.GetDeltaX() > (2 * MATH_ABS(event.GetDeltaY()))))
{
- //uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
+ // uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();
NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);
}
UNUSED(view);
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
index 731dc9672..88521dead 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
@@ -75,13 +75,11 @@ namespace OHOS
// WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::AddLabel");
// åå§åæ ç¾
TraingModel::GetInstance()->InitLabel(title_label, TITLE_LABEL_X, TITLE_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "title_label", "å¿«éè®ç»", DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);
- const char *dataStr1 = (data->training1_Text).c_str();
- const char *dataStr2 = (data->training2_Text).c_str();
- const char *dataStr3 = (data->training3_Text).c_str();
- TraingModel::GetInstance()->InitLabel(btn1_label, BTN1_LABEL_X, BTN1_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu1_label", dataStr1, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);
- TraingModel::GetInstance()->InitLabel(btn2_label, BTN2_LABEL_X, BTN2_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu2_label", dataStr2, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);
- TraingModel::GetInstance()->InitLabel(btn3_label, BTN3_LABEL_X, BTN3_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu3_label", dataStr3, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);
- TraingModel::GetInstance()->InitLabel(btnmore_label, BTN2_LABEL_X, BTN3_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btumore_label", "æ´å¤", DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);
+
+ TraingModel::GetInstance()->InitLabelExt(btn1_label, BTN1_LABEL_X, BTN1_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu1_label", data->training1_Text, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);
+ TraingModel::GetInstance()->InitLabelExt(btn2_label, BTN2_LABEL_X, BTN2_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu2_label", data->training2_Text, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);
+ TraingModel::GetInstance()->InitLabelExt(btn3_label, BTN3_LABEL_X, BTN3_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu3_label", data->training3_Text, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);
+ TraingModel::GetInstance()->InitLabelExt(btnmore_label, BTN2_LABEL_X, BTN3_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btumore_label", STR_MORE, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE);
return true;
}
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp
index c34472c8a..e3f801378 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp
@@ -61,7 +61,7 @@ namespace OHOS
/* -------------------------------------------------------------------------- */
// åå§åLable
- TraingModel::GetInstance()->InitLabelExt(title, 125, 52, 200, 60, "label1", STR_WATER_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
+ TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_WATER_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);
scrollView->Add(title);
// UIList çéé
å¨
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp
index 9cdf18118..0597be5c1 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp
@@ -61,7 +61,7 @@ namespace OHOS
/* -------------------------------------------------------------------------- */
// åå§åLable
- TraingModel::GetInstance()->InitLabelExt(title, 125, 52, 200, 60, "label1", STR_BALL_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
+ TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_BALL_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);
scrollView->Add(title);
// UIList çéé
å¨
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp
index 03c7e0ec0..fe02e9dfc 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp
@@ -61,7 +61,7 @@ namespace OHOS
/* -------------------------------------------------------------------------- */
// åå§åLable
- TraingModel::GetInstance()->InitLabelExt(title, 125, 52, 200, 60, "label1", STR_DANCING_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30);
+ TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_DANCING_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30);
title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);
scrollView->Add(title);
// UIList çéé
å¨
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp
index 86c12183e..ce274fc31 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp
@@ -59,7 +59,7 @@ namespace OHOS
/* -------------------------------------------------------------------------- */
// åå§åLable
- TraingModel::GetInstance()->InitLabelExt(title, 125, 52, 200, 60, "label1", STR_EXERCISE_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30);
+ TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_EXERCISE_TITLE, DEFAULT_VECTOR_FONT_FILENAME, 30);
title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);
scrollView->Add(title);
// UIList çéé
å¨
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp
index e18e37541..47bf3f18d 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp
@@ -69,7 +69,7 @@ namespace OHOS
/* -------------------------------------------------------------------------- */
// åå§åLable
- TraingModel::GetInstance()->InitLabelExt(title, 125, 52, 200, 60, "label1", STR_ICE_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
+ TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_ICE_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);
scrollView->Add(title);
// UIList çéé
å¨
diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp
index 6aee62497..1be590650 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp
@@ -61,7 +61,7 @@ namespace OHOS
/* -------------------------------------------------------------------------- */
// åå§åLable
- TraingModel::GetInstance()->InitLabelExt(title, 125, 52, 200, 60, "label1", STR_EXTREME_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
+ TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_EXTREME_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);
title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);
scrollView->Add(title);
// UIList çéé
å¨