From e559bea50afb2f6e86c30f8ca1d1c832cfef9a9b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=A2=81=E6=B8=85=E6=A2=A6?= <3449750381@qq.com> Date: Fri, 20 Dec 2024 07:03:19 +0000 Subject: [PATCH] Merge #1538 into sdk602patch0911 from refs/changes/1538/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit - #1234 手表，手表上的运动记录图标与APP运动记录图标不一致 - 修复错误的解析项 --- .../nativeui/traing/Training_UiConfig.h | 12 ++- .../nativeui/traing/include/TraingModel.h | 6 +- .../nativeui/traing/src/TraingEnddataView.cpp | 8 +- .../nativeui/traing/src/TraingModel.cpp | 80 +++++++++++++----- .../traingrecord/src/TraingRecordModel.cpp | 2 +- .../fs/user/res/Training/icon_36x36/Ball.bin | 2 +- .../fs/user/res/Training/icon_36x36/Dance.bin | 2 +- .../user/res/Training/icon_36x36/Fitness.bin | 2 +- .../Training/icon_36x36/FreeTraining_60.bin | 3 + .../fs/user/res/Training/icon_36x36/Ice.bin | 2 +- .../fs/user/res/Training/icon_36x36/Limit.bin | 2 +- .../fs/user/res/Training/icon_36x36/Other.bin | 2 +- .../fs/user/res/Training/icon_36x36/Rest.bin | 2 +- .../res/Training/icon_36x36/Riding_60.bin | 3 + .../res/Training/icon_36x36/Running_60.bin | 3 + .../user/res/Training/icon_36x36/Swimming.bin | 2 +- .../user/res/Training/icon_36x36/riding.bin | 3 + .../user/res/Training/icon_36x36/running.bin | 3 + .../user/res/Training/icon_36x36/walking.bin | 3 + .../res/Training/icon_36x36/walking_60.bin | 3 + .../res/Training/icon_60x60/Riding_60.bin | 2 +- .../res/Training/icon_60x60/Running_60.bin | 2 +- .../user/res/Training/icon_60x60/riding.bin | 3 + .../user/res/Training/icon_60x60/running.bin | 3 + .../user/res/Training/icon_60x60/walking.bin | 3 + .../res/Training/icon_60x60/walking_60.bin | 2 +- .../hert/Training/icon_36x36/Jumprope.png | Bin 1051 -> 0 bytes .../Training/icon_36x36/Mountaineering.png | Bin 1124 -> 0 bytes .../hert/Training/icon_36x36/Pingpong.png | Bin 973 -> 0 bytes .../test/hert/Training/icon_36x36/Riding.png | Bin 1462 -> 0 bytes .../test/hert/Training/icon_36x36/Running.png | Bin 993 -> 0 bytes .../test/hert/Training/icon_36x36/Walking.png | Bin 1010 -> 0 bytes .../test/hert/Training/icon_36x36/riding.png | Bin 0 -> 1439 bytes .../test/hert/Training/icon_36x36/running.png | Bin 0 -> 996 bytes .../test/hert/Training/icon_36x36/walking.png | Bin 0 -> 992 bytes .../test/hert/Training/icon_60x60/riding.png | Bin 0 -> 2319 bytes .../test/hert/Training/icon_60x60/running.png | Bin 0 -> 1514 bytes .../test/hert/Training/icon_60x60/walking.png | Bin 0 -> 1544 bytes tools/log_parser/runtimeanalysis.py | 8 +- 39 files changed, 123 insertions(+), 45 deletions(-) create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/FreeTraining_60.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Riding_60.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Running_60.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/riding.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/running.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/walking.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/walking_60.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/riding.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/running.bin create mode 100644 code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/walking.bin delete mode 100755 tools/image_converter_tool/test/hert/Training/icon_36x36/Jumprope.png delete mode 100755 tools/image_converter_tool/test/hert/Training/icon_36x36/Mountaineering.png delete mode 100755 tools/image_converter_tool/test/hert/Training/icon_36x36/Pingpong.png delete mode 100755 tools/image_converter_tool/test/hert/Training/icon_36x36/Riding.png delete mode 100755 tools/image_converter_tool/test/hert/Training/icon_36x36/Running.png delete mode 100755 tools/image_converter_tool/test/hert/Training/icon_36x36/Walking.png create mode 100644 tools/image_converter_tool/test/hert/Training/icon_36x36/riding.png create mode 100644 tools/image_converter_tool/test/hert/Training/icon_36x36/running.png create mode 100644 tools/image_converter_tool/test/hert/Training/icon_36x36/walking.png create mode 100644 tools/image_converter_tool/test/hert/Training/icon_60x60/riding.png create mode 100644 tools/image_converter_tool/test/hert/Training/icon_60x60/running.png create mode 100644 tools/image_converter_tool/test/hert/Training/icon_60x60/walking.png 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 54cb68ea3..077236013 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h @@ -29,17 +29,23 @@ namespace OHOS static constexpr const char *OTHER_IMAGE = ICON36 "/Other.bin"; static constexpr const char *PINGPONG_IMAGE = ICON36 "/Pingpong.bin"; static constexpr const char *REST_IMAGE = ICON36 "/Rest.bin"; - static constexpr const char *RIDING_IMAGE = ICON36 "/Riding.bin"; - static constexpr const char *RUNNING_IMAGE = ICON36 "/Running.bin"; static constexpr const char *SWIMMING_IMAGE = ICON36 "/Swimming.bin"; - static constexpr const char *WALKING_IMAGE = ICON36 "/Walking.bin"; + static constexpr const char *RIDING_IMAGE = ICON36 "/riding.bin"; + static constexpr const char *RUNNING_IMAGE = ICON36 "/running.bin"; + static constexpr const char *WALKING_IMAGE = ICON36 "/walking.bin"; // Icons in the icon_60x60 folder + static constexpr const char *RIDING_60_IMAGE_END = ICON60 "/riding.bin"; + static constexpr const char *RUNNING_60_IMAGE_END = ICON60 "/running.bin"; + static constexpr const char *WALKING_60_IMAGE_END = ICON60 "/walking.bin"; static constexpr const char *RIDING_60_IMAGE = ICON60 "/Riding_60.bin"; static constexpr const char *RUNNING_60_IMAGE = ICON60 "/Running_60.bin"; static constexpr const char *WALKING_60_IMAGE = ICON60 "/walking_60.bin"; + + static constexpr const char *FREE_60_IMAGE = ICON60 "/FreeTraining_60.bin"; + // Icons in the icon_80x80 folder static constexpr const char *JUMPROPE_80_IMAGE = ICON80 "/Jumprope_80.bin"; static constexpr const char *MOUNTAINEERING_80_IMAGE = ICON80 "/Mountaineering_80.bin"; 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 632118571..eb3e9f7c1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h @@ -314,8 +314,10 @@ public: int GetBleSportId(Exercisetype sporttype, UIResourceTextId id); /*获取协议Id*/ UIResourceTextId GetSportTypeId(Exercisetype type); /*获取训练类Id*/ void SetSportType(Exercisetype type); /*设置运动类型*/ - std::string GetSportType(Exercisetype sporttype); /*获取训练类型type图片*/ - std::string GetSportIcon(Exercisetype sporttype); /*获取训练类型icon图片*/ + // std::string GetSportType(Exercisetype sporttype); /*获取训练类型type图片*/ + // std::string GetSportIcon(Exercisetype sporttype); /*获取训练类型icon图片*/ + std::string GetSportIcon(Exercisetype sporttype, UIResourceTextId id, + uint8_t type); // 训练目标相关配置 void SetSportTag(ExerciseTag tagtpye, 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 8f9d23a21..08ec1d13c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp @@ -113,8 +113,8 @@ void TraingEnddataView ::InitializeLabels() { /*title and sport*/ InitRollLabel(labeltype, 83, 50, 300, 35, "label1", STR_EXERCISE_LIST, DEFAULT_VECTOR_FONT_FILENAME, 30); - InitRollLabel(labelsport, 147, 140, 240, 35, "label6", STR_EXERCISE_OUTDOORRUNNING, - DEFAULT_VECTOR_FONT_FILENAME, 30); + InitRollLabel(labelsport, 147, 140, 240, 35, "label6", + STR_EXERCISE_OUTDOORRUNNING, DEFAULT_VECTOR_FONT_FILENAME, 30); InitLabel(labelduration, 146, 179, 240, 40, "label7", "13:00:22-15:00:12", DEFAULT_VECTOR_FONT_FILENAME, 28); // 初始化Label @@ -513,8 +513,8 @@ void TraingEnddataView::InitData() { } // 训练图标Icon - std::string imageStr = - TraingModel::GetInstance()->GetSportType(enddata->sportType); + std::string imageStr = TraingModel::GetInstance()->GetSportIcon( + enddata->sportType, enddata->sportId, 0); if (!imageStr.empty()) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "imageIcon %s\r\n", imageStr.c_str()); 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 22c061345..0e9817722 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -231,16 +231,6 @@ void TraingModel ::Init() { } /*设置运动类型*/ void TraingModel::SetSportType(Exercisetype type) { sportType_ = type; } -/*结束数据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, -}; -/*训练记录Icon*/ -std::string sportIcons[8] = { - FITNESS_IMAGE, DANCE_IMAGE, REST_IMAGE, BALL_IMAGE, - SWIMMING_IMAGE, ICE_IMAGE, LIMIT_IMAGE, OTHER_IMAGE, -}; /*获取训练Id->协议*/ int TraingModel::GetBleSportId(Exercisetype sporttype, UIResourceTextId id) { int offset = 0; @@ -277,17 +267,67 @@ int TraingModel::GetBleSportId(Exercisetype sporttype, UIResourceTextId id) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " offset %d id %d", offset, id); return id - offset; } -/*获取运动类型图片*/ -std::string TraingModel::GetSportType(Exercisetype sporttype) { - int index = static_cast(sporttype); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " GetSportType index %d", index); - return sportImages[index]; -} -/*获取运动类型icon*/ -std::string TraingModel::GetSportIcon(Exercisetype sporttype) { + +/*结束数据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, +}; +/*训练记录Icon*/ +std::string sportIcons[8] = { + FITNESS_IMAGE, DANCE_IMAGE, REST_IMAGE, BALL_IMAGE, + SWIMMING_IMAGE, ICE_IMAGE, LIMIT_IMAGE, OTHER_IMAGE, +}; +/*特殊运动icon*/ +std::string sportIcons_special[6] = {RUNNING_60_IMAGE_END, WALKING_60_IMAGE_END, + RIDING_60_IMAGE_END, RUNNING_IMAGE, + WALKING_IMAGE, RIDING_IMAGE}; + +/* + type + 0 是运动结束图标 + 1 是运动类型图标 +*/ +std::string TraingModel::GetSportIcon(Exercisetype sporttype, + UIResourceTextId id, uint8_t type) { + + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + " GetSportIcon sporttype %d id %d type %d", sporttype, id, + type); + bool specialsport = false; + uint8_t specialindex = 0; + switch (id) { + case UIResourceTextId::STR_EXERCISE_OUTDOORRUNNING: + case UIResourceTextId::STR_EXERCISE_INDOORRUNNING: + specialsport = true; + specialindex = 0; + break; + case UIResourceTextId::STR_EXERCISE_OUTDOORWALKING: + case UIResourceTextId::STR_EXERCISE_INDOORWALKING: + specialsport = true; + specialindex = 1; + break; + case UIResourceTextId::STR_EXERCISE_OUTDOORBIKING: + specialsport = true; + specialindex = 2; + break; + } int index = static_cast(sporttype); - WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " GetSportIcon index %d", index); - return sportIcons[static_cast(sporttype)]; + if (specialsport) { + // 特殊运动 + if (type == 0) { + return sportIcons_special[specialindex]; //返回特殊运动大图标 + } else { + return sportIcons_special[specialindex + 3]; //返回特殊运动小图标 + } + } + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " GetResource index %d", index); + if (type == 0) { + return sportImages[index]; //返回运动类大图标 + } else { + return sportIcons[index]; //返回运动类小图标 + } + return ""; } /*设置运动Id*/ void TraingModel::SetSportEvent(UIResourceTextId id) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordModel.cpp index a43fb9002..cb7f785f3 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traingrecord/src/TraingRecordModel.cpp @@ -74,7 +74,7 @@ namespace OHOS { SportData sportData = sportDataVector[i]; // 获取训练类图标 - std::string imageicon = TraingModel::GetInstance()->GetSportIcon(sportData.sportType); + std::string imageicon = TraingModel::GetInstance()->GetSportIcon(sportData.sportType,sportData.sportId,1); // 获取日期 // 获取时间 std::string Time = sportData.start_time + std::string("-") + sportData.end_time; diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Ball.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Ball.bin index 7df37a862..ee397f574 100755 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Ball.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Ball.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef6a0e63e11b6cb0082ee1334165ab5173870e9db7e6d69199ff77f330e86019 +oid sha256:08f0508f712626feef2355942c48483b3d324a1d7a32cccc55e2d626944aba64 size 888 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Dance.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Dance.bin index 5b5ff947c..a7b810f0c 100755 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Dance.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Dance.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a132279a20471e2727c4496ffe24836dedaa4483341915ff2dafc1efb5c89a5 +oid sha256:5e8bfcf8a2095f09d5b8edc52208cb341b7fb89daf9eae8a84869fc00b9b08fc size 888 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Fitness.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Fitness.bin index 43f1ead28..8b0799553 100755 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Fitness.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Fitness.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79c752381cb0cf317f97498354a7109c044a94fb13a2d71d1c8c95ff6a94b3ba +oid sha256:18f50f28b337507dd2acc012f46bba2ad78c8ecca0521aff275a76475a2e6532 size 888 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/FreeTraining_60.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/FreeTraining_60.bin new file mode 100644 index 000000000..c01630270 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/FreeTraining_60.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:137ac43eb82e53b4c8bbab2907e60182ab10da596aa29b06abaf1afd2cc5ea6c +size 2424 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Ice.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Ice.bin index a15e18b18..db176a31f 100755 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Ice.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Ice.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3fb5df04b4825af8bf4be02d8185d17c047ccca30d2a73f2283f0ab3f6c69ff +oid sha256:389b835e5edccd0bde754d8b00a3c2ec5fdbb59ae1603a59d8128f9ba0860c10 size 888 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Limit.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Limit.bin index 721c42955..4ee7bf8da 100755 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Limit.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Limit.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef24e56c4596301c51ed0a9ec90d074baedbffad81de5bd008ec9b94b666948b +oid sha256:3bbf984d2d1c6789554b7f9146c95e1a43876bc3aab2560d7aeb91254b13f6d5 size 888 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Other.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Other.bin index ad86cacc5..8d7d47d9e 100755 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Other.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Other.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e8655b1cbbab73ee30af6c6ba90081b17efa716f7f58a5deabd38f203950aae +oid sha256:8bc913378f9ec9b0d75f4dc9af3e30ffa21dc389b843d00fea900e49c5d8a315 size 888 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Rest.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Rest.bin index 3af6cf466..589593d2e 100755 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Rest.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Rest.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b120bebd56881b8d12f6e21a2ae8ffc3ed33deeb36ed81f4fe2baa7b0522b903 +oid sha256:a3aa632c0001dd1e97527976fb9d381e02d2c8e07db61525d5950ef58c150c86 size 888 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Riding_60.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Riding_60.bin new file mode 100644 index 000000000..061db630c --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Riding_60.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:070ed8c37b9f8c0824dd81cb217701bef297671547a91a847d4cbeab37066891 +size 2424 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Running_60.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Running_60.bin new file mode 100644 index 000000000..21370698b --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Running_60.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7709bc5f7289f43ebd019659dda1ce8b06a204d174d02672d570f94e23f190cb +size 2424 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Swimming.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Swimming.bin index 778f6c05f..127fb9359 100755 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Swimming.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Swimming.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:613975bbea17962e1b127fca4b08087eac641b5e708e20e2a4024e0fc6ec5382 +oid sha256:7c85c0ea4f8c3b704976da8c4cf47dee9262a1793fd8e53977fb74d688813463 size 888 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/riding.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/riding.bin new file mode 100644 index 000000000..e5494be97 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/riding.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00707185aad1fd0c5ef3b1b60fcca6773b499978a013c582c85ddb1cc1de0192 +size 888 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/running.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/running.bin new file mode 100644 index 000000000..89c262811 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/running.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21a62ab6ea01fff10868ea61e10c61636e9fd929f204cc76a0bd67ff3f327ac6 +size 888 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/walking.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/walking.bin new file mode 100644 index 000000000..977fd93ff --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/walking.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65db18009374b73f6550d1c55ee3ea494bd21a5e225b7d1ecaa0fe484adb3f0e +size 888 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/walking_60.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/walking_60.bin new file mode 100644 index 000000000..7ff8a742d --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/walking_60.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a022b8b53725137cec218c820f23c5584a97f0e0fe151cdbd389fd9b3192e31 +size 2424 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/Riding_60.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/Riding_60.bin index af70ce654..061db630c 100755 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/Riding_60.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/Riding_60.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd9a19ecb78cc936ff97e9f2f80c4654f7e33593bd8018a917d98f85113716b9 +oid sha256:070ed8c37b9f8c0824dd81cb217701bef297671547a91a847d4cbeab37066891 size 2424 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/Running_60.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/Running_60.bin index c4a7ab856..21370698b 100755 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/Running_60.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/Running_60.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6f42a59c66d3c46c7eceffb5e4bd0bb7277af2c6813052ab7e37a76972f0401 +oid sha256:7709bc5f7289f43ebd019659dda1ce8b06a204d174d02672d570f94e23f190cb size 2424 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/riding.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/riding.bin new file mode 100644 index 000000000..b07244c75 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/riding.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d19fc5a820aa44dd4eab539a8fd492800c6c398785b1f617568f8a1dcf89ca33 +size 2424 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/running.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/running.bin new file mode 100644 index 000000000..f43e57715 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/running.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53b75792f1b2533dced0c72da35ecae8660aad03677c53ff3425b3a3b2e07bdb +size 2424 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/walking.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/walking.bin new file mode 100644 index 000000000..f7cc55575 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/walking.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd71de7f6658d06fa8de2fdc511a0db4d2c957bd4bfb1308034cb41c91af332f +size 2424 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/walking_60.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/walking_60.bin index 5c48b74c8..7ff8a742d 100755 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/walking_60.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/walking_60.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2500ee37273f320bba465dca193cd80a8e875072f46b241281ba00721bab668c +oid sha256:7a022b8b53725137cec218c820f23c5584a97f0e0fe151cdbd389fd9b3192e31 size 2424 diff --git a/tools/image_converter_tool/test/hert/Training/icon_36x36/Jumprope.png b/tools/image_converter_tool/test/hert/Training/icon_36x36/Jumprope.png deleted file mode 100755 index 5e5fdfc88e164035d034a3ff4a7cabcbe37ee48d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1051 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 diff --git a/tools/image_converter_tool/test/hert/Training/icon_36x36/Riding.png b/tools/image_converter_tool/test/hert/Training/icon_36x36/Riding.png deleted file mode 100755 index 8b5a7067f67594f500404878b2c65712e6d65fac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1462 zcmV;n1xfmeP)B*F(a!AzWq#YGPGC@%7<_MlB8xNTZ_kK_rWYp3<#kc=mlT~8PU;fDizC|S z`3jvBbqqldI;yc-m#;Roce0mGy+6R>J)-^f9Hm*j zeipM8Pw%9tQs^QeH`6<{5Y`UD8hg-{_@6rzW;y0}iw#w6|}Y3tUu_*>JIH2!j0g+C%a0 zv){~U#{i*=qx8;?=crn(b`^{WsGm)(U!wuw@1;!+sw9LCaW?~kefRp?G{$4$L7l=V z+Xydqb6W%>EZ_v5GQnfm?+ZIw@4Sjg3sYs!(kxv3b{MfDT+(PQ#x*D<7 zA_`{kg8?>FW_|s@KA`GM@wyBQ=9Au|1^O2E%kT;*>pnl`)>AJCC z9-DQzopp19J^8+)ofa0mzydhcp#>dKaepqXn!jKo8LX4z2Em5=0p~T&kxnH)gWqA zLh!;UJ9n@6jm7h^0%cZqMKBOEKJYDgmFm*|c^{9-iEjz%Q96LtBzFq9AV}8g`XMZ! zs|Fmb0XDt#N`@^jhFp#D!RM|3N`Wc=$c13h<=U6TD7s2e0{qj0|ij?3R9b8#%LuXd^MrKfThT0~yy0)kl;qo27hl}LI zrCRBtp8~)Vc0B$rEIaYY0^u8g2||(BLoF33i53u4~qrV%fgFY>3kymOX!MwxJK! z0eP4AwO0XWZIKeKah_ZK*9jc_RR#kz^g}Q_n5DcqAZ@sNq4lskwO=Ow2PrVC+UH$t Q`~Uy|07*qoM6N<$g6M;=kN^Mx diff --git a/tools/image_converter_tool/test/hert/Training/icon_36x36/Running.png b/tools/image_converter_tool/test/hert/Training/icon_36x36/Running.png deleted file mode 100755 index 0da43c86e49ba3e99bb1f6f72c3e7bac4a36aa5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 993 zcmV<710MW|P)?*siFgwfQf{P2zE)qeFVri37pe+cr zJv?kvzvm-YO7H(T%9C8uyYHvZ_q@MfM?4;{lgse+`KW&`N|D)K5<&u7K)Q$8eK^0hBJV%K0LD#%D&4{@zbFpvBZ;jgN(A?&vKY4 zp~y@xjV>n14hEkNFk-!2EyWZHpft?cOa?&0l+8@m^RS!7Ufx%Ihl3t}KIXr1DsfUI zBcOD^*DyCYqRvww@`Gh@xghH+gc30Hd{Fg$e=ScrcJiuJZOofqen3V*LexVu89*@F zq}69qD;bt&idVi_DF=FhnNlnjC}a!?{b42nd&mrAnJTShpbnha2@&pJTk1lqO9(cH zl;TvFJEhiQBXty0_@h2vPTRtrNc}e zqnbu;6SAU?Q#c}Iqz)3HQ+3D*A(Rm#b*xl$a*Gg5g_@=ZC}Y=&9TPHY-W5PS)V}M0 z*D|Hxb+Vdt#1dk2r8a9jv|#7jqe*CFVOZrC(vEbI(Ac9#1SZ1WOAF|4kd1LTJMf62 zxD=m@sZ8PR@p2+}eA-q;T|;;m*N@QfQFttLWgKgJ9(7Z_j#5!3TZDwLhq|V_EG;4sU2gf!wfe@2sl_fxboi5 zqPgvN`)1%4YgeTkC4_)zRS7p4x-CM0N~N%HyM&-pj)go(;Yls04d?#{X&Ry}7%MvR P00000NkvXXu0mjf4}`+a diff --git a/tools/image_converter_tool/test/hert/Training/icon_36x36/Walking.png b/tools/image_converter_tool/test/hert/Training/icon_36x36/Walking.png deleted file mode 100755 index 21f6f0db9207755b244dd3bccc2f9a88ae6bf1ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1010 zcmVd~f9j?x}}|42$m^QHMnes}3zlYY5>-h1DB|FkI*iJXy5TwWJ-jfbgwB23L~%_OfC zY3qH8O34z5(&U7o;n#!Y?f2H5Uw!diSkyJLN&8)&p%@UIjF2d{1-Zi>?lqUsMWWai zRNCaHq?|32C=LiZrk(lSy7MRdWyAB0XeI~PnNKqTClna9f5o(RMQsVh7^5}{>^&w5^kK(DaC8+07gnA$M7+%Bq>QR+4 zpR#lngo@f7aw|=cCq^aO;JO)>BZSd_Mu*YR@TP4pR$CGk*NY^Ir3l@a>ZRDzK1*U$ zVr&g&oa2I`tX{e&x=0j^lbg@t!lFzCVN2`l;n&;WrrlXf;DMip-wZ0XXIl_%f+y6H zWR~J!Ij{5`9_Y@MQnmISZDHiyJsNnGpy0z!^2S=p3~o`NfVDklk9FS6Vupz^zhQ3a zuW}5`B*>$QO#6_e9AI}LL)&vH!}Z(%{~aH;E^e;QC27dVTXM;aLDa_VCap}bDs%1fwK7#TY1P6_844GUuWo^t zzx7Lh>Wdx1l5^X&weGOn)RqX_kAtsy?lpP+kjy}o@t|fdKwQw5JnbzS&ne6>ySOAt znjt|7-(>dLRNFNw@YnD{b}Y!11ffUeSwA{hE>OovhcdeWMoVa{lg^mKDmF-;V}jrc z@4UQCr}2W>$G#g5cEE=X~UIvavN6SUD$(f6pJE~>T#1@8M5x2Pq>B9mLn8U7y4 zvAA|&T~X*BC;Sk=t4{xPtWHdt6|folRCbP8kCLgN_|#<|jiPNN2FT1IXiZx8xOEF` zxv1e3_1oHv3^QRWC~j}eYiXV7YsAKEl098md0KcH5m4OG$%~D^^FMkV`3H>$I=Y`V gN6a;O&DuNKKkTz=hTi39vj6}907*qoM6N<$f*Z%+yZ`_I diff --git a/tools/image_converter_tool/test/hert/Training/icon_36x36/riding.png b/tools/image_converter_tool/test/hert/Training/icon_36x36/riding.png new file mode 100644 index 0000000000000000000000000000000000000000..6d83467e85630a6fceda6b7843d551d29af094eb GIT binary patch literal 1439 zcmV;Q1z`G#P)Wsi+6Mi>PLqI+*?y}4G{i944{CpmtQv^c z0Ih~z^?QCLs0H?QQ>0`e|6~1_klx2&M6gP(d$%*#Zdx@U-osRRcz^{ZXCa9P0yweE zTSY_z(C@viYRB;j^+-j!4}={)fLB~VpwBL9{e=Ogw)T6!RY;t zm(JmgiVzR^R30H7@Oy<-J`hA5nGZ{dGXbM|HZVLkjKRnpJkQNRtSEpUXVgy@>sM>& zx@-8OT3Z%O3W#ImgD5Y9!4WEVKc2&>ZJT4JVRLV=eGgy1LhvS7*iAWIJ{L7|p=bTb zCk}oIMkdhhu~ib8=Y;>91xv(F0*K?nb?!r+z#BjJ2n>H=t8Zgfvf+_>)av^E>kEtjDKctSMk!+AiN7-HA#Gl(-H=pf-?3Pu8b zI+_Pms&={AZ6LwEfSb9IqqblUncB zHoE~V188UPw&9@jVcMdxOJRoicMR}9s6Z4}K)Ivf*I)>9h_#m?Ih9#FK!?zWCnQP# zVe%6TRwDS{8-I^@{HAtO0%_fL&dlm#sE-1R(wwe1i$#}L`e@-!c0e2tv=ZILt>6hE zYGV|&Y;0iv)9wLhSNlm7T)Q{~TJqn@hnO;$43eyqY?`SJu_2|Q$OfcQm%(tKBluF( z$yPZTub+!C`h&W!`GF2@O|=@E|6=ocZTxClN!n_-M4)cvvXXU@gYUEYFbvlgrm);b zJOd7KuLzCim=nI z<(2LZ>g{ZmCe7twt9!D0yWM7MnsFk!xZJ$nG$uOn2GJY1$`kLQdtyKr&bn zstmHhZr}j^_h{TW9fURqWC{o!*ovR{bGnvrW)_Cr=TxcyD|tRNqcSH8IDlXE{GJzA z;m{ox0@RawlU>5)V`fsg5#+wde8`Y9tfWc^Zn>u&Nkf!pzE5FQt5?Rvl8xe$tinh= z`n>+HbOVXCS)#C-c^hIe0BvnS>XKHEr-(Rl4`+nb9!s0)^Fcbt75UeLH%!G5mKX+u+(gruxEswI$4?!BFqdxzWQV` z2GeyICVYy2QsE6yrW%~5t(=1Rg5VXod3>vhJ>$lvjX}9&xpidqkyEwR_Sj0$ER74% z`|P*%V;FE1d0ke>mk6$17n$bjCg%1GQUtlD2QUo~(q7taNYBM@#0~tY`hWUWh$4@# zOzb{30@5&8zv`FvC{m4V=gkWHU9L)vbYXHMfoGPO literal 0 HcmV?d00001 diff --git a/tools/image_converter_tool/test/hert/Training/icon_36x36/running.png b/tools/image_converter_tool/test/hert/Training/icon_36x36/running.png new file mode 100644 index 0000000000000000000000000000000000000000..eaae20ba6d600ee55798e8668a866e05ca0da10e GIT binary patch literal 996 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 Qe*gdg07*qoM6N<$f?xluDF6Tf literal 0 HcmV?d00001 diff --git a/tools/image_converter_tool/test/hert/Training/icon_60x60/walking.png b/tools/image_converter_tool/test/hert/Training/icon_60x60/walking.png new file mode 100644 index 0000000000000000000000000000000000000000..e12def2e21e547f5543be33ee5c1432a87c3479c GIT binary patch literal 1544 zcmV+j2KV`iP)ihJesdD7m`b zxVr>TKzIg(-R(m{IxA=r;po#r)aVSsF%*=HX7}fC4p~7+E35O`EQHbtYfxrH2=|-! z%{n+nsf5G!W-VQ>hEPcof@73C!m47^8nylo9HV5yiIoweIQ|P9qg29CVRXEZnTi#)T|*6qK#Grj!`<{Xyf*roqsWDCd=!$0Ul5~VL`OsIzhq%BKYI+6&y-u z;HqAWevAg-0nZX?O(X1u75Fr&K@bdlk(@@Ugg4m_Yk->kCQyR_MuVvF+W<;LDTJHt zW?ctx%s=ZHmpeEb9h61f`x@TqZl5vPHe{0()F}u)?%X$zp#*pvVF@ECzzcpv&GbJB z(b4V3yL0deFN9^Z_{Jw-k0DR*HJ{Tv0EdvIo~I{|YVP!%hl+>-{CxvlK+z~qz&#rPQe-~zCMIXZIXs;mib zcQ^MrF~7*Z+a#^~2Zj`k{sdPb8YDocF7#?E!sB(zMk;6Ba&o^XNqfk#GmXPZQw({= zT=C1iE^IX+uH&S$=!hGy;jmq=kk;)yvi!oQpA`y?R#RE>;$q)Mm-j0wkjbwA%oVZ<+d@^F+uQU@ClbmU7&&s9UdJX0j!eF{`>ySrr^ znHdwtJYOs8Hqb|pPvQ4q0mXYt55H42L6WSy&`+F7fF2n~qI;h1!^~3pgh{ zSxX($_9LVLln5^(9tOdIsat8Sw>nTFybu;clg88rq-}x*7w{(2rlkMXYxBZI4jRsU z<-S=cMTqBg@`Q;O=eC>}U>rAm3-Vq@SPECd4_^Whqi~VqbV*Kp)OAe53t^4=H6^My ztyqW;oos>TyCEjcK}*}`E`;+bJy9_~J{%L#xr+Zjovyhunc^`(!-oZTKf-$DQRR(j zQ>0gW(h(2mCi}xjMdc5Ao*1wooD(KUW?yu&KBrHml>mV*TGw^cl+OlE2^ZF3so4UR z&;B}lq${cD;22H`lg<~=nOLThk&;d*(^o4gJar6rdrM+j5wa`i5HAbM8B}iUU3cxK zoDeS7sq;to0nykRce1XzEREM#bkj8~$R6XRt~n1YqFBC@GYy%r5&LF5}RH=(8# z;jkU@6sA01JIE2`?NDI6T=--w!eebZ>t$q5Sns*0l}wEn+kmWVifCy$$bL%0tR+RF zgNbJB1PUofcgCgtu{Ggzhi_c^`<{3CZ#bcDxGv;QjaNn%rGS=x&a;;f=Rvkrh~jJZ uaaB2%4i@Xbj6wV=z;Sv#{5`CKBm4*ZgE!`