1.更新多国语言脚本工具,使用特殊分隔符“$”进行键与键值分割,实现可以使用语句在列表;2.配置主界面卡片多国语言;
authorCaisking <3449750381@qq.com>
Mon, 1 Apr 2024 08:06:50 +0000 (16:06 +0800)
committerCaisking <3449750381@qq.com>
Mon, 1 Apr 2024 08:06:50 +0000 (16:06 +0800)
3.更新语言列表注意查收

20 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/Language_xml/languagetool.py
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/rebootdevice/include/ShutDownAnimatorView.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingSetPresenter.h
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_aquatic/src/TraingAquaticView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ball/src/TraingBallView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_dance/src/TraingDanceView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_ice/src/TraingIceView.cpp
code/sdk/application/wearable/fd230app/nativeui/traing/training_list_limit/src/TraingLimitView.cpp

index 067d7d6..8089616 100644 (file)
-STR_EXERCISE_GENERAL,Exercise general\r
-STR_EXERCISE_FREETRAINING,Free training\r
-STR_EXERCISE_RESISTANCETRAINING,Resistance training\r
-STR_EXERCISE_SPINBIKE,Spin bike\r
-STR_EXERCISE_TREADMILL,Treadmill\r
-STR_EXERCISE_STROLLMACHINE,Stroll machine\r
-STR_EXERCISE_HIIT,High intense interval training\r
-STR_EXERCISE_CROSSFIT,Crossfit\r
-STR_EXERCISE_GROUPCALISTHENICS,Group calisthenics\r
-STR_EXERCISE_YOGA,Yoga\r
-STR_EXERCISE_YOGACAT,Yoga cat\r
-STR_EXERCISE_YOGACOW,Yoga cow\r
-STR_EXERCISE_YOGACOBRA,Yoga cobra\r
-STR_EXERCISE_YOGAHERO1,Yoga hero1\r
-STR_EXERCISE_YOGAHERO2,Yoga hero2\r
-STR_EXERCISE_YOGAHERO3,Yoga hero3\r
-STR_EXERCISE_YOGAROLLING,Yoga rolling\r
-STR_EXERCISE_OUTDOORWALKING,Outdoor walking\r
-STR_EXERCISE_OUTDOORRUNNING,Outdoor running\r
-STR_EXERCISE_INDOORWALKING,Indoor walking\r
-STR_EXERCISE_INDOORRUNNING,Indoor running\r
-STR_EXERCISE_OUTDOORBIKING,Outdoor biking\r
-STR_EXERCISE_JUMPINGROPE,Jumping rope\r
-STR_EXERCISE_PILATES,Pilates\r
-STR_EXERCISE_CROSS_FIT,Cross fit\r
-STR_EXERCISE_FUNCTIONALTRAINING,Functional training\r
-STR_EXERCISE_PHYSICALTRAINING,Physical Training\r
-STR_EXERCISE_TAEKWONDO,Taekwondo\r
-STR_EXERCISE_BOXING,Boxing\r
-STR_EXERCISE_KICKBOXING,Kickboxing\r
-STR_EXERCISE_KARATE,Karate\r
-STR_EXERCISE_FENCING,Fencing\r
-STR_EXERCISE_CORETRAINING,Core training\r
-STR_EXERCISE_BODYCOMBAT,Body Combat\r
-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_AEROBICS,Aerobics\r
-STR_EXERCISE_CALISTHENICE,Calisthenice\r
-STR_EXERCISE_P90X,P90X\r
-STR_EXERCISE_KETTLEBELLTRAINING,Kettlebell Training\r
-STR_EXERCISE_MIXEDMARTIALARTS,Mixed martial arts\r
-STR_EXERCISE_STAIRCLIMBINGMACHINE,Stair climbing machine\r
-STR_EXERCISE_WEIGHTLIFTING,Weightlifting\r
-STR_EXERCISE_BARRE,Barre\r
-STR_EXERCISE_HANDCYCLING,Hand cycling\r
-STR_EXERCISE_TRACKFIELD,Track field\r
-STR_EXERCISE_WRESTLING,Wrestling\r
-STR_EXERCISE_MINDBODY,Mind body\r
-STR_EXERCISE_FLEXIBILITY,Flexibility\r
-STR_EXERCISE_MIXEDCARDIO,Mixed cardio\r
-STR_EXERCISE_TRADITIONALSTRENGTHTRAINING,Traditional strength training\r
-STR_EXERCISE_CROSSTRAINING,Cross training\r
-STR_EXERCISE_GYMNASTICS,Gymnastics\r
-STR_EXERCISE_STEPTRAINING,Step training\r
-STR_EXERCISE_ELLIPTICALTRAINER,Elliptical trainer\r
-STR_EXERCISE_ROWINGMACHINE,Rowing machine\r
-STR_DANCING_GENERAL,Dancing general\r
-STR_DANCING_BELLY,Belly dance\r
-STR_DANCING_JAZZ,Jazz dance\r
-STR_DANCING_LATIN,Latin dance\r
-STR_DANCING_BALLET,Ballet dance\r
-STR_DANCING_STREET,Street dance\r
-STR_DANCING_PUBLICSQUARE,Public square dancing\r
-STR_DANCING_ZUMBA,Zumba\r
-STR_DANCING_SOCIALDANCE,Social dance\r
-STR_DANCING_TAPDANCE,Tap dance\r
-STR_RECREATIONAL_SPORTS,Recreational Sports\r
-STR_RECREATIONAL_SKATING,Roller Skating\r
-STR_RECREATIONAL_MARTIALARTS,Martial arts\r
-STR_RECREATIONAL_TAICHI,Tai Chi\r
-STR_RECREATIONAL_HULAHOOP,Hula hoop\r
-STR_RECREATIONAL_DISCSPORT,Disc sport\r
-STR_RECREATIONAL_DARTS,Darts\r
-STR_RECREATIONAL_ARCHERY,Archery\r
-STR_RECREATIONAL_HORSERIDING,Horse riding\r
-STR_RECREATIONAL_BATTLEGAME,Battle game\r
-STR_RECREATIONAL_KITE,Fly a kite\r
-STR_RECREATIONAL_TUGOFWAR,Tug of war\r
-STR_RECREATIONAL_SWING,Swing\r
-STR_RECREATIONAL_STAIRCLIMBING,Stair climbing\r
-STR_RECREATIONAL_OBSTACLERACE,Obstacle race\r
-STR_RECREATIONAL_FISHING,Fishing\r
-STR_RECREATIONAL_HUNTING,Hunting\r
-STR_RECREATIONAL_SCOOTERRIDING,Scooter Riding\r
-STR_RECREATIONAL_PARAGLIDING,Paragliding\r
-STR_RECREATIONAL_TEAMSPORTS,Team sports\r
-STR_RECREATIONAL_FINESSGAMING,Finess gaming\r
-STR_RECREATIONAL_HIKING,Hiking\r
-STR_RECREATIONAL_EQUESTRIANSPORTS,Equestrian sports\r
-STR_RECREATIONAL_PLAY,Play\r
-STR_BALL_GAMES,Ball games\r
-STR_BALL_BADMINTON,Badminton\r
-STR_BALL_TABLETENNIS,Table tennis\r
-STR_BALL_TENNIS,Tennis\r
-STR_BALL_BILLIARDS,Billiards\r
-STR_BALL_BOWLING,Bowling\r
-STR_BALL_VOLLEYBALL,Volleyball\r
-STR_BALL_SHUTTLECOCK,Shuttlecock\r
-STR_BALL_HANDBALL,Handball\r
-STR_BALL_BASEBALL,Baseball\r
-STR_BALL_SOFTBALL,Softball\r
-STR_BALL_CRICKET,Cricket\r
-STR_BALL_FOOTBALL,Football\r
-STR_BALL_BEACHSOCCER,Beach soccer\r
-STR_BALL_BEACHVOLLEYBALL,Beach volleyball\r
-STR_BALL_CROQUET,Croquet\r
-STR_BALL_HOCKEY,Hockey\r
-STR_BALL_SQUASH,Squash\r
-STR_BALL_SEPAKTAKRAW,Sepak takraw\r
-STR_BALL_DODGEBALL,Dodge ball\r
-STR_BALL_BASKETBALL,Basketball\r
-STR_BALL_SOCCER,Soccer\r
-STR_BALL_GOLF,Golf\r
-STR_BALL_POLO,Polo\r
-STR_BALL_RACQUETBALL,Racquetball\r
-STR_BALL_RUGBY,Rugby\r
-STR_BALL_GATEBALL,Gateball\r
-STR_BALL_PICKLEBALL,Pickleball\r
-STR_BALL_LACROSSE,Lacrosse\r
-STR_WATER_ACTIVITIES,Water activities\r
-STR_WATER_SAILING,Sailing\r
-STR_WATER_SURFING,Surfing\r
-STR_WATER_WHITEWATERRAFTING,Whitewater rafting\r
-STR_WATER_CANOEING,Canoeing\r
-STR_WATER_KAYAKING,Kayaking\r
-STR_WATER_ROWING,Rowing\r
-STR_WATER_MOTORBOAT,Motorboat\r
-STR_WATER_SUP,SUP\r
-STR_WATER_SCUBADIVING,Scuba diving\r
-STR_WATER_DIVING,Diving\r
-STR_WATER_KITESURFING,Kitesurfing\r
-STR_WATER_WAKEBOARDING,Wakeboarding\r
-STR_WATER_POLO,Water Polo\r
-STR_WATER_WINDSURFING,Windsurfing\r
-STR_WATER_DRIFTING,Drifting\r
-STR_WATER_FITNESS,Water fitness\r
-STR_WATER_SPORTS,Water sports\r
-STR_WATER_OUTDOORSWIM,Outdoor swim\r
-STR_WATER_INDOORSWIM,Indoor swim\r
-STR_WATER_SWIMFREESTYLE,Swim freestyle\r
-STR_WATER_SWIMBREASTSTROKE,Swim\r
-STR_WATER_SWIMBACKSTROKE,Swim\r
-STR_WATER_SWIMBUTTERFLY,Swim\r
-STR_ICE_SPORTS,Ice sports\r
-STR_ICE_SKATING,Skating\r
-STR_ICE_HOCKEY,Hockey\r
-STR_ICE_CURLING,Curling\r
-STR_ICE_SNOWMOBILING,Snow mobiling\r
-STR_ICE_SLED,Sled\r
-STR_ICE_BIATHLON,Biathlon\r
-STR_ICE_CROSSCOUNTRYSKING,Crosscountry sking\r
-STR_ICE_SKIING,Skiing\r
-STR_ICE_SNOWBOARDING,Snowboarding\r
-STR_ICE_SNOWSHOEING,Snowshoeing\r
-STR_ICE_SNOWSPORTS,Snow sport\r
-STR_EXTREME_SPORTS,Extreme sports\r
-STR_EXTREME_SKATEBOARDING,Skateboarding\r
-STR_EXTREME_ROCKCLIMBING,Rock climbing\r
-STR_EXTREME_BUNGEEJUMPING,Bungee Jumping\r
-STR_EXTREME_PARKOUR,Parkour\r
-STR_EXTREME_BMX,Bike motocross\r
-STR_EXTREME_ORIENTEERING,Orienteering\r
-STR_EXTREME_PARACHUTE,Parachute\r
-STR_EXTREME_RACING,Racing\r
-STR_EXTREME_TRIATHLONS,Triathlons\r
-STR_OTHER_ELEVATOR,Elevator\r
-STR_OTHER_ESCALATOR,Escalator\r
-STR_OTHER_GARDENING,Gardening\r
-STR_OTHER_HORSEWORK,House Work\r
-STR_OTHER_INVEHICLE,In Vehicle\r
-STR_OTHER_MEDITATION,Meditation\r
-STR_OTHER_STILL,Still\r
-STR_OTHER_TILTING,Tilting\r
-STR_OTHER_WHEELCHAIR,Wheelchair\r
-STR_EXERCISE_LIST,Exercise\r
-STR_BALL_LIST,Ball\r
-STR_WATER_LIST,Water\r
-STR_DANCING_LIST,Dance\r
-STR_EXTREME_LIST,Extreme\r
-STR_ICE_LIST,Ice\r
-STR_RECREATIONAL_LIST,Recreational\r
-STR_OTHER_LIST,Other\r
-STR_DANCING_TITLE,Dance Sport\r
-STR_BALL_LIST_TITLE,Ball Sport\r
-STR_OTHER_TITLE,Other Sport\r
-STR_EXERCISE_TITLE,Exercise Sport\r
-STR_TRAINING,Training\r
-STR_LANGUAGE,Language
\ No newline at end of file
+STR_EXERCISE_GENERAL$Exercise general\r
+STR_EXERCISE_FREETRAINING$Free training\r
+STR_EXERCISE_RESISTANCETRAINING$Resistance training\r
+STR_EXERCISE_SPINBIKE$Spin bike\r
+STR_EXERCISE_TREADMILL$Treadmill\r
+STR_EXERCISE_STROLLMACHINE$Stroll machine\r
+STR_EXERCISE_HIIT$High intense interval training\r
+STR_EXERCISE_CROSSFIT$Crossfit\r
+STR_EXERCISE_GROUPCALISTHENICS$Group calisthenics\r
+STR_EXERCISE_YOGA$Yoga\r
+STR_EXERCISE_YOGACAT$Yoga cat\r
+STR_EXERCISE_YOGACOW$Yoga cow\r
+STR_EXERCISE_YOGACOBRA$Yoga cobra\r
+STR_EXERCISE_YOGAHERO1$Yoga hero1\r
+STR_EXERCISE_YOGAHERO2$Yoga hero2\r
+STR_EXERCISE_YOGAHERO3$Yoga hero3\r
+STR_EXERCISE_YOGAROLLING$Yoga rolling\r
+STR_EXERCISE_OUTDOORWALKING$Outdoor walking\r
+STR_EXERCISE_OUTDOORRUNNING$Outdoor running\r
+STR_EXERCISE_INDOORWALKING$Indoor walking\r
+STR_EXERCISE_INDOORRUNNING$Indoor running\r
+STR_EXERCISE_OUTDOORBIKING$Outdoor biking\r
+STR_EXERCISE_JUMPINGROPE$Jumping rope\r
+STR_EXERCISE_PILATES$Pilates\r
+STR_EXERCISE_CROSS_FIT$Cross fit\r
+STR_EXERCISE_FUNCTIONALTRAINING$Functional training\r
+STR_EXERCISE_PHYSICALTRAINING$Physical Training\r
+STR_EXERCISE_TAEKWONDO$Taekwondo\r
+STR_EXERCISE_BOXING$Boxing\r
+STR_EXERCISE_KICKBOXING$Kickboxing\r
+STR_EXERCISE_KARATE$Karate\r
+STR_EXERCISE_FENCING$Fencing\r
+STR_EXERCISE_CORETRAINING$Core training\r
+STR_EXERCISE_BODYCOMBAT$Body Combat\r
+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_AEROBICS$Aerobics\r
+STR_EXERCISE_CALISTHENICE$Calisthenice\r
+STR_EXERCISE_P90X$P90X\r
+STR_EXERCISE_KETTLEBELLTRAINING$Kettlebell Training\r
+STR_EXERCISE_MIXEDMARTIALARTS$Mixed martial arts\r
+STR_EXERCISE_STAIRCLIMBINGMACHINE$Stair climbing machine\r
+STR_EXERCISE_WEIGHTLIFTING$Weightlifting\r
+STR_EXERCISE_BARRE$Barre\r
+STR_EXERCISE_HANDCYCLING$Hand cycling\r
+STR_EXERCISE_TRACKFIELD$Track field\r
+STR_EXERCISE_WRESTLING$Wrestling\r
+STR_EXERCISE_MINDBODY$Mind body\r
+STR_EXERCISE_FLEXIBILITY$Flexibility\r
+STR_EXERCISE_MIXEDCARDIO$Mixed cardio\r
+STR_EXERCISE_TRADITIONALSTRENGTHTRAINING$Traditional strength training\r
+STR_EXERCISE_CROSSTRAINING$Cross training\r
+STR_EXERCISE_GYMNASTICS$Gymnastics\r
+STR_EXERCISE_STEPTRAINING$Step training\r
+STR_EXERCISE_ELLIPTICALTRAINER$Elliptical trainer\r
+STR_EXERCISE_ROWINGMACHINE$Rowing machine\r
+STR_DANCING_GENERAL$Dancing general\r
+STR_DANCING_BELLY$Belly dance\r
+STR_DANCING_JAZZ$Jazz dance\r
+STR_DANCING_LATIN$Latin dance\r
+STR_DANCING_BALLET$Ballet dance\r
+STR_DANCING_STREET$Street dance\r
+STR_DANCING_PUBLICSQUARE$Public square dancing\r
+STR_DANCING_ZUMBA$Zumba\r
+STR_DANCING_SOCIALDANCE$Social dance\r
+STR_DANCING_TAPDANCE$Tap dance\r
+STR_RECREATIONAL_SPORTS$Recreational Sports\r
+STR_RECREATIONAL_SKATING$Roller Skating\r
+STR_RECREATIONAL_MARTIALARTS$Martial arts\r
+STR_RECREATIONAL_TAICHI$Tai Chi\r
+STR_RECREATIONAL_HULAHOOP$Hula hoop\r
+STR_RECREATIONAL_DISCSPORT$Disc sport\r
+STR_RECREATIONAL_DARTS$Darts\r
+STR_RECREATIONAL_ARCHERY$Archery\r
+STR_RECREATIONAL_HORSERIDING$Horse riding\r
+STR_RECREATIONAL_BATTLEGAME$Battle game\r
+STR_RECREATIONAL_KITE$Fly a kite\r
+STR_RECREATIONAL_TUGOFWAR$Tug of war\r
+STR_RECREATIONAL_SWING$Swing\r
+STR_RECREATIONAL_STAIRCLIMBING$Stair climbing\r
+STR_RECREATIONAL_OBSTACLERACE$Obstacle race\r
+STR_RECREATIONAL_FISHING$Fishing\r
+STR_RECREATIONAL_HUNTING$Hunting\r
+STR_RECREATIONAL_SCOOTERRIDING$Scooter Riding\r
+STR_RECREATIONAL_PARAGLIDING$Paragliding\r
+STR_RECREATIONAL_TEAMSPORTS$Team sports\r
+STR_RECREATIONAL_FINESSGAMING$Finess gaming\r
+STR_RECREATIONAL_HIKING$Hiking\r
+STR_RECREATIONAL_EQUESTRIANSPORTS$Equestrian sports\r
+STR_RECREATIONAL_PLAY$Play\r
+STR_BALL_GAMES$Ball games\r
+STR_BALL_BADMINTON$Badminton\r
+STR_BALL_TABLETENNIS$Table tennis\r
+STR_BALL_TENNIS$Tennis\r
+STR_BALL_BILLIARDS$Billiards\r
+STR_BALL_BOWLING$Bowling\r
+STR_BALL_VOLLEYBALL$Volleyball\r
+STR_BALL_SHUTTLECOCK$Shuttlecock\r
+STR_BALL_HANDBALL$Handball\r
+STR_BALL_BASEBALL$Baseball\r
+STR_BALL_SOFTBALL$Softball\r
+STR_BALL_CRICKET$Cricket\r
+STR_BALL_FOOTBALL$Football\r
+STR_BALL_BEACHSOCCER$Beach soccer\r
+STR_BALL_BEACHVOLLEYBALL$Beach volleyball\r
+STR_BALL_CROQUET$Croquet\r
+STR_BALL_HOCKEY$Hockey\r
+STR_BALL_SQUASH$Squash\r
+STR_BALL_SEPAKTAKRAW$Sepak takraw\r
+STR_BALL_DODGEBALL$Dodge ball\r
+STR_BALL_BASKETBALL$Basketball\r
+STR_BALL_SOCCER$Soccer\r
+STR_BALL_GOLF$Golf\r
+STR_BALL_POLO$Polo\r
+STR_BALL_RACQUETBALL$Racquetball\r
+STR_BALL_RUGBY$Rugby\r
+STR_BALL_GATEBALL$Gateball\r
+STR_BALL_PICKLEBALL$Pickleball\r
+STR_BALL_LACROSSE$Lacrosse\r
+STR_WATER_ACTIVITIES$Water activities\r
+STR_WATER_SAILING$Sailing\r
+STR_WATER_SURFING$Surfing\r
+STR_WATER_WHITEWATERRAFTING$Whitewater rafting\r
+STR_WATER_CANOEING$Canoeing\r
+STR_WATER_KAYAKING$Kayaking\r
+STR_WATER_ROWING$Rowing\r
+STR_WATER_MOTORBOAT$Motorboat\r
+STR_WATER_SUP$SUP\r
+STR_WATER_SCUBADIVING$Scuba diving\r
+STR_WATER_DIVING$Diving\r
+STR_WATER_KITESURFING$Kitesurfing\r
+STR_WATER_WAKEBOARDING$Wakeboarding\r
+STR_WATER_POLO$Water Polo\r
+STR_WATER_WINDSURFING$Windsurfing\r
+STR_WATER_DRIFTING$Drifting\r
+STR_WATER_FITNESS$Water fitness\r
+STR_WATER_SPORTS$Water sports\r
+STR_WATER_OUTDOORSWIM$Outdoor swim\r
+STR_WATER_INDOORSWIM$Indoor swim\r
+STR_WATER_SWIMFREESTYLE$Swim freestyle\r
+STR_WATER_SWIMBREASTSTROKE$Swim\r
+STR_WATER_SWIMBACKSTROKE$Swim\r
+STR_WATER_SWIMBUTTERFLY$Swim\r
+STR_ICE_SPORTS$Ice sports\r
+STR_ICE_SKATING$Skating\r
+STR_ICE_HOCKEY$Hockey\r
+STR_ICE_CURLING$Curling\r
+STR_ICE_SNOWMOBILING$Snow mobiling\r
+STR_ICE_SLED$Sled\r
+STR_ICE_BIATHLON$Biathlon\r
+STR_ICE_CROSSCOUNTRYSKING$Crosscountry sking\r
+STR_ICE_SKIING$Skiing\r
+STR_ICE_SNOWBOARDING$Snowboarding\r
+STR_ICE_SNOWSHOEING$Snowshoeing\r
+STR_ICE_SNOWSPORTS$Snow sport\r
+STR_EXTREME_SPORTS$Extreme sports\r
+STR_EXTREME_SKATEBOARDING$Skateboarding\r
+STR_EXTREME_ROCKCLIMBING$Rock climbing\r
+STR_EXTREME_BUNGEEJUMPING$Bungee Jumping\r
+STR_EXTREME_PARKOUR$Parkour\r
+STR_EXTREME_BMX$Bike motocross\r
+STR_EXTREME_ORIENTEERING$Orienteering\r
+STR_EXTREME_PARACHUTE$Parachute\r
+STR_EXTREME_RACING$Racing\r
+STR_EXTREME_TRIATHLONS$Triathlons\r
+STR_OTHER_ELEVATOR$Elevator\r
+STR_OTHER_ESCALATOR$Escalator\r
+STR_OTHER_GARDENING$Gardening\r
+STR_OTHER_HORSEWORK$House Work\r
+STR_OTHER_INVEHICLE$In Vehicle\r
+STR_OTHER_MEDITATION$Meditation\r
+STR_OTHER_STILL$Still\r
+STR_OTHER_TILTING$Tilting\r
+STR_OTHER_WHEELCHAIR$Wheelchair\r
+STR_EXERCISE_LIST$Exercise\r
+STR_BALL_LIST$Ball\r
+STR_WATER_LIST$Water\r
+STR_DANCING_LIST$Dance\r
+STR_EXTREME_LIST$Extreme\r
+STR_ICE_LIST$Ice\r
+STR_RECREATIONAL_LIST$Recreational\r
+STR_OTHER_LIST$Other\r
+STR_DANCING_TITLE$Dance Sport\r
+STR_BALL_LIST_TITLE$Ball Sport\r
+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_DURATION$duration\r
+STR_DURATION_SETTING$Duration setting\r
+STR_MINUTES$minutes\r
+STR_CALORIE$calorie\r
+STR_CALORIE_SETTING$Calorie setting\r
+STR_KILOCALORIE$kilocalorie\r
+STR_DISTANCE$distance\r
+STR_RANGE_SETTING$Range setting\r
+STR_METER$meter.\r
+STR_KILOMETRE$kilometre\r
+STR_STEP_NUMBER$Step number\r
+STR_STEP_SETTING$Step setting\r
+STR_STEP$step\r
+STR_HEART_RATE$Heart rate\r
+STR_MEAN_HEART_RATE$Mean heart rate\r
+STR_TIMES_PER_MIN$Times/min\r
+STR_MEAN_HEART_RATE_MIN$Mean heart rate(Times/min)\r
+STR_IN_THE$In the\r
+STR_LOWER_STRENGTH$Lower strength\r
+STR_MEDIUM_STRENGTH$Medium strength\r
+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_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_IN_PROGRESS$Training in progress\r
+STR_BREAK_TRAINING$Break training\r
+STR_FINISH$finish\r
+STR_PAUSE$Pause\r
+STR_RESUME$Resume\r
+STR_GOAL_ACHIEVED$Goal achieved\r
+STR_ACCOMPLISH_GOAL$Accomplish the goal\r
+STR_OK$OK\r
+STR_LOOK_OUT$Look out\r
+STR_INSUFFICIENT_EXERCISE_AMOUNT$The current amount of exercise is too small to record whether to end the exercise\r
+STR_END_MOVEMENT$End movement\r
+STR_END_THIS_MOVEMENT$Whether to end this movement\r
+STR_GOAL_ACCOMPLISHMENT_DEGREE$Goal accomplishment degree\r
+STR_TRAINING_DURATION$Training duration\r
+STR_OFF$Off\r
+STR_MORE$More
\ No newline at end of file
index d3ab46d..7e7a845 100644 (file)
-STR_EXERCISE_GENERAL,一般锻炼\r
-STR_EXERCISE_FREETRAINING,自由训练\r
-STR_EXERCISE_RESISTANCETRAINING,肌力训练\r
-STR_EXERCISE_SPINBIKE,飞轮车/室内健身车\r
-STR_EXERCISE_TREADMILL,踏步机\r
-STR_EXERCISE_STROLLMACHINE,漫步机\r
-STR_EXERCISE_HIIT,HIIT/高强度间歇训练\r
-STR_EXERCISE_CROSSFIT,健身\r
-STR_EXERCISE_GROUPCALISTHENICS,团体操\r
-STR_EXERCISE_YOGA,瑜珈\r
-STR_EXERCISE_YOGACAT,瑜珈猫式\r
-STR_EXERCISE_YOGACOW,瑜珈牛式\r
-STR_EXERCISE_YOGACOBRA,瑜珈眼镜蛇式\r
-STR_EXERCISE_YOGAHERO1,瑜珈英雄式1\r
-STR_EXERCISE_YOGAHERO2,瑜珈英雄式2\r
-STR_EXERCISE_YOGAHERO3,瑜珈英雄式3\r
-STR_EXERCISE_YOGAROLLING,瑜珈滚轮\r
-STR_EXERCISE_OUTDOORWALKING,室外走路\r
-STR_EXERCISE_OUTDOORRUNNING,室外跑步\r
-STR_EXERCISE_INDOORWALKING,室内走路\r
-STR_EXERCISE_INDOORRUNNING,室内跑步\r
-STR_EXERCISE_OUTDOORBIKING,室外骑行\r
-STR_EXERCISE_JUMPINGROPE,跳绳\r
-STR_EXERCISE_PILATES,皮拉提斯\r
-STR_EXERCISE_CROSS_FIT,混合健身\r
-STR_EXERCISE_FUNCTIONALTRAINING,功能性训练\r
-STR_EXERCISE_PHYSICALTRAINING,体能训练\r
-STR_EXERCISE_TAEKWONDO,跆拳道/踢拳\r
-STR_EXERCISE_BOXING,拳击\r
-STR_EXERCISE_KICKBOXING,自由搏击\r
-STR_EXERCISE_KARATE,空手道\r
-STR_EXERCISE_FENCING,击剑\r
-STR_EXERCISE_CORETRAINING,核心训练\r
-STR_EXERCISE_BODYCOMBAT,拳击有氧\r
-STR_EXERCISE_KENDO,剑道\r
-STR_EXERCISE_HORIZONTALBAR,单杠\r
-STR_EXERCISE_PARALLELBARS,双杠\r
-STR_EXERCISE_CROSSFIT,循环训练\r
-STR_EXERCISE_AEROBICS,有氧运动\r
-STR_EXERCISE_CALISTHENICE,健美操\r
-STR_EXERCISE_P90X,P90X\r
-STR_EXERCISE_KETTLEBELLTRAINING,壶铃训练\r
-STR_EXERCISE_MIXEDMARTIALARTS,综合格斗\r
-STR_EXERCISE_STAIRCLIMBINGMACHINE,爬楼梯机\r
-STR_EXERCISE_WEIGHTLIFTING,举重\r
-STR_EXERCISE_BARRE,Barre\r
-STR_EXERCISE_HANDCYCLING,手轮\r
-STR_EXERCISE_TRACKFIELD,田径\r
-STR_EXERCISE_WRESTLING,角力\r
-STR_EXERCISE_MINDBODY,身心运动\r
-STR_EXERCISE_FLEXIBILITY,柔软操\r
-STR_EXERCISE_MIXEDCARDIO,混和有氧\r
-STR_EXERCISE_TRADITIONALSTRENGTHTRAINING,传统肌力训练\r
-STR_EXERCISE_CROSSTRAINING,交叉训练\r
-STR_EXERCISE_GYMNASTICS,体操\r
-STR_EXERCISE_STEPTRAINING,阶梯训练\r
-STR_EXERCISE_ELLIPTICALTRAINER,椭圆机\r
-STR_EXERCISE_ROWINGMACHINE,划船机\r
-STR_DANCING_GENERAL,一般舞蹈\r
-STR_DANCING_BELLY,肚皮舞\r
-STR_DANCING_JAZZ,爵士舞\r
-STR_DANCING_LATIN,拉丁舞\r
-STR_DANCING_BALLET,芭蕾\r
-STR_DANCING_STREET,街舞\r
-STR_DANCING_PUBLICSQUARE,广场舞\r
-STR_DANCING_ZUMBA,尊巴\r
-STR_DANCING_SOCIALDANCE,社交舞\r
-STR_DANCING_TAPDANCE,踢踏舞\r
-STR_RECREATIONAL_SPORTS,一般休闲运动\r
-STR_RECREATIONAL_SKATING,滑轮溜冰\r
-STR_RECREATIONAL_MARTIALARTS,武术\r
-STR_RECREATIONAL_TAICHI,太极拳\r
-STR_RECREATIONAL_HULAHOOP,呼拉圈\r
-STR_RECREATIONAL_DISCSPORT,飞盘\r
-STR_RECREATIONAL_DARTS,飞镖\r
-STR_RECREATIONAL_ARCHERY,射箭\r
-STR_RECREATIONAL_HORSERIDING,骑马\r
-STR_RECREATIONAL_BATTLEGAME,对战游戏\r
-STR_RECREATIONAL_KITE,放风筝\r
-STR_RECREATIONAL_TUGOFWAR,拔河\r
-STR_RECREATIONAL_SWING,鞦韆\r
-STR_RECREATIONAL_STAIRCLIMBING,爬楼梯\r
-STR_RECREATIONAL_OBSTACLERACE,障碍赛\r
-STR_RECREATIONAL_FISHING,钓鱼\r
-STR_RECREATIONAL_HUNTING,打猎\r
-STR_RECREATIONAL_SCOOTERRIDING,滑板车\r
-STR_RECREATIONAL_PARAGLIDING,滑翔伞\r
-STR_RECREATIONAL_TEAMSPORTS,团队竞技\r
-STR_RECREATIONAL_FINESSGAMING,健身电玩\r
-STR_RECREATIONAL_HIKING,健行\r
-STR_RECREATIONAL_EQUESTRIANSPORTS,马术运动\r
-STR_RECREATIONAL_PLAY,玩乐\r
-STR_BALL_GAMES,一般球类运动\r
-STR_BALL_BADMINTON,羽毛球\r
-STR_BALL_TABLETENNIS,乒乓球\r
-STR_BALL_TENNIS,网球\r
-STR_BALL_BILLIARDS,撞球\r
-STR_BALL_BOWLING,保龄球\r
-STR_BALL_VOLLEYBALL,排球\r
-STR_BALL_SHUTTLECOCK,毽子球\r
-STR_BALL_HANDBALL,手球\r
-STR_BALL_BASEBALL,棒球\r
-STR_BALL_SOFTBALL,垒球\r
-STR_BALL_CRICKET,板球\r
-STR_BALL_FOOTBALL,美式橄榄球\r
-STR_BALL_BEACHSOCCER,沙滩足球\r
-STR_BALL_BEACHVOLLEYBALL,沙滩排球\r
-STR_BALL_CROQUET,槌球\r
-STR_BALL_HOCKEY,曲棍球\r
-STR_BALL_SQUASH,英式壁球\r
-STR_BALL_SEPAKTAKRAW,藤球\r
-STR_BALL_DODGEBALL,躲避球\r
-STR_BALL_BASKETBALL,篮球\r
-STR_BALL_SOCCER,足球\r
-STR_BALL_GOLF,高尔夫球\r
-STR_BALL_POLO,马球\r
-STR_BALL_RACQUETBALL,美式壁球\r
-STR_BALL_RUGBY,英式橄榄球\r
-STR_BALL_GATEBALL,门球\r
-STR_BALL_PICKLEBALL,匹克球\r
-STR_BALL_LACROSSE,袋棍球\r
-STR_WATER_ACTIVITIES,一般水上活动\r
-STR_WATER_SAILING,帆船\r
-STR_WATER_SURFING,冲浪\r
-STR_WATER_WHITEWATERRAFTING,泛舟\r
-STR_WATER_CANOEING,划龙舟\r
-STR_WATER_KAYAKING,轻艇\r
-STR_WATER_ROWING,赛艇\r
-STR_WATER_MOTORBOAT,水上摩托车\r
-STR_WATER_SUP,立桨冲浪\r
-STR_WATER_SCUBADIVING,潜水\r
-STR_WATER_DIVING,跳水\r
-STR_WATER_KITESURFING,滑翔伞冲浪\r
-STR_WATER_WAKEBOARDING,冲浪滑水\r
-STR_WATER_POLO,水球\r
-STR_WATER_WINDSURFING,风帆冲浪\r
-STR_WATER_DRIFTING,漂流活动\r
-STR_WATER_FITNESS,水中健身\r
-STR_WATER_SPORTS,水上运动\r
-STR_WATER_OUTDOORSWIM,户外游泳\r
-STR_WATER_INDOORSWIM,室内游泳\r
-STR_WATER_SWIMFREESTYLE,游泳_自由式\r
-STR_WATER_SWIMBREASTSTROKE,游泳_蛙式\r
-STR_WATER_SWIMBACKSTROKE,游泳_仰式\r
-STR_WATER_SWIMBUTTERFLY,游泳_蝶式\r
-STR_ICE_SPORTS,一般冰上运动\r
-STR_ICE_SKATING,溜冰\r
-STR_ICE_HOCKEY,冰球\r
-STR_ICE_CURLING,冰石壶/冰壶\r
-STR_ICE_SNOWMOBILING,雪上摩托车\r
-STR_ICE_SLED,雪橇\r
-STR_ICE_BIATHLON,冬季两项\r
-STR_ICE_CROSSCOUNTRYSKING,越野滑雪\r
-STR_ICE_SKIING,滑雪\r
-STR_ICE_SNOWBOARDING,单板滑雪/滑雪板\r
-STR_ICE_SNOWSHOEING,雪鞋健行\r
-STR_ICE_SNOWSPORTS,雪地运动\r
-STR_EXTREME_SPORTS,一般极限运动\r
-STR_EXTREME_SKATEBOARDING,滑板\r
-STR_EXTREME_ROCKCLIMBING,攀岩\r
-STR_EXTREME_BUNGEEJUMPING,高空弹跳/蹦极活动\r
-STR_EXTREME_PARKOUR,跑酷\r
-STR_EXTREME_BMX,BMX\r
-STR_EXTREME_ORIENTEERING,定向越野\r
-STR_EXTREME_PARACHUTE,跳伞\r
-STR_EXTREME_RACING,赛车\r
-STR_EXTREME_TRIATHLONS,铁人三项运动\r
-STR_OTHER_ELEVATOR,乘电梯\r
-STR_OTHER_ESCALATOR,乘手扶梯\r
-STR_OTHER_GARDENING,做园艺\r
-STR_OTHER_HORSEWORK,做家务\r
-STR_OTHER_INVEHICLE,在车里\r
-STR_OTHER_MEDITATION,冥想\r
-STR_OTHER_STILL,静止\r
-STR_OTHER_TILTING,倾斜\r
-STR_OTHER_WHEELCHAIR,坐轮椅移动\r
-STR_EXERCISE_LIST,健身类\r
-STR_BALL_LIST,球类\r
-STR_WATER_LIST,水上运动\r
-STR_DANCING_LIST,舞蹈类\r
-STR_EXTREME_LIST,极限运动\r
-STR_ICE_LIST,冰上运动\r
-STR_RECREATIONAL_LIST,休闲运动\r
-STR_OTHER_LIST,其他\r
-STR_DANCING_TITLE,舞蹈运动\r
-STR_BALL_LIST_TITLE,球类运动\r
-STR_OTHER_TITLE,其他运动\r
-STR_EXERCISE_TITLE,健身运动\r
-STR_TRAINING,训练\r
-STR_LANGUAGE,语言
\ No newline at end of file
+STR_EXERCISE_GENERAL$一般锻炼\r
+STR_EXERCISE_FREETRAINING$自由训练\r
+STR_EXERCISE_RESISTANCETRAINING$肌力训练\r
+STR_EXERCISE_SPINBIKE$飞轮车/室内健身车\r
+STR_EXERCISE_TREADMILL$踏步机\r
+STR_EXERCISE_STROLLMACHINE$漫步机\r
+STR_EXERCISE_HIIT$HIIT/高强度间歇训练\r
+STR_EXERCISE_CROSSFIT$健身\r
+STR_EXERCISE_GROUPCALISTHENICS$团体操\r
+STR_EXERCISE_YOGA$瑜珈\r
+STR_EXERCISE_YOGACAT$瑜珈猫式\r
+STR_EXERCISE_YOGACOW$瑜珈牛式\r
+STR_EXERCISE_YOGACOBRA$瑜珈眼镜蛇式\r
+STR_EXERCISE_YOGAHERO1$瑜珈英雄式1\r
+STR_EXERCISE_YOGAHERO2$瑜珈英雄式2\r
+STR_EXERCISE_YOGAHERO3$瑜珈英雄式3\r
+STR_EXERCISE_YOGAROLLING$瑜珈滚轮\r
+STR_EXERCISE_OUTDOORWALKING$室外走路\r
+STR_EXERCISE_OUTDOORRUNNING$室外跑步\r
+STR_EXERCISE_INDOORWALKING$室内走路\r
+STR_EXERCISE_INDOORRUNNING$室内跑步\r
+STR_EXERCISE_OUTDOORBIKING$室外骑行\r
+STR_EXERCISE_JUMPINGROPE$跳绳\r
+STR_EXERCISE_PILATES$皮拉提斯\r
+STR_EXERCISE_CROSS_FIT$混合健身\r
+STR_EXERCISE_FUNCTIONALTRAINING$功能性训练\r
+STR_EXERCISE_PHYSICALTRAINING$体能训练\r
+STR_EXERCISE_TAEKWONDO$跆拳道/踢拳\r
+STR_EXERCISE_BOXING$拳击\r
+STR_EXERCISE_KICKBOXING$自由搏击\r
+STR_EXERCISE_KARATE$空手道\r
+STR_EXERCISE_FENCING$击剑\r
+STR_EXERCISE_CORETRAINING$核心训练\r
+STR_EXERCISE_BODYCOMBAT$拳击有氧\r
+STR_EXERCISE_KENDO$剑道\r
+STR_EXERCISE_HORIZONTALBAR$单杠\r
+STR_EXERCISE_PARALLELBARS$双杠\r
+STR_EXERCISE_CROSSFIT$循环训练\r
+STR_EXERCISE_AEROBICS$有氧运动\r
+STR_EXERCISE_CALISTHENICE$健美操\r
+STR_EXERCISE_P90X$P90X\r
+STR_EXERCISE_KETTLEBELLTRAINING$壶铃训练\r
+STR_EXERCISE_MIXEDMARTIALARTS$综合格斗\r
+STR_EXERCISE_STAIRCLIMBINGMACHINE$爬楼梯机\r
+STR_EXERCISE_WEIGHTLIFTING$举重\r
+STR_EXERCISE_BARRE$Barre\r
+STR_EXERCISE_HANDCYCLING$手轮\r
+STR_EXERCISE_TRACKFIELD$田径\r
+STR_EXERCISE_WRESTLING$角力\r
+STR_EXERCISE_MINDBODY$身心运动\r
+STR_EXERCISE_FLEXIBILITY$柔软操\r
+STR_EXERCISE_MIXEDCARDIO$混和有氧\r
+STR_EXERCISE_TRADITIONALSTRENGTHTRAINING$传统肌力训练\r
+STR_EXERCISE_CROSSTRAINING$交叉训练\r
+STR_EXERCISE_GYMNASTICS$体操\r
+STR_EXERCISE_STEPTRAINING$阶梯训练\r
+STR_EXERCISE_ELLIPTICALTRAINER$椭圆机\r
+STR_EXERCISE_ROWINGMACHINE$划船机\r
+STR_DANCING_GENERAL$一般舞蹈\r
+STR_DANCING_BELLY$肚皮舞\r
+STR_DANCING_JAZZ$爵士舞\r
+STR_DANCING_LATIN$拉丁舞\r
+STR_DANCING_BALLET$芭蕾\r
+STR_DANCING_STREET$街舞\r
+STR_DANCING_PUBLICSQUARE$广场舞\r
+STR_DANCING_ZUMBA$尊巴\r
+STR_DANCING_SOCIALDANCE$社交舞\r
+STR_DANCING_TAPDANCE$踢踏舞\r
+STR_RECREATIONAL_SPORTS$一般休闲运动\r
+STR_RECREATIONAL_SKATING$滑轮溜冰\r
+STR_RECREATIONAL_MARTIALARTS$武术\r
+STR_RECREATIONAL_TAICHI$太极拳\r
+STR_RECREATIONAL_HULAHOOP$呼拉圈\r
+STR_RECREATIONAL_DISCSPORT$飞盘\r
+STR_RECREATIONAL_DARTS$飞镖\r
+STR_RECREATIONAL_ARCHERY$射箭\r
+STR_RECREATIONAL_HORSERIDING$骑马\r
+STR_RECREATIONAL_BATTLEGAME$对战游戏\r
+STR_RECREATIONAL_KITE$放风筝\r
+STR_RECREATIONAL_TUGOFWAR$拔河\r
+STR_RECREATIONAL_SWING$鞦韆\r
+STR_RECREATIONAL_STAIRCLIMBING$爬楼梯\r
+STR_RECREATIONAL_OBSTACLERACE$障碍赛\r
+STR_RECREATIONAL_FISHING$钓鱼\r
+STR_RECREATIONAL_HUNTING$打猎\r
+STR_RECREATIONAL_SCOOTERRIDING$滑板车\r
+STR_RECREATIONAL_PARAGLIDING$滑翔伞\r
+STR_RECREATIONAL_TEAMSPORTS$团队竞技\r
+STR_RECREATIONAL_FINESSGAMING$健身电玩\r
+STR_RECREATIONAL_HIKING$健行\r
+STR_RECREATIONAL_EQUESTRIANSPORTS$马术运动\r
+STR_RECREATIONAL_PLAY$玩乐\r
+STR_BALL_GAMES$一般球类运动\r
+STR_BALL_BADMINTON$羽毛球\r
+STR_BALL_TABLETENNIS$乒乓球\r
+STR_BALL_TENNIS$网球\r
+STR_BALL_BILLIARDS$撞球\r
+STR_BALL_BOWLING$保龄球\r
+STR_BALL_VOLLEYBALL$排球\r
+STR_BALL_SHUTTLECOCK$毽子球\r
+STR_BALL_HANDBALL$手球\r
+STR_BALL_BASEBALL$棒球\r
+STR_BALL_SOFTBALL$垒球\r
+STR_BALL_CRICKET$板球\r
+STR_BALL_FOOTBALL$美式橄榄球\r
+STR_BALL_BEACHSOCCER$沙滩足球\r
+STR_BALL_BEACHVOLLEYBALL$沙滩排球\r
+STR_BALL_CROQUET$槌球\r
+STR_BALL_HOCKEY$曲棍球\r
+STR_BALL_SQUASH$英式壁球\r
+STR_BALL_SEPAKTAKRAW$藤球\r
+STR_BALL_DODGEBALL$躲避球\r
+STR_BALL_BASKETBALL$篮球\r
+STR_BALL_SOCCER$足球\r
+STR_BALL_GOLF$高尔夫球\r
+STR_BALL_POLO$马球\r
+STR_BALL_RACQUETBALL$美式壁球\r
+STR_BALL_RUGBY$英式橄榄球\r
+STR_BALL_GATEBALL$门球\r
+STR_BALL_PICKLEBALL$匹克球\r
+STR_BALL_LACROSSE$袋棍球\r
+STR_WATER_ACTIVITIES$一般水上活动\r
+STR_WATER_SAILING$帆船\r
+STR_WATER_SURFING$冲浪\r
+STR_WATER_WHITEWATERRAFTING$泛舟\r
+STR_WATER_CANOEING$划龙舟\r
+STR_WATER_KAYAKING$轻艇\r
+STR_WATER_ROWING$赛艇\r
+STR_WATER_MOTORBOAT$水上摩托车\r
+STR_WATER_SUP$立桨冲浪\r
+STR_WATER_SCUBADIVING$潜水\r
+STR_WATER_DIVING$跳水\r
+STR_WATER_KITESURFING$滑翔伞冲浪\r
+STR_WATER_WAKEBOARDING$冲浪滑水\r
+STR_WATER_POLO$水球\r
+STR_WATER_WINDSURFING$风帆冲浪\r
+STR_WATER_DRIFTING$漂流活动\r
+STR_WATER_FITNESS$水中健身\r
+STR_WATER_SPORTS$水上运动\r
+STR_WATER_OUTDOORSWIM$户外游泳\r
+STR_WATER_INDOORSWIM$室内游泳\r
+STR_WATER_SWIMFREESTYLE$游泳_自由式\r
+STR_WATER_SWIMBREASTSTROKE$游泳_蛙式\r
+STR_WATER_SWIMBACKSTROKE$游泳_仰式\r
+STR_WATER_SWIMBUTTERFLY$游泳_蝶式\r
+STR_ICE_SPORTS$一般冰上运动\r
+STR_ICE_SKATING$溜冰\r
+STR_ICE_HOCKEY$冰球\r
+STR_ICE_CURLING$冰石壶/冰壶\r
+STR_ICE_SNOWMOBILING$雪上摩托车\r
+STR_ICE_SLED$雪橇\r
+STR_ICE_BIATHLON$冬季两项\r
+STR_ICE_CROSSCOUNTRYSKING$越野滑雪\r
+STR_ICE_SKIING$滑雪\r
+STR_ICE_SNOWBOARDING$单板滑雪/滑雪板\r
+STR_ICE_SNOWSHOEING$雪鞋健行\r
+STR_ICE_SNOWSPORTS$雪地运动\r
+STR_EXTREME_SPORTS$一般极限运动\r
+STR_EXTREME_SKATEBOARDING$滑板\r
+STR_EXTREME_ROCKCLIMBING$攀岩\r
+STR_EXTREME_BUNGEEJUMPING$高空弹跳/蹦极活动\r
+STR_EXTREME_PARKOUR$跑酷\r
+STR_EXTREME_BMX$BMX\r
+STR_EXTREME_ORIENTEERING$定向越野\r
+STR_EXTREME_PARACHUTE$跳伞\r
+STR_EXTREME_RACING$赛车\r
+STR_EXTREME_TRIATHLONS$铁人三项运动\r
+STR_OTHER_ELEVATOR$乘电梯\r
+STR_OTHER_ESCALATOR$乘手扶梯\r
+STR_OTHER_GARDENING$做园艺\r
+STR_OTHER_HORSEWORK$做家务\r
+STR_OTHER_INVEHICLE$在车里\r
+STR_OTHER_MEDITATION$冥想\r
+STR_OTHER_STILL$静止\r
+STR_OTHER_TILTING$倾斜\r
+STR_OTHER_WHEELCHAIR$坐轮椅移动\r
+STR_EXERCISE_LIST$健身类\r
+STR_BALL_LIST$球类\r
+STR_WATER_LIST$水上运动\r
+STR_DANCING_LIST$舞蹈类\r
+STR_EXTREME_LIST$极限运动\r
+STR_ICE_LIST$冰上运动\r
+STR_RECREATIONAL_LIST$休闲运动\r
+STR_OTHER_LIST$其他\r
+STR_DANCING_TITLE$舞蹈运动\r
+STR_BALL_LIST_TITLE$球类运动\r
+STR_OTHER_TITLE$其他运动\r
+STR_EXERCISE_TITLE$健身运动\r
+STR_TRAINING$训练\r
+STR_LANGUAGE$语言\r
+STR_RAPID_TRAINING$快速训练\r
+STR_SET_GOALS$设置目标\r
+STR_DURATION$时长\r
+STR_DURATION_SETTING$时长设定\r
+STR_MINUTES$分钟\r
+STR_CALORIE$卡路里\r
+STR_CALORIE_SETTING$卡路里设定\r
+STR_KILOCALORIE$千卡\r
+STR_DISTANCE$距离\r
+STR_RANGE_SETTING$距离设定\r
+STR_METER$米\r
+STR_KILOMETRE$公里\r
+STR_STEP_NUMBER$步数\r
+STR_STEP_SETTING$步数设定\r
+STR_STEP$步\r
+STR_HEART_RATE$心率\r
+STR_MEAN_HEART_RATE$平均心率\r
+STR_TIMES_PER_MIN$次/分\r
+STR_MEAN_HEART_RATE_MIN$平均心率(次/分)\r
+STR_IN_THE$中\r
+STR_LOWER_STRENGTH$较低强度\r
+STR_MEDIUM_STRENGTH$中等强度\r
+STR_HIGH_STRENGTH$高等强度\r
+STR_ULTRA_HIGH_STRENGTH$超高强度\r
+STR_TRAINING_INTENSITY$训练强度\r
+STR_TRAINING_INTENSITY_DESCRIPTION$训练强度用于判断是否训练不足或者训练太过,到底使心率增加多少的运动强度才是最合适的。\r
+STR_INTENSITY_INTERVAL_DESCRIPTION$该强度区间是对应靶心率(由个人基本资料计算得出)强弱的实时状态显示,有助于提高训练质量\r
+STR_TRAINING_STATE_MEANING$训练状态代表的意义\r
+STR_WARM_UP_EXERCISE$热身运动\r
+STR_FAT_BURNING_ZONE$燃脂区\r
+STR_IMPROVE_CARDIOPULMONARY_FUNCTION$提升心肺机能\r
+STR_PROFESSIONAL_ATHLETE$专业运动员\r
+STR_TRAINING_INTENSITY_NOTE$注:该训练强度并非专业运动评估,数据仅供参考\r
+STR_TRAINING_IN_PROGRESS$训练中\r
+STR_BREAK_TRAINING$暂停训练\r
+STR_FINISH$结束\r
+STR_PAUSE$暂停\r
+STR_RESUME$继续\r
+STR_GOAL_ACHIEVED$目标已达成\r
+STR_ACCOMPLISH_GOAL$完成目标\r
+STR_OK$确定\r
+STR_LOOK_OUT$注意\r
+STR_INSUFFICIENT_EXERCISE_AMOUNT$当前运动量太小,无法记录.是否结束运动\r
+STR_END_MOVEMENT$结束运动\r
+STR_END_THIS_MOVEMENT$是否结束本次运动\r
+STR_GOAL_ACCOMPLISHMENT_DEGREE$目标完成度\r
+STR_TRAINING_DURATION$训练时长\r
+STR_OFF$关闭\r
+STR_MORE$更多
\ No newline at end of file
index 3dc014a..a388d87 100644 (file)
        <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_DURATION" value="duration"/>
