From 9fa30980ba28f474647ea76e8f3a2bfa59c62020 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com> Date: Fri, 6 Sep 2024 14:33:34 +0000 Subject: [PATCH] Merge #898 into sdk602patch0626 from refs/changes/898/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Code review from 袁清梦 * refs/changes/898/head: (6 commits squashed) - 增加多国语言自动翻译脚本：待完善 - 修复心率测量发生的死机 - Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626 - #440运动-健身类-少了循环训练 - #439运动-健身类 排序问题 室外走路，跑步，骑行不在顶部，需要把常用的放在顶部 - #445 运动-休闲运动-少了对战游戏 Signed-off-by: Caisking <3449750381@qq.com> Reviewed-by: snickersun@163.com Merged-by: snickersun@163.com CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/898 --- .../include/TraingFitnessModel.h | 6 +++--- .../training_list_fitness/src/TraingFitnessModel.cpp | 12 +++++++----- .../training_list_rest/include/TraingRestModel.h | 2 +- .../training_list_rest/src/TraingRestModel.cpp | 8 +++++++- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessModel.h index 4ab8bc347..9eeefd0a6 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessModel.h @@ -1,8 +1,8 @@ /*** * @Date: 2024-04-15 10:55:58 * @LastEditors: Caisking 3449750381@qq.com - * @LastEditTime: 2024-04-29 17:02:28 - * @FilePath: /XTS_FD230/FD230/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessModel.h + * @LastEditTime: 2024-09-06 18:47:14 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/include/TraingFitnessModel.h */ #ifndef TraingFitness_MODEL_H @@ -31,7 +31,7 @@ namespace OHOS TraingFitnessModel(const TraingFitnessModel &); TraingFitnessModel &operator=(const TraingFitnessModel &); virtual ~TraingFitnessModel(); - static const uint16_t TraingFitnessListMaxNum = 57; + static const uint16_t TraingFitnessListMaxNum = 58; TraingFitnessItem TraingFitnesss[TraingFitnessListMaxNum] = {VIEW_INVALID, STR_EXERCISE_GENERAL}; // std::map TraingFitnessIdToViewId; bool btConnectStatus{false}; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessModel.cpp index 2a1d164ca..f9a0e7c83 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_fitness/src/TraingFitnessModel.cpp @@ -25,6 +25,9 @@ namespace OHOS return instance; } UIResourceTextId text[] = { + STR_EXERCISE_OUTDOORWALKING, + STR_EXERCISE_OUTDOORRUNNING, + STR_EXERCISE_OUTDOORBIKING, STR_EXERCISE_GENERAL, STR_EXERCISE_FREETRAINING, STR_EXERCISE_RESISTANCETRAINING, @@ -42,11 +45,8 @@ namespace OHOS STR_EXERCISE_YOGAHERO2, STR_EXERCISE_YOGAHERO3, STR_EXERCISE_YOGAROLLING, - STR_EXERCISE_OUTDOORWALKING, - STR_EXERCISE_OUTDOORRUNNING, STR_EXERCISE_INDOORWALKING, STR_EXERCISE_INDOORRUNNING, - STR_EXERCISE_OUTDOORBIKING, STR_EXERCISE_JUMPINGROPE, STR_EXERCISE_PILATES, STR_EXERCISE_CROSS_FIT, @@ -62,6 +62,7 @@ namespace OHOS STR_EXERCISE_KENDO, STR_EXERCISE_HORIZONTALBAR, STR_EXERCISE_PARALLELBARS, + STR_EXERCISE_CIRCUIT, STR_EXERCISE_AEROBICS, STR_EXERCISE_CALISTHENICE, STR_EXERCISE_P90X, @@ -81,7 +82,8 @@ namespace OHOS STR_EXERCISE_GYMNASTICS, STR_EXERCISE_STEPTRAINING, STR_EXERCISE_ELLIPTICALTRAINER, - STR_EXERCISE_ROWINGMACHINE}; + STR_EXERCISE_ROWINGMACHINE, + }; void TraingFitnessModel::InitTraingFitnessListItem() { @@ -142,7 +144,7 @@ namespace OHOS TraingFitnesss[54] = {VIEW_TRAININGNOMAL, text[54]}; TraingFitnesss[55] = {VIEW_TRAININGNOMAL, text[55]}; TraingFitnesss[56] = {VIEW_TRAININGNOMAL, text[56]}; - //访问的数组超过了数组容量 + // 访问的数组超过了数组容量 } const TraingFitnessItem *TraingFitnessModel::GetTraingFitnesslistItems() const diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/include/TraingRestModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/include/TraingRestModel.h index 2983ad442..75e3fcdf2 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/include/TraingRestModel.h +++ b/code/sdk/application/wearable/fd230app/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 = 23; + static const uint16_t TraingRestListMaxNum = 24; TraingRestItem TraingRests[TraingRestListMaxNum] = {VIEW_INVALID, STR_EXERCISE_GENERAL}; // std::map TraingRestIdToViewId; bool btConnectStatus{false}; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestModel.cpp index a2627a30d..2be515658 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestModel.cpp @@ -1,4 +1,9 @@ - +/*** + * @Date: 2024-04-15 10:55:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-09-06 19:00:18 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/traing/training_list_rest/src/TraingRestModel.cpp + */ #include "traing/training_list_rest/include/TraingRestModel.h" #include "common/image_cache_manager.h" @@ -34,6 +39,7 @@ namespace OHOS {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}, -- 2.17.1