修改运动类型

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/TrainingType.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/TrainingType.h
index daabd24..9f09e76 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/TrainingType.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/TrainingType.h
@@ -3,6 +3,7 @@
  * @LastEditors: Caisking 3449750381@qq.com
  * @LastEditTime: 2024-04-23 17:55:36
  * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/TrainingType.h
+ * 保留运动类型：跑步 骑行 室外步行 有氧运动 冥想 健身 一般锻炼 自由训练 漫步机 HIIT 跳绳 体能训练 体操 健美操 团体操 瑜伽 室内走路 室内跑步 舞蹈 休闲运动 球类运动 羽毛球 乒乓球 网球 篮球 椭圆机 足球 划船机 排球 撞球 保龄球 棒球 垒球 板球 高尔夫球；其他已注释
  */
 #ifndef TRAINING_TYPE_H
 #define TRAINING_TYPE_H
@@ -10,7 +11,7 @@
 #include "uicomponents/UIComponents.h"
 namespace OHOS
 {
-#define MAX_TAININGNUM 176
+#define MAX_TAININGNUM 35
 
     struct training_data
     {
@@ -21,166 +22,46 @@ namespace OHOS
 
     training_data tainging_indetail_data[MAX_TAININGNUM] =
         {
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING},            // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_FREETRAINING, ExerciseClass::FREE_TRAINING},       // 自由训练
-            {Exercisetype::FITNESS, STR_EXERCISE_RESISTANCETRAINING, ExerciseClass::FREE_TRAINING}, // 肌力训练
-            {Exercisetype::FITNESS, STR_EXERCISE_SPINBIKE, ExerciseClass::FREE_TRAINING},           // 飞轮车/室内健身车
-            {Exercisetype::FITNESS, STR_EXERCISE_TREADMILL, ExerciseClass::FREE_TRAINING},          // 踏步机
-            {Exercisetype::FITNESS, STR_EXERCISE_STROLLMACHINE, ExerciseClass::FREE_TRAINING},      // 漫步机
-            {Exercisetype::FITNESS, STR_EXERCISE_HIIT, ExerciseClass::FREE_TRAINING},               // 高强度间歇训练
-            {Exercisetype::FITNESS, STR_EXERCISE_CROSSFIT, ExerciseClass::FREE_TRAINING},           // 健身
-            {Exercisetype::FITNESS, STR_EXERCISE_GROUPCALISTHENICS, ExerciseClass::FREE_TRAINING},  // 团体操
-            {Exercisetype::FITNESS, STR_EXERCISE_YOGA, ExerciseClass::FREE_TRAINING},               // 瑜珈
-            {Exercisetype::FITNESS, STR_EXERCISE_YOGACAT, ExerciseClass::FREE_TRAINING},            // 瑜珈猫式
-            {Exercisetype::FITNESS, STR_EXERCISE_YOGACOW, ExerciseClass::FREE_TRAINING},            // 瑜珈牛式
-            {Exercisetype::FITNESS, STR_EXERCISE_YOGACOBRA, ExerciseClass::FREE_TRAINING},          // 瑜珈眼镜蛇式
-            {Exercisetype::FITNESS, STR_EXERCISE_YOGAHERO1, ExerciseClass::FREE_TRAINING},          // 瑜珈英雄式1
-            {Exercisetype::FITNESS, STR_EXERCISE_YOGAHERO2, ExerciseClass::FREE_TRAINING},          // 瑜珈英雄式2
-            {Exercisetype::FITNESS, STR_EXERCISE_YOGAHERO3, ExerciseClass::FREE_TRAINING},          // 瑜珈英雄式3
-            {Exercisetype::FITNESS, STR_EXERCISE_YOGAROLLING, ExerciseClass::FREE_TRAINING},        // 瑜珈滚轮
-
-            {Exercisetype::FITNESS, STR_EXERCISE_OUTDOORWALKING, ExerciseClass::FREE_TRAINING}, // 室外走路
-            {Exercisetype::FITNESS, STR_EXERCISE_OUTDOORRUNNING, ExerciseClass::OUTDOOR},       // 室外跑步
-            {Exercisetype::FITNESS, STR_EXERCISE_INDOORWALKING, ExerciseClass::FREE_TRAINING},  // 室内走路
-            {Exercisetype::FITNESS, STR_EXERCISE_INDOORRUNNING, ExerciseClass::INDOOR},         // 室内跑步
-            {Exercisetype::FITNESS, STR_EXERCISE_OUTDOORBIKING, ExerciseClass::FREE_TRAINING},  // 室外骑行
-
-            {Exercisetype::FITNESS, STR_EXERCISE_JUMPINGROPE, ExerciseClass::FREE_TRAINING},                 // 跳绳
-            {Exercisetype::FITNESS, STR_EXERCISE_PILATES, ExerciseClass::FREE_TRAINING},                     // 皮拉提斯
-            {Exercisetype::FITNESS, STR_EXERCISE_CROSS_FIT, ExerciseClass::FREE_TRAINING},                   // 混合健身
-            {Exercisetype::FITNESS, STR_EXERCISE_FUNCTIONALTRAINING, ExerciseClass::FREE_TRAINING},          // 功能性训练
-            {Exercisetype::FITNESS, STR_EXERCISE_PHYSICALTRAINING, ExerciseClass::FREE_TRAINING},            // 体能训练
-            {Exercisetype::FITNESS, STR_EXERCISE_TAEKWONDO, ExerciseClass::FREE_TRAINING},                   // 跆拳道/踢拳
-            {Exercisetype::FITNESS, STR_EXERCISE_BOXING, ExerciseClass::FREE_TRAINING},                      // 拳击
-            {Exercisetype::FITNESS, STR_EXERCISE_KICKBOXING, ExerciseClass::FREE_TRAINING},                  // 自由搏击
-            {Exercisetype::FITNESS, STR_EXERCISE_KARATE, ExerciseClass::FREE_TRAINING},                      // 空手道
-            {Exercisetype::FITNESS, STR_EXERCISE_FENCING, ExerciseClass::FREE_TRAINING},                     // 击剑
-            {Exercisetype::FITNESS, STR_EXERCISE_CORETRAINING, ExerciseClass::FREE_TRAINING},                // 核心训练
-            {Exercisetype::FITNESS, STR_EXERCISE_BODYCOMBAT, ExerciseClass::FREE_TRAINING},                  // 拳击有氧
-            {Exercisetype::FITNESS, STR_EXERCISE_KENDO, ExerciseClass::FREE_TRAINING},                       // 剑道
-            {Exercisetype::FITNESS, STR_EXERCISE_HORIZONTALBAR, ExerciseClass::FREE_TRAINING},               // 单杠
-            {Exercisetype::FITNESS, STR_EXERCISE_PARALLELBARS, ExerciseClass::FREE_TRAINING},                // 双杠
-            {Exercisetype::FITNESS, STR_EXERCISE_CIRCUIT, ExerciseClass::FREE_TRAINING},                     // 循环训练
-            {Exercisetype::FITNESS, STR_EXERCISE_AEROBICS, ExerciseClass::FREE_TRAINING},                    // 有氧运动
-            {Exercisetype::FITNESS, STR_EXERCISE_CALISTHENICE, ExerciseClass::FREE_TRAINING},                // 健美操
-            {Exercisetype::FITNESS, STR_EXERCISE_P90X, ExerciseClass::FREE_TRAINING},                        // P90X
-            {Exercisetype::FITNESS, STR_EXERCISE_KETTLEBELLTRAINING, ExerciseClass::FREE_TRAINING},          // 壶铃训练
-            {Exercisetype::FITNESS, STR_EXERCISE_MIXEDMARTIALARTS, ExerciseClass::FREE_TRAINING},            // 综合格斗
-            {Exercisetype::FITNESS, STR_EXERCISE_STAIRCLIMBINGMACHINE, ExerciseClass::FREE_TRAINING},        // 爬楼梯机
-            {Exercisetype::FITNESS, STR_EXERCISE_WEIGHTLIFTING, ExerciseClass::FREE_TRAINING},               // 举重
-            {Exercisetype::FITNESS, STR_EXERCISE_BARRE, ExerciseClass::FREE_TRAINING},                       // Barre
-            {Exercisetype::FITNESS, STR_EXERCISE_HANDCYCLING, ExerciseClass::FREE_TRAINING},                 // 手轮
-            {Exercisetype::FITNESS, STR_EXERCISE_TRACKFIELD, ExerciseClass::FREE_TRAINING},                  // 田径
-            {Exercisetype::FITNESS, STR_EXERCISE_WRESTLING, ExerciseClass::FREE_TRAINING},                   // 角力
-            {Exercisetype::FITNESS, STR_EXERCISE_MINDBODY, ExerciseClass::FREE_TRAINING},                    // 身心运动
-            {Exercisetype::FITNESS, STR_EXERCISE_FLEXIBILITY, ExerciseClass::FREE_TRAINING},                 // 柔软操
-            {Exercisetype::FITNESS, STR_EXERCISE_MIXEDCARDIO, ExerciseClass::FREE_TRAINING},                 // 混和有氧
-            {Exercisetype::FITNESS, STR_EXERCISE_TRADITIONALSTRENGTHTRAINING, ExerciseClass::FREE_TRAINING}, // 传统肌力训练
-            {Exercisetype::FITNESS, STR_EXERCISE_CROSSTRAINING, ExerciseClass::FREE_TRAINING},               // 交叉训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GYMNASTICS, ExerciseClass::FREE_TRAINING},                  // 体操
-            {Exercisetype::FITNESS, STR_EXERCISE_STEPTRAINING, ExerciseClass::FREE_TRAINING},                // 阶梯训练
-            {Exercisetype::FITNESS, STR_EXERCISE_ELLIPTICALTRAINER, ExerciseClass::FREE_TRAINING},           // 椭圆机
-            {Exercisetype::FITNESS, STR_EXERCISE_ROWINGMACHINE, ExerciseClass::FREE_TRAINING},               // 划船机
-
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
-            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING}, // 一般训练
+            // 健身类保留
+            {Exercisetype::FITNESS, STR_EXERCISE_OUTDOORRUNNING, ExerciseClass::OUTDOOR},       // 跑步
+            {Exercisetype::FITNESS, STR_EXERCISE_OUTDOORBIKING, ExerciseClass::FREE_TRAINING},  // 骑行
+            {Exercisetype::FITNESS, STR_EXERCISE_OUTDOORWALKING, ExerciseClass::FREE_TRAINING}, // 室外步行
+            {Exercisetype::FITNESS, STR_EXERCISE_AEROBICS, ExerciseClass::FREE_TRAINING},      // 有氧运动
+            {Exercisetype::FITNESS, STR_EXERCISE_MINDBODY, ExerciseClass::FREE_TRAINING},      // 冥想
+            {Exercisetype::FITNESS, STR_EXERCISE_CROSSFIT, ExerciseClass::FREE_TRAINING},      // 健身
+            {Exercisetype::FITNESS, STR_EXERCISE_GENERAL, ExerciseClass::FREE_TRAINING},      // 一般锻炼
+            {Exercisetype::FITNESS, STR_EXERCISE_FREETRAINING, ExerciseClass::FREE_TRAINING},  // 自由训练
+            {Exercisetype::FITNESS, STR_EXERCISE_STROLLMACHINE, ExerciseClass::FREE_TRAINING}, // 漫步机
+            {Exercisetype::FITNESS, STR_EXERCISE_HIIT, ExerciseClass::FREE_TRAINING},         // HIIT
+            {Exercisetype::FITNESS, STR_EXERCISE_JUMPINGROPE, ExerciseClass::FREE_TRAINING},   // 跳绳
+            {Exercisetype::FITNESS, STR_EXERCISE_PHYSICALTRAINING, ExerciseClass::FREE_TRAINING}, // 体能训练
+            {Exercisetype::FITNESS, STR_EXERCISE_GYMNASTICS, ExerciseClass::FREE_TRAINING},    // 体操
+            {Exercisetype::FITNESS, STR_EXERCISE_CALISTHENICE, ExerciseClass::FREE_TRAINING},  // 健美操
+            {Exercisetype::FITNESS, STR_EXERCISE_GROUPCALISTHENICS, ExerciseClass::FREE_TRAINING}, // 团体操
+            {Exercisetype::FITNESS, STR_EXERCISE_YOGA, ExerciseClass::FREE_TRAINING},         // 瑜伽
+            {Exercisetype::FITNESS, STR_EXERCISE_INDOORWALKING, ExerciseClass::FREE_TRAINING}, // 室内走路
+            {Exercisetype::FITNESS, STR_EXERCISE_INDOORRUNNING, ExerciseClass::INDOOR},      // 室内跑步
+            {Exercisetype::FITNESS, STR_EXERCISE_ELLIPTICALTRAINER, ExerciseClass::FREE_TRAINING}, // 椭圆机
+            {Exercisetype::FITNESS, STR_EXERCISE_ROWINGMACHINE, ExerciseClass::FREE_TRAINING}, // 划船机
+            // 舞蹈
+            {Exercisetype::DANCE, STR_DANCING_GENERAL, ExerciseClass::FREE_TRAINING},         // 舞蹈
+            // 休闲运动
+            {Exercisetype::LEISURE, STR_RECREATIONAL_SPORTS, ExerciseClass::FREE_TRAINING},     // 休闲运动
+            // 球类
+            {Exercisetype::BALL, STR_BALL_GAMES, ExerciseClass::FREE_TRAINING},               // 球类运动
+            {Exercisetype::BALL, STR_BALL_BADMINTON, ExerciseClass::FREE_TRAINING},          // 羽毛球
+            {Exercisetype::BALL, STR_BALL_TABLETENNIS, ExerciseClass::FREE_TRAINING},         // 乒乓球
+            {Exercisetype::BALL, STR_BALL_TENNIS, ExerciseClass::FREE_TRAINING},               // 网球
+            {Exercisetype::BALL, STR_BALL_BASKETBALL, ExerciseClass::FREE_TRAINING},           // 篮球
+            {Exercisetype::BALL, STR_BALL_FOOTBALL, ExerciseClass::FREE_TRAINING},             // 足球
+            {Exercisetype::BALL, STR_BALL_VOLLEYBALL, ExerciseClass::FREE_TRAINING},           // 排球
+            {Exercisetype::BALL, STR_BALL_BILLIARDS, ExerciseClass::FREE_TRAINING},           // 撞球
+            {Exercisetype::BALL, STR_BALL_BOWLING, ExerciseClass::FREE_TRAINING},              // 保龄球
+            {Exercisetype::BALL, STR_BALL_BASEBALL, ExerciseClass::FREE_TRAINING},             // 棒球
+            {Exercisetype::BALL, STR_BALL_SOFTBALL, ExerciseClass::FREE_TRAINING},             // 垒球
+            {Exercisetype::BALL, STR_BALL_CRICKET, ExerciseClass::FREE_TRAINING},              // 板球
+            {Exercisetype::BALL, STR_BALL_GOLF, ExerciseClass::FREE_TRAINING},                  // 高尔夫球
     };