+       <lanstr id="STR_DURATION_SETTING" value="Duration setting"/>
+       <lanstr id="STR_MINUTES" value="minutes"/>
+       <lanstr id="STR_CALORIE" value="calorie"/>
+       <lanstr id="STR_CALORIE_SETTING" value="Calorie setting"/>
+       <lanstr id="STR_KILOCALORIE" value="kilocalorie"/>
+       <lanstr id="STR_DISTANCE" value="distance"/>
+       <lanstr id="STR_RANGE_SETTING" value="Range setting"/>
+       <lanstr id="STR_METER" value="meter."/>
+       <lanstr id="STR_KILOMETRE" value="kilometre"/>
+       <lanstr id="STR_STEP_NUMBER" value="Step number"/>
+       <lanstr id="STR_STEP_SETTING" value="Step setting"/>
+       <lanstr id="STR_STEP" value="step"/>
+       <lanstr id="STR_HEART_RATE" value="Heart rate"/>
+       <lanstr id="STR_MEAN_HEART_RATE" value="Mean heart rate"/>
+       <lanstr id="STR_TIMES_PER_MIN" value="Times/min"/>
+       <lanstr id="STR_MEAN_HEART_RATE_MIN" value="Mean heart rate(Times/min)"/>
+       <lanstr id="STR_IN_THE" value="In the"/>
+       <lanstr id="STR_LOWER_STRENGTH" value="Lower strength"/>
+       <lanstr id="STR_MEDIUM_STRENGTH" value="Medium strength"/>
+       <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_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_IN_PROGRESS" value="Training in progress"/>
+       <lanstr id="STR_BREAK_TRAINING" value="Break training"/>
+       <lanstr id="STR_FINISH" value="finish"/>
+       <lanstr id="STR_PAUSE" value="Pause"/>
+       <lanstr id="STR_RESUME" value="Resume"/>
+       <lanstr id="STR_GOAL_ACHIEVED" value="Goal achieved"/>
+       <lanstr id="STR_ACCOMPLISH_GOAL" value="Accomplish the goal"/>
+       <lanstr id="STR_OK" value="OK"/>
+       <lanstr id="STR_LOOK_OUT" value="Look out"/>
+       <lanstr id="STR_INSUFFICIENT_EXERCISE_AMOUNT" value="The current amount of exercise is too small to record whether to end the exercise"/>
+       <lanstr id="STR_END_MOVEMENT" value="End movement"/>
+       <lanstr id="STR_END_THIS_MOVEMENT" value="Whether to end this movement"/>
+       <lanstr id="STR_GOAL_ACCOMPLISHMENT_DEGREE" value="Goal accomplishment degree"/>
+       <lanstr id="STR_TRAINING_DURATION" value="Training duration"/>
+       <lanstr id="STR_OFF" value="Off"/>
+       <lanstr id="STR_MORE" value="More"/>
 </language>
