From: Caisking <3449750381@qq.com> Date: Mon, 22 Apr 2024 07:26:33 +0000 (+0800) Subject: 训练结束同步训练类型Icon X-Git-Tag: release_V1.2.70_20241020_135402~1153 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=9117a7041e5aaa7f232e2d7a28546502446fae17;p=mirrors%2FFD230.git 训练结束同步训练类型Icon --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h index d0bbb4259..04d125e90 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h @@ -17,6 +17,7 @@ namespace OHOS #define ICON36 "/user/res/Training/icon_36x36" #define ICON60 "/user/res/Training/icon_60x60" #define ICON80 "/user/res/Training/icon_80x80" +#define ICON54 "user/res/Training/icon_54x79" #define MODULES "/user/res/Training/modules" #define TRAINING_GIF "/user/res/Training/training_GIF" @@ -47,6 +48,17 @@ namespace OHOS static constexpr const char *PINGPONG_80_IMAGE = ICON80 "/Pingpong_80.bin"; static constexpr const char *RIDING_80_IMAGE = ICON80 "/Riding_80.bin"; + // Icon in the icon_54x79 folder + static constexpr const char *BALL_54_IMAGE = ICON54 "/Ball_54.bin"; + static constexpr const char *DANCE_54_IMAGE = ICON54 "/Dance_54.bin"; + static constexpr const char *FITNESS_54_IMAGE = ICON54 "/Fitness_54.bin"; + static constexpr const char *ICE_54_IMAGE = ICON54 "/Ice_54.bin"; + static constexpr const char *LIMIT_54_IMAGE = ICON54 "/Limit_54.bin"; + static constexpr const char *OTHER_54_IMAGE = ICON54 "/Other_54.bin"; + static constexpr const char *REST_54_IMAGE = ICON54 "/Rest_54.bin"; + static constexpr const char *SWIMMING_54_IMAGE = ICON54 "/Swimming_54.bin"; + static constexpr const char *WALKING_54_IMAGE = ICON54 "/Walking_54.bin"; + // Modules icons static constexpr const char *ARROWS_IMAGE = MODULES "/Arrows.bin"; static constexpr const char *BACK_IMAGE = MODULES "/Back.bin"; @@ -95,7 +107,7 @@ namespace OHOS static constexpr const char *STEP_30_IMAGE = MODULES "/Step_30.bin"; static constexpr const char *SPORT_HEARTRATE_IMAGE = MODULES "/sport_heartrate.bin"; static constexpr const char *TIME_IMAGE = MODULES "/Time.bin"; - static constexpr const char *WALKING_54_IMAGE = MODULES "/Walking_54.bin"; + //static constexpr const char *WALKING_54_IMAGE = MODULES "/Walking_54.bin"; static constexpr const char *WARNING_IMAGE = MODULES "/Warning.bin"; static constexpr const char *YES_IMAGE = MODULES "/Yes.bin"; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h index 76b850365..0e30b4b0e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h @@ -79,7 +79,7 @@ namespace OHOS UILabelButtonExt *buttonexit = nullptr; - UIImageView *imageLine1 = nullptr; + UIImageView *imageIcon = nullptr; UIImageView *imageLine2 = nullptr; UIImageView *imageLine3 = nullptr; UIImageView *imageLine4 = nullptr; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h index 8d1f6aa92..c413c0cca 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h @@ -230,8 +230,8 @@ namespace OHOS std::string DisplayMotionDuration(); /*设置运动类型*/ void SetSportType(Exercisetype type); - /*获取运动类型*/ - Exercisetype GetSportType(); + /*获取运动类型图片*/ + std::string GetSportType(); /*设置运动项目*/ void SetSportEvent(UIResourceTextId id); /*获取运动项目*/ diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp index 5e076de54..0d92edb5d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp @@ -67,7 +67,7 @@ namespace OHOS { if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { - NativeAbility::GetInstance().EnterSlice(VIEW_TRAINING); + NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE); } UNUSED(view); return true; @@ -78,7 +78,7 @@ namespace OHOS // 根据控件id查找是哪个控件触发了点击回调 if (strcmp(view.GetViewId(), BUTTONBACK) == 0) { - NativeAbility::GetInstance().EnterSlice(VIEW_APPLIST); + NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE); } return true; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp index 50dfab9af..c26c62d01 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp @@ -59,7 +59,7 @@ namespace OHOS scrollView_->SetVisible(true); // 初始化image - TraingModel::GetInstance()->InitImageView(imageLine1, 80, 132, 54, 80, "image5", WALKING_54_IMAGE); + TraingModel::GetInstance()->InitImageView(imageIcon, 80, 132, 54, 80, "image5", WALKING_54_IMAGE); TraingModel::GetInstance()->InitImageView(imageLine2, 97, 214, 80, 20, "image6", LINE_IMAGE); TraingModel::GetInstance()->InitImageView(imageLine3, 97, 344, 80, 20, "image8", LINE_IMAGE); TraingModel::GetInstance()->InitImageView(imageLine4, 97, 474, 80, 20, "image9", LINE_IMAGE); @@ -70,7 +70,7 @@ namespace OHOS scrollView_->Add(imageLine4); scrollView_->Add(imageLine5); scrollView_->Add(imageLine6); - scrollView_->Add(imageLine1); + scrollView_->Add(imageIcon); // 初始化Lable // 初始化标签 @@ -208,10 +208,10 @@ namespace OHOS buttonexit = nullptr; } /*图片*/ - if (imageLine1 != nullptr) + if (imageIcon != nullptr) { - delete imageLine1; - imageLine1 = nullptr; + delete imageIcon; + imageIcon = nullptr; } if (imageLine2 != nullptr) { @@ -259,7 +259,10 @@ namespace OHOS void TraingEnddataView::InitData() { SportData *enddata = TraingModel::GetInstance()->GetSportdata(); - + // 训练图标Icon + std::string imageStr = TraingModel::GetInstance()->GetSportType(); + imageIcon->SetSrc(imageStr.c_str()); + // 运动项目 labelsport->SetTextId(enddata->sportId); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp index 280096327..5471fe934 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -432,10 +432,21 @@ namespace OHOS { sportType_ = type; } - /*获取运动类型*/ - Exercisetype TraingModel::GetSportType() + /*结束数据icon*/ + std::string sportImages[8] = { + FITNESS_54_IMAGE, + DANCE_54_IMAGE, + REST_54_IMAGE, + BALL_54_IMAGE, + SWIMMING_54_IMAGE, + ICE_54_IMAGE, + LIMIT_54_IMAGE, + OTHER_54_IMAGE, + }; + /*获取运动类型图片*/ + std::string TraingModel::GetSportType() { - return sportType_; + return sportImages[static_cast(sportType_)]; } /*设置运动Id*/ void TraingModel::SetSportEvent(UIResourceTextId id) diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp index fd78117d9..1c37781cd 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp @@ -9,6 +9,7 @@ #include #include #include "traing/training_card/include/TraingCardPresenter.h" +#include "traing/training_card/include/TrainingControlView.h" #include "traing/include/TraingModel.h" #include "custom_utils.h" #include "vibrator_service.h" @@ -286,7 +287,8 @@ namespace OHOS } uapi_set_screen_on_api(); // 亮屏检测 NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD); // 切换Slice - + // 增加打印 + PRINT("cmd->sportType[%d],cmd->controlmd[%d],cmd->sportTagType[%d],cmd->sportType[%d]\r\n", cmd->sportType, cmd->controlmd, cmd->sportTagType, cmd->sportType); switch (cmd->sportType) { // 室外走路 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ball_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ball_54.bin new file mode 100644 index 000000000..b93746ad7 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ball_54.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Dance_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Dance_54.bin new file mode 100644 index 000000000..85cb1e01d Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Dance_54.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Fitness_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Fitness_54.bin new file mode 100644 index 000000000..85ce2a06c Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Fitness_54.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ice_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ice_54.bin new file mode 100644 index 000000000..2ff457221 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ice_54.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Other_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Other_54.bin new file mode 100644 index 000000000..f6dd40be0 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Other_54.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Rest_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Rest_54.bin new file mode 100644 index 000000000..2141e2e96 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Rest_54.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Swimming_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Swimming_54.bin new file mode 100644 index 000000000..9443d8314 Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Swimming_54.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Walking_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Walking_54.bin new file mode 100644 index 000000000..7e498ca0d Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Walking_54.bin differ diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Walking_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Walking_54.bin deleted file mode 100644 index 0c977057b..000000000 Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Walking_54.bin and /dev/null differ