+    // 以下运动类型已注释移除：肌力训练、飞轮车、踏步机、瑜珈猫式/牛式/眼镜蛇式/英雄式/滚轮、皮拉提斯、混合健身、功能性训练、跆拳道、拳击、空手道、击剑、核心训练、壶铃、综合格斗、爬楼梯机、举重、Barre、手轮、田径、角力、柔软操、混和有氧、传统肌力、交叉训练、阶梯训练、以及舞蹈/休闲/球类/水上/冰上/极限/其他的其余子项
 }
-#endif
\ No newline at end of file
+#endif

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
index e279125..53f4257 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp
@@ -4,6 +4,7 @@
 #include "components/ui_label_ext.h"\r
 #include "ui_resource_string.h"\r
 #include "NativeAbility.h"\r
+#include "sport_countdown/CountdownPresenter.h"\r
 #include "key/include/KeyInputListener.h"\r
 #include "custom_utils.h"\r
 #include "common/key_code.h"\r
@@ -195,9 +196,17 @@ namespace OHOS
             // 根据目标视图决定后续操作\r
             if (targetViewId == VIEW_TRAININGCRAD)\r
             {\r
-                // 进入运动卡片：设置标志位并启动运动资源\r
+                #if 0\r
+                // 进入倒计时前暂停 GPS 定时器，避免与 UI 同线程导致卡顿；进运动卡片后 OnStart 会恢复\r
+                CountdownPresenter::SetReturnSlice(VIEW_TRAININGCRAD);\r
+                NativeAbility::GetInstance().EnterSlice(VIEW_SPORT_COUNTDOWN);\r
+                enter_flag = true;\r
+                StartSportResources();          \r
+                return true;\r
+                #else\r
                 enter_flag = true;\r
                 StartSportResources();\r
+                #endif\r
             }\r
             else\r
             {\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_ball/include/TraingBallModel.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_ball/include/TraingBallModel.h
index 7e71b63..dbfd38f 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_ball/include/TraingBallModel.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_ball/include/TraingBallModel.h
@@ -37,7 +37,7 @@ namespace OHOS
         TraingBallModel(const TraingBallModel &);
         TraingBallModel &operator=(const TraingBallModel &);
         virtual ~TraingBallModel();
-        static const uint16_t TraingBallListMaxNum = 31;
+        static const uint16_t TraingBallListMaxNum = 15;  // 保留的球类运动数量（含 title、list）
         TraingBallItem TraingBalls[TraingBallListMaxNum] = {VIEW_INVALID, STR_EXERCISE_GENERAL};
         // std::map<int, AppViewId> TraingBallIdToViewId;
         bool btConnectStatus{false};

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_ball/src/TraingBallModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_ball/src/TraingBallModel.cpp
index 2b2348c..139488d 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_ball/src/TraingBallModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_ball/src/TraingBallModel.cpp
@@ -27,40 +27,28 @@ TraingBallModel &TraingBallModel::GetInstance() {
   return instance;
 }
 
+// 保留：球类运动 羽毛球 乒乓球 网球 篮球 足球 排球 撞球 保龄球 棒球 垒球 板球 高尔夫球；其他已注释
 void TraingBallModel::InitTraingBallListItem() {
   TraingBallItem defaultItems[] = {
       {VIEW_TRAININGNOMAL, STR_BALL_LIST_TITLE},
-      {VIEW_TRAININGNOMAL, STR_BALL_GAMES},
-      {VIEW_TRAININGNOMAL, STR_BALL_BADMINTON},
-      {VIEW_TRAININGNOMAL, STR_BALL_TABLETENNIS},
-      {VIEW_TRAININGNOMAL, STR_BALL_TENNIS},
-      {VIEW_TRAININGNOMAL, STR_BALL_BILLIARDS},
-      {VIEW_TRAININGNOMAL, STR_BALL_BOWLING},
-      {VIEW_TRAININGNOMAL, STR_BALL_VOLLEYBALL},
-      {VIEW_TRAININGNOMAL, STR_BALL_SHUTTLECOCK},
-      {VIEW_TRAININGNOMAL, STR_BALL_HANDBALL},
-      {VIEW_TRAININGNOMAL, STR_BALL_BASEBALL},
-      {VIEW_TRAININGNOMAL, STR_BALL_SOFTBALL},
-      {VIEW_TRAININGNOMAL, STR_BALL_CRICKET},
-      {VIEW_TRAININGNOMAL, STR_BALL_FOOTBALL},
-      {VIEW_TRAININGNOMAL, STR_BALL_BEACHSOCCER},
-      {VIEW_TRAININGNOMAL, STR_BALL_BEACHVOLLEYBALL},
-      {VIEW_TRAININGNOMAL, STR_BALL_CROQUET},
-      {VIEW_TRAININGNOMAL, STR_BALL_HOCKEY},
-      {VIEW_TRAININGNOMAL, STR_BALL_SQUASH},
-      {VIEW_TRAININGNOMAL, STR_BALL_SEPAKTAKRAW},
-      {VIEW_TRAININGNOMAL, STR_BALL_DODGEBALL},
-      {VIEW_TRAININGNOMAL, STR_BALL_BASKETBALL},
-      {VIEW_TRAININGNOMAL, STR_BALL_SOCCER},
-      {VIEW_TRAININGNOMAL, STR_BALL_GOLF},
-      {VIEW_TRAININGNOMAL, STR_BALL_POLO},
-      {VIEW_TRAININGNOMAL, STR_BALL_RACQUETBALL},
-      {VIEW_TRAININGNOMAL, STR_BALL_RUGBY},
-      {VIEW_TRAININGNOMAL, STR_BALL_GATEBALL},
-      {VIEW_TRAININGNOMAL, STR_BALL_PICKLEBALL},
-      {VIEW_TRAININGNOMAL, STR_BALL_LACROSSE},
+      {VIEW_TRAININGNOMAL, STR_BALL_GAMES},       // 球类运动
+      {VIEW_TRAININGNOMAL, STR_BALL_BADMINTON},  // 羽毛球
+      {VIEW_TRAININGNOMAL, STR_BALL_TABLETENNIS},// 乒乓球
+      {VIEW_TRAININGNOMAL, STR_BALL_TENNIS},     // 网球
+      {VIEW_TRAININGNOMAL, STR_BALL_BASKETBALL}, // 篮球
+      {VIEW_TRAININGNOMAL, STR_BALL_SOCCER},   // 足球
+      {VIEW_TRAININGNOMAL, STR_BALL_VOLLEYBALL},  // 排球
+      {VIEW_TRAININGNOMAL, STR_BALL_BILLIARDS},   // 撞球
+      {VIEW_TRAININGNOMAL, STR_BALL_BOWLING},     // 保龄球
+      {VIEW_TRAININGNOMAL, STR_BALL_BASEBALL},    // 棒球
+      {VIEW_TRAININGNOMAL, STR_BALL_SOFTBALL},    // 垒球
+      {VIEW_TRAININGNOMAL, STR_BALL_CRICKET},     // 板球
+      {VIEW_TRAININGNOMAL, STR_BALL_GOLF},        // 高尔夫球
       {VIEW_TRAININGNOMAL, STR_BALL_LIST},
   };
+  // 已注释的球类: STR_BALL_SHUTTLECOCK, STR_BALL_HANDBALL, STR_BALL_BEACHSOCCER, STR_BALL_BEACHVOLLEYBALL,
+  // STR_BALL_CROQUET, STR_BALL_HOCKEY, STR_BALL_SQUASH, STR_BALL_SEPAKTAKRAW, STR_BALL_DODGEBALL,
+  // STR_BALL_SOCCER, STR_BALL_POLO, STR_BALL_RACQUETBALL, STR_BALL_RUGBY, STR_BALL_GATEBALL, STR_BALL_PICKLEBALL, STR_BALL_LACROSSE
 
   for (int i = 0; i < TraingBallListMaxNum; i++) {
     TraingBalls[i] = defaultItems[i];

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_dance/include/TraingDanceModel.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_dance/include/TraingDanceModel.h
index b0a874b..34d67ba 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_dance/include/TraingDanceModel.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_dance/include/TraingDanceModel.h
@@ -37,7 +37,7 @@ namespace OHOS
         TraingDanceModel(const TraingDanceModel &);
         TraingDanceModel &operator=(const TraingDanceModel &);
         virtual ~TraingDanceModel();
-        static const uint16_t TraingDanceListMaxNum = 12;
+        static const uint16_t TraingDanceListMaxNum = 3;  // 保留：舞蹈
         TraingDanceItem TraingDances[TraingDanceListMaxNum] = {VIEW_INVALID, STR_DANCING_GENERAL};
         // std::map<int, AppViewId> TraingDanceIdToViewId;
         bool btConnectStatus{false};

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp
index 02048fc..95f2be1 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_dance/src/TraingDanceModel.cpp
@@ -21,25 +21,14 @@ TraingDanceModel &TraingDanceModel::GetInstance() {
 // static char *text[] = {"一般舞蹈", "肚皮舞", "爵士舞", "拉丁舞", "芭蕾",
 // "街舞", "广场舞", "尊巴", "社交舞", "踢踏舞"};
 
+// 保留：舞蹈；其他舞种已注释
 void TraingDanceModel::InitTraingDanceListItem() {
   int index = 0;
-
-  // 为 TraingDances 数组赋值
   TraingDances[index++] = {VIEW_TRAININGNOMAL, STR_DANCING_TITLE};   // title
-  TraingDances[index++] = {VIEW_TRAININGNOMAL, STR_DANCING_GENERAL}; // general
-  TraingDances[index++] = {VIEW_TRAININGNOMAL, STR_DANCING_BELLY};   // belly
-  TraingDances[index++] = {VIEW_TRAININGNOMAL, STR_DANCING_JAZZ};    // jazz
-  TraingDances[index++] = {VIEW_TRAININGNOMAL, STR_DANCING_LATIN};   // latin
-  TraingDances[index++] = {VIEW_TRAININGNOMAL, STR_DANCING_BALLET};  // ballet
-  TraingDances[index++] = {VIEW_TRAININGNOMAL, STR_DANCING_STREET};  // street
-  TraingDances[index++] = {VIEW_TRAININGNOMAL,
-                           STR_DANCING_PUBLICSQUARE}; // public square
-  TraingDances[index++] = {VIEW_TRAININGNOMAL, STR_DANCING_ZUMBA}; // zumba
-  TraingDances[index++] = {VIEW_TRAININGNOMAL,
-                           STR_DANCING_SOCIALDANCE}; // social dance
-  TraingDances[index++] = {VIEW_TRAININGNOMAL,
-                           STR_DANCING_TAPDANCE};               // tap dance
-  TraingDances[index] = {VIEW_TRAININGNOMAL, STR_DANCING_LIST}; // end
+  TraingDances[index++] = {VIEW_TRAININGNOMAL, STR_DANCING_GENERAL}; // 舞蹈
+  TraingDances[index] = {VIEW_TRAININGNOMAL, STR_DANCING_LIST};      // end
+  // 已注释: 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
 }
 
 const TraingDanceItem *TraingDanceModel::GetTraingDancelistItems() const {

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_fitness/include/TraingFitnessModel.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_fitness/include/TraingFitnessModel.h
index 8780384..7151156 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_fitness/include/TraingFitnessModel.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_fitness/include/TraingFitnessModel.h
@@ -31,7 +31,7 @@ private:
   TraingFitnessModel(const TraingFitnessModel &);
   TraingFitnessModel &operator=(const TraingFitnessModel &);
   virtual ~TraingFitnessModel();
-  static const uint16_t TraingFitnessListMaxNum = 60;
+  static const uint16_t TraingFitnessListMaxNum = 21;  // 保留的运动类型数量（含 title、list），与 text[] 元素个数一致，避免越界显示成冰上运动
 
   TraingFitnessItem TraingFitnesss[TraingFitnessListMaxNum] = {
       VIEW_INVALID, STR_EXERCISE_GENERAL};

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessModel.cpp
index d963706..39bcc7b 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_fitness/src/TraingFitnessModel.cpp
@@ -24,67 +24,39 @@ TraingFitnessModel &TraingFitnessModel::GetInstance() {
   static TraingFitnessModel instance;
   return instance;
 }
+// 保留：跑步 骑行 室外步行 有氧运动 冥想 健身 一般锻炼 自由训练 漫步机 HIIT 跳绳 体能训练 体操 健美操 团体操 瑜伽 室内走路 室内跑步 椭圆机 划船机；其他已注释
 UIResourceTextId text[] = {
-    STR_EXERCISE_TITLE, // title 健身运动
-    STR_EXERCISE_OUTDOORWALKING,
-    STR_EXERCISE_OUTDOORRUNNING,
-    STR_EXERCISE_OUTDOORBIKING,
-    STR_EXERCISE_GENERAL,
-    STR_EXERCISE_FREETRAINING,
-    STR_EXERCISE_RESISTANCETRAINING,
-    STR_EXERCISE_SPINBIKE,
-    STR_EXERCISE_TREADMILL,
-    STR_EXERCISE_STROLLMACHINE,
-    STR_EXERCISE_HIIT,
-    STR_EXERCISE_CROSSFIT,
-    STR_EXERCISE_GROUPCALISTHENICS,
-    STR_EXERCISE_YOGA,
-    STR_EXERCISE_YOGACAT,
-    STR_EXERCISE_YOGACOW,
-    STR_EXERCISE_YOGACOBRA,
-    STR_EXERCISE_YOGAHERO1,
-    STR_EXERCISE_YOGAHERO2,
-    STR_EXERCISE_YOGAHERO3,
-    STR_EXERCISE_YOGAROLLING,
-    STR_EXERCISE_INDOORWALKING,
-    STR_EXERCISE_INDOORRUNNING,
-    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_CIRCUIT,
-    STR_EXERCISE_AEROBICS,
-    STR_EXERCISE_CALISTHENICE,
-    STR_EXERCISE_P90X,
-    STR_EXERCISE_KETTLEBELLTRAINING,
-    STR_EXERCISE_MIXEDMARTIALARTS,
-    STR_EXERCISE_STAIRCLIMBINGMACHINE,
-    STR_EXERCISE_WEIGHTLIFTING,
-    STR_EXERCISE_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_EXERCISE_LIST, //健身类
+    STR_EXERCISE_TITLE,             // title 健身运动
+    STR_EXERCISE_OUTDOORRUNNING,    // 跑步
+    STR_EXERCISE_OUTDOORBIKING,     // 骑行
+    STR_EXERCISE_OUTDOORWALKING,    // 室外步行
+    STR_EXERCISE_AEROBICS,          // 有氧运动
+    // STR_EXERCISE_MINDBODY,          // 冥想
+    STR_EXERCISE_CROSSFIT,          // 健身
+    STR_EXERCISE_GENERAL,           // 一般锻炼
+    STR_EXERCISE_FREETRAINING,      // 自由训练
+    STR_EXERCISE_STROLLMACHINE,     // 漫步机
+    STR_EXERCISE_HIIT,              // HIIT/高强度间歇训练
+    STR_EXERCISE_JUMPINGROPE,       // 跳绳
+    STR_EXERCISE_PHYSICALTRAINING,  // 体能训练
+    STR_EXERCISE_GYMNASTICS,        // 体操
+    STR_EXERCISE_CALISTHENICE,      // 健美操
+    STR_EXERCISE_GROUPCALISTHENICS, // 团体操
+    STR_EXERCISE_YOGA,              // 瑜伽
+    STR_EXERCISE_INDOORWALKING,     // 室内走路
+    STR_EXERCISE_INDOORRUNNING,     // 室内跑步
+    STR_EXERCISE_ELLIPTICALTRAINER, // 椭圆机
+    STR_EXERCISE_ROWINGMACHINE,     // 划船机
+    STR_EXERCISE_LIST,              // 健身类
+    // 以下已注释
+    // STR_EXERCISE_RESISTANCETRAINING, STR_EXERCISE_SPINBIKE, STR_EXERCISE_TREADMILL,
+    // STR_EXERCISE_YOGACAT, STR_EXERCISE_YOGACOW, STR_EXERCISE_YOGACOBRA, STR_EXERCISE_YOGAHERO1/2/3, STR_EXERCISE_YOGAROLLING,
+    // STR_EXERCISE_PILATES, STR_EXERCISE_CROSS_FIT, STR_EXERCISE_FUNCTIONALTRAINING, 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_CIRCUIT, STR_EXERCISE_P90X,
+    // STR_EXERCISE_KETTLEBELLTRAINING, STR_EXERCISE_MIXEDMARTIALARTS, STR_EXERCISE_STAIRCLIMBINGMACHINE, STR_EXERCISE_WEIGHTLIFTING,
+    // STR_EXERCISE_BARRE, STR_EXERCISE_HANDCYCLING, STR_EXERCISE_TRACKFIELD, STR_EXERCISE_WRESTLING, STR_EXERCISE_FLEXIBILITY,
+    // STR_EXERCISE_MIXEDCARDIO, STR_EXERCISE_TRADITIONALSTRENGTHTRAINING, STR_EXERCISE_CROSSTRAINING, STR_EXERCISE_STEPTRAINING,
 };
 
 void TraingFitnessModel::InitTraingFitnessListItem() {

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_more/include/TraingMoreModel.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_more/include/TraingMoreModel.h
index ffa0b51..9f82a6d 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_more/include/TraingMoreModel.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_more/include/TraingMoreModel.h
@@ -35,7 +35,7 @@ namespace OHOS
         TraingMoreModel(const TraingMoreModel &);
         TraingMoreModel &operator=(const TraingMoreModel &);
         virtual ~TraingMoreModel();
-        static const uint16_t TraingMoreListMaxNum = 9;
+        static const uint16_t TraingMoreListMaxNum = 8;  // 已去除冰上运动
         TraingMoreItem TraingMores[TraingMoreListMaxNum] = {VIEW_INVALID, STR_ICE_SPORTS, nullptr};
         // std::map<int, AppViewId> TraingMoreIdToViewId;
         bool btConnectStatus{false};

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_more/src/TraingMoreModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_more/src/TraingMoreModel.cpp
index b2843a2..ad7e60c 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_more/src/TraingMoreModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_more/src/TraingMoreModel.cpp
@@ -45,8 +45,8 @@ namespace OHOS
         TraingMores[index++] = {VIEW_TRAININGREST, STR_RECREATIONAL_LIST, REST_IMAGE};
         TraingMores[index++] = {VIEW_TRAININGBALL, STR_BALL_LIST, BALL_IMAGE};
         // TraingMores[4] = {VIEW_TRAININGAQUATIC, STR_WATER_LIST, SWIMMING_IMAGE};水上运动
-        TraingMores[index++] = {VIEW_TRAININGICE, STR_ICE_LIST, ICE_IMAGE};
-        TraingMores[index++] = {VIEW_TRAININGLIMIT, STR_EXTREME_LIST, LIMIT_IMAGE};
+        // TraingMores[index++] = {VIEW_TRAININGICE, STR_ICE_LIST, ICE_IMAGE};  // 冰上运动已去除
+        // TraingMores[index++] = {VIEW_TRAININGLIMIT, STR_EXTREME_LIST, LIMIT_IMAGE};
         TraingMores[index++] = {VIEW_TRAININGOTHER, STR_OTHER_LIST, OTHER_IMAGE};
         TraingMores[index++] = {VIEW_INVALID, STR_TRAINING, nullptr};
     }

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp
index a35a02b..f89ca55 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_more/src/TraingMorePresenter.cpp
@@ -124,12 +124,12 @@ namespace OHOS
         // 设置训练类型\r
         switch (viewId)\r
         {\r
-        case VIEW_TRAININGLIMIT:\r
-            TraingModel::GetInstance()->SetSportType(Exercisetype::EXTREME);\r
-            break;\r
-        case VIEW_TRAININGICE:\r
-            TraingModel::GetInstance()->SetSportType(Exercisetype::ICE);\r
-            break;\r
+        // case VIEW_TRAININGLIMIT:\r
+        //     TraingModel::GetInstance()->SetSportType(Exercisetype::EXTREME);\r
+        //     break;\r
+        // case VIEW_TRAININGICE: 冰上运动已去除\r
+        //     TraingModel::GetInstance()->SetSportType(Exercisetype::ICE);\r
+        //     break;\r
         case VIEW_TRAININGFITNESS:\r
             TraingModel::GetInstance()->SetSportType(Exercisetype::FITNESS);\r
             break;\r

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_other/include/TraingOtherModel.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_other/include/TraingOtherModel.h
index 7edbb1c..9803e16 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_other/include/TraingOtherModel.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_other/include/TraingOtherModel.h
@@ -45,7 +45,7 @@ namespace OHOS
         TraingOtherModel(const TraingOtherModel &);
         TraingOtherModel &operator=(const TraingOtherModel &);
         virtual ~TraingOtherModel();
-        static const uint16_t TraingOtherListMaxNum = 11;
+        static const uint16_t TraingOtherListMaxNum = 3;  // 其他运动仅保留：冥想
         TraingOtherItem TraingOthers[TraingOtherListMaxNum] = {VIEW_INVALID, STR_EXERCISE_GENERAL};
         // std::map<int, AppViewId> TraingOtherIdToViewId;
         bool btConnectStatus{false};

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_other/src/TraingOtherModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_other/src/TraingOtherModel.cpp
index 55d623f..bc6feec 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_other/src/TraingOtherModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_other/src/TraingOtherModel.cpp
@@ -28,17 +28,10 @@ TraingOtherModel &TraingOtherModel::GetInstance() {
   return instance;
 }
 
+// 其他运动仅保留：冥想
 TraingOtherItem defaultItems[] = {
     {VIEW_TRAININGNOMAL, STR_OTHER_LIST},
-    {VIEW_TRAININGNOMAL, STR_OTHER_ELEVATOR},
-    {VIEW_TRAININGNOMAL, STR_OTHER_ESCALATOR},
-    {VIEW_TRAININGNOMAL, STR_OTHER_GARDENING},
-    {VIEW_TRAININGNOMAL, STR_OTHER_HORSEWORK},
-    {VIEW_TRAININGNOMAL, STR_OTHER_INVEHICLE},
     {VIEW_TRAININGNOMAL, STR_OTHER_MEDITATION},
-    {VIEW_TRAININGNOMAL, STR_OTHER_STILL},
-    {VIEW_TRAININGNOMAL, STR_OTHER_TILTING},
-    {VIEW_TRAININGNOMAL, STR_OTHER_WHEELCHAIR},
     {VIEW_TRAININGNOMAL, STR_MAX_ID},
 };
 void TraingOtherModel::InitTraingOtherListItem() {

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_rest/include/TraingRestModel.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_rest/include/TraingRestModel.h
index 3e18324..69158d7 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_rest/include/TraingRestModel.h
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_rest/include/TraingRestModel.h
@@ -37,7 +37,7 @@ namespace OHOS
         TraingRestModel(const TraingRestModel &);
         TraingRestModel &operator=(const TraingRestModel &);
         virtual ~TraingRestModel();
-        static const uint16_t TraingRestListMaxNum = 26;
+        static const uint16_t TraingRestListMaxNum = 3;  // 保留：休闲运动
         TraingRestItem TraingRests[TraingRestListMaxNum] = {VIEW_INVALID, STR_EXERCISE_GENERAL};
         // std::map<int, AppViewId> TraingRestIdToViewId;
         bool btConnectStatus{false};

diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_rest/src/TraingRestModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_rest/src/TraingRestModel.cpp
index 6084100..9af1552 100644 (file)
--- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_rest/src/TraingRestModel.cpp
+++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/training_list_rest/src/TraingRestModel.cpp
@@ -24,35 +24,14 @@ TraingRestModel &TraingRestModel::GetInstance() {
   return instance;
 }
 
+// 保留：休闲运动；其他已注释
 void TraingRestModel::InitTraingRestListItem() {
   TraingRestItem defaultItems[] = {
       {VIEW_TRAININGNOMAL, STR_RECREATIONAL_LIST},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_SPORTS},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_SKATING},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_MARTIALARTS},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_TAICHI},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_HULAHOOP},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_DISCSPORT},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_DARTS},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_ARCHERY},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_HORSERIDING},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_BATTLEGAME},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_KITE},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_TUGOFWAR},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_SWING},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_STAIRCLIMBING},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_OBSTACLERACE},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_FISHING},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_HUNTING},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_SCOOTERRIDING},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_PARAGLIDING},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_TEAMSPORTS},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_FINESSGAMING},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_HIKING},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_EQUESTRIANSPORTS},
-      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_PLAY},
+      {VIEW_TRAININGNOMAL, STR_RECREATIONAL_SPORTS},  // 休闲运动
       {VIEW_TRAININGNOMAL, STR_MAX_ID},
   };
+  // 已注释的休闲项: STR_RECREATIONAL_SKATING, STR_RECREATIONAL_MARTIALARTS, STR_RECREATIONAL_TAICHI 等
 
   for (int i = 0; i < TraingRestListMaxNum; i++) {
     TraingRests[i] = defaultItems[i];