index c9ceec3..e677336 100644 (file)
        <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_DURATION" value="时长"/>
+       <lanstr id="STR_DURATION_SETTING" value="时长设定"/>
+       <lanstr id="STR_MINUTES" value="分钟"/>
+       <lanstr id="STR_CALORIE" value="卡路里"/>
+       <lanstr id="STR_CALORIE_SETTING" value="卡路里设定"/>
+       <lanstr id="STR_KILOCALORIE" value="千卡"/>
+       <lanstr id="STR_DISTANCE" value="距离"/>
+       <lanstr id="STR_RANGE_SETTING" value="距离设定"/>
+       <lanstr id="STR_METER" value="米"/>
+       <lanstr id="STR_KILOMETRE" value="公里"/>
+       <lanstr id="STR_STEP_NUMBER" value="步数"/>
+       <lanstr id="STR_STEP_SETTING" value="步数设定"/>
+       <lanstr id="STR_STEP" value="步"/>
+       <lanstr id="STR_HEART_RATE" value="心率"/>
+       <lanstr id="STR_MEAN_HEART_RATE" value="平均心率"/>
+       <lanstr id="STR_TIMES_PER_MIN" value="次/分"/>
+       <lanstr id="STR_MEAN_HEART_RATE_MIN" value="平均心率(次/分)"/>
+       <lanstr id="STR_IN_THE" value="中"/>
+       <lanstr id="STR_LOWER_STRENGTH" value="较低强度"/>
+       <lanstr id="STR_MEDIUM_STRENGTH" value="中等强度"/>
+       <lanstr id="STR_HIGH_STRENGTH" value="高等强度"/>
+       <lanstr id="STR_ULTRA_HIGH_STRENGTH" value="超高强度"/>
+       <lanstr id="STR_TRAINING_INTENSITY" value="训练强度"/>
+       <lanstr id="STR_TRAINING_INTENSITY_DESCRIPTION" value="训练强度用于判断是否训练不足或者训练太过,到底使心率增加多少的运动强度才是最合适的。"/>
+       <lanstr id="STR_INTENSITY_INTERVAL_DESCRIPTION" value="该强度区间是对应靶心率(由个人基本资料计算得出)强弱的实时状态显示,有助于提高训练质量"/>
+       <lanstr id="STR_TRAINING_STATE_MEANING" value="训练状态代表的意义"/>
+       <lanstr id="STR_WARM_UP_EXERCISE" value="热身运动"/>
+       <lanstr id="STR_FAT_BURNING_ZONE" value="燃脂区"/>
+       <lanstr id="STR_IMPROVE_CARDIOPULMONARY_FUNCTION" value="提升心肺机能"/>
+       <lanstr id="STR_PROFESSIONAL_ATHLETE" value="专业运动员"/>
+       <lanstr id="STR_TRAINING_INTENSITY_NOTE" value="注:该训练强度并非专业运动评估,数据仅供参考"/>
+       <lanstr id="STR_TRAINING_IN_PROGRESS" value="训练中"/>
+       <lanstr id="STR_BREAK_TRAINING" value="暂停训练"/>
+       <lanstr id="STR_FINISH" value="结束"/>
+       <lanstr id="STR_PAUSE" value="暂停"/>
+       <lanstr id="STR_RESUME" value="继续"/>
+       <lanstr id="STR_GOAL_ACHIEVED" 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_END_MOVEMENT" value="结束运动"/>
+       <lanstr id="STR_END_THIS_MOVEMENT" value="是否结束本次运动"/>
+       <lanstr id="STR_GOAL_ACCOMPLISHMENT_DEGREE" value="目标完成度"/>
+       <lanstr id="STR_TRAINING_DURATION" value="训练时长"/>
+       <lanstr id="STR_OFF" value="关闭"/>
+       <lanstr id="STR_MORE" value="更多"/>
 </language>
index 288bcd2..76f0859 100644 (file)
@@ -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文件生成完成。")
index 972b118..b35d38e 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 150dc61..bd78e05 100644 (file)
@@ -1,15 +1,15 @@
-/*\r
-* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.\r
-* Description: language\r
-* Author: Graphic develop team\r
-* Create: 2021-07-06\r
-*/\r
-\r
-#ifndef UI_RESOURCE_STRING_H\r
-#define UI_RESOURCE_STRING_H\r
-#include <cstdint>\r
-namespace OHOS {\r
-enum UIResourceTextId : uint16_t {\r
+/*
+* Copyright (c) xxxxxxxx Technologies Co., Ltd. 2021-2021. All rights reserved.
+* Description: language
+* Author: Graphic develop team
+* Create: 2021-07-06
+*/
+
+#ifndef UI_RESOURCE_STRING_H
+#define UI_RESOURCE_STRING_H
+#include <cstdint>
+namespace OHOS {
+enum UIResourceTextId : uint16_t {
     STR_EXERCISE_GENERAL = 0,\r
     STR_EXERCISE_FREETRAINING = 1,\r
     STR_EXERCISE_RESISTANCETRAINING = 2,\r
@@ -199,10 +199,59 @@ enum UIResourceTextId : uint16_t {
     STR_EXERCISE_TITLE = 186,\r
     STR_TRAINING = 187,\r
     STR_LANGUAGE = 188,\r
-    STR_MAX_ID = 189,\r
+    STR_RAPID_TRAINING = 189,\r
+    STR_SET_GOALS = 190,\r
+    STR_DURATION = 191,\r
+    STR_DURATION_SETTING = 192,\r
+    STR_MINUTES = 193,\r
+    STR_CALORIE = 194,\r
+    STR_CALORIE_SETTING = 195,\r
+    STR_KILOCALORIE = 196,\r
+    STR_DISTANCE = 197,\r
+    STR_RANGE_SETTING = 198,\r
+    STR_METER = 199,\r
+    STR_KILOMETRE = 200,\r
+    STR_STEP_NUMBER = 201,\r
+    STR_STEP_SETTING = 202,\r
+    STR_STEP = 203,\r
+    STR_HEART_RATE = 204,\r
+    STR_MEAN_HEART_RATE = 205,\r
+    STR_TIMES_PER_MIN = 206,\r
+    STR_MEAN_HEART_RATE_MIN = 207,\r
+    STR_IN_THE = 208,\r
+    STR_LOWER_STRENGTH = 209,\r
+    STR_MEDIUM_STRENGTH = 210,\r
+    STR_HIGH_STRENGTH = 211,\r
+    STR_ULTRA_HIGH_STRENGTH = 212,\r
+    STR_TRAINING_INTENSITY = 213,\r
+    STR_TRAINING_INTENSITY_DESCRIPTION = 214,\r
+    STR_INTENSITY_INTERVAL_DESCRIPTION = 215,\r
+    STR_TRAINING_STATE_MEANING = 216,\r
+    STR_WARM_UP_EXERCISE = 217,\r
+    STR_FAT_BURNING_ZONE = 218,\r
+    STR_IMPROVE_CARDIOPULMONARY_FUNCTION = 219,\r
+    STR_PROFESSIONAL_ATHLETE = 220,\r
+    STR_TRAINING_INTENSITY_NOTE = 221,\r
+    STR_TRAINING_IN_PROGRESS = 222,\r
+    STR_BREAK_TRAINING = 223,\r
+    STR_FINISH = 224,\r
+    STR_PAUSE = 225,\r
+    STR_RESUME = 226,\r
+    STR_GOAL_ACHIEVED = 227,\r
+    STR_ACCOMPLISH_GOAL = 228,\r
+    STR_OK = 229,\r
+    STR_LOOK_OUT = 230,\r
+    STR_INSUFFICIENT_EXERCISE_AMOUNT = 231,\r
+    STR_END_MOVEMENT = 232,\r
+    STR_END_THIS_MOVEMENT = 233,\r
+    STR_GOAL_ACCOMPLISHMENT_DEGREE = 234,\r
+    STR_TRAINING_DURATION = 235,\r
+    STR_OFF = 236,\r
+    STR_MORE = 237,\r
+    STR_MAX_ID = 238,\r
 }; // UIResourceTextId\r
-\r
-enum FontLanguageId : uint8_t {\r
+
+enum FontLanguageId : uint8_t {
     LANGUAGE_ID_ZH,\r
     LANGUAGE_ID_EN,\r
     LANGUAGE_ID_MAX\r
index 98c9f70..4360731 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 351457b..77e2daf 100644 (file)
@@ -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
index 14c3706..1b3c051 100644 (file)
 
 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; // 训练项目
     };
 }
 
index f1e647a..8d600b2 100644 (file)
@@ -9,8 +9,8 @@ namespace OHOS
     class TraingSetView;
 
     class TraingSetPresenter : public Presenter<TraingSetView>,
-                                 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
 
index a4bdc23..e0bbd86 100644 (file)
@@ -2,7 +2,7 @@
 \r
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
-#include"language/font/ui_resource_string.h"\r
+#include "language/font/ui_resource_string.h"\r
 #include "NativeAbility.h"\r
 \r
 #include <iostream>\r
@@ -74,6 +74,11 @@ namespace OHOS
                 // MainViewSample::GetInstance()->SetPage(CardId::TRAINING);\r
                 return true;\r
             }\r
+            if (preSlice == VIEW_TRAININGSET)\r
+            {\r
+                // 回到训练列表\r
+                NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE);\r
+            }\r
             else\r
             {\r
                 NativeAbility::GetInstance().ChangeSlice(preSlice);\r
index dde17f2..4adb8a5 100644 (file)
@@ -1,6 +1,6 @@
 #include "AppViewIDs.h"\r
 #include "components/ui_label_ext.h"\r
-#include"language/font/ui_resource_string.h"\r
+#include "language/font/ui_resource_string.h"\r
 #include "NativeAbility.h"\r
 \r
 #include <iostream>\r
@@ -58,12 +58,17 @@ namespace OHOS
     }\r
 \r
     bool TraingSetPresenter::OnDrag(UIView &view, const DragEvent &event)\r
+    {\r
+        return true;\r
+    }\r
+    \r
+    bool TraingSetPresenter::OnDragEnd(UIView &view, const DragEvent &event)\r
     {\r
 \r
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT &&\r
             (event.GetDeltaX() > 40) && (event.GetDeltaX() > (2 * MATH_ABS(event.GetDeltaY()))))\r
         {\r
-            //uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
+            // uint16_t preSlice = NativeAbility::GetInstance().GetPreSliceId();\r
             NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGNOMAL);\r
         }\r
         UNUSED(view);\r
index 731dc96..88521de 100644 (file)
@@ -75,13 +75,11 @@ namespace OHOS
         // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::AddLabel");\r
         //  初始化标签\r
         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);\r
-        const char *dataStr1 = (data->training1_Text).c_str();\r
-        const char *dataStr2 = (data->training2_Text).c_str();\r
-        const char *dataStr3 = (data->training3_Text).c_str();\r
-        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);\r
-        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);\r
-        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);\r
-        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);\r
+\r
+        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);\r
+        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);\r
+        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);\r
+        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);\r
         return true;\r
     }\r
 \r
index c34472c..e3f8013 100644 (file)
@@ -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 的适配器
index 9cdf181..0597be5 100644 (file)
@@ -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 的适配器
index 03c7e0e..fe02e9d 100644 (file)
@@ -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 的适配器
index 86c1218..ce274fc 100644 (file)
@@ -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 的适配器
index e18e375..47bf3f1 100644 (file)
@@ -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 的适配器
index 6aee624..1be5906 100644 (file)
@@ -61,7 +61,7 @@ namespace OHOS
 \r
         /* -------------------------------------------------------------------------- */\r
         // 初始化Lable\r
-        TraingModel::GetInstance()->InitLabelExt(title, 125, 52, 200, 60, "label1", STR_EXTREME_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+        TraingModel::GetInstance()->InitLabelExt(title, 135, 52, 200, 60, "label1", STR_EXTREME_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         title->SetStyle(STYLE_TEXT_COLOR, Color::Green().full);\r
         scrollView->Add(title);\r
         // UIList 的适配器\r