From: Caisking <3449750381@qq.com> Date: Thu, 21 Mar 2024 01:38:09 +0000 (+0800) Subject: 建立训练单独的UI资源管理 X-Git-Tag: release_V1.2.70_20241020_135402~1283 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=568dd7b206e45dedae25a2fc77c6c0a9873a4d43;p=mirrors%2FFD230.git 建立训练单独的UI资源管理 --- diff --git a/code/sdk/application/wearable/fd230app/CMakeLists.txt b/code/sdk/application/wearable/fd230app/CMakeLists.txt index 3123c0abb..3047fcd3f 100644 --- a/code/sdk/application/wearable/fd230app/CMakeLists.txt +++ b/code/sdk/application/wearable/fd230app/CMakeLists.txt @@ -392,6 +392,7 @@ set(SOURCES #Training ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingPresenter.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingModel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingMoreView.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingMorePresenter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/nativeui/traing/src/TraingLimitView.cpp diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp index 27540aaf6..081dea1f7 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp @@ -356,7 +356,7 @@ namespace OHOS mainClockView->SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full); UIView::OnLongPressListener *buttonLongPress = static_cast(MainPresenterSample::GetInstance()); mainClockView->SetOnLongPressListener(buttonLongPress); - + return mainClockView; } @@ -441,6 +441,9 @@ namespace OHOS if (mainSwipeGroup != nullptr) { mainSwipeGroup->SetHorCurrentPage(page); + // 刷新 + OHOS::UISwipeView swipe; + mainSwipeGroup->OnSwipe(swipe); } if (presenter_ != nullptr) diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp index fe412593b..c66e3bdf4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp @@ -83,4 +83,5 @@ namespace OHOS } return true; } + } \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp index 99ccc7ae0..3bfcfd948 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp @@ -1,3 +1,11 @@ +/*** + * @Author: Caisking 3449750381@qq.com + * @Date: 2024-03-03 16:02:58 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-03-20 20:02:57 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/message/src/MessageView.cpp + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ #include "message/include/MessageView.h" #include "message/include/MessagePresenter.h" diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h new file mode 100644 index 000000000..6883e6c51 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h @@ -0,0 +1,196 @@ +#ifndef TRAINING_UI_CONFIG_H +#define TRAINING_UI_CONFIG_H + +#include +#include "ohos_types.h" +#include "graphic_config.h" + +namespace OHOS +{ + +// 定义按键颜色宏 +#define DEFAULT_BACKGROUND_COLOR 0xff191919 +#define PRESSED_BACKGROUND_COLOR 0xff249115 +#define PRESSED_BORDER_COLOR 0xff0b1928 + +// Paths for different icons in the Training folder +#define ICON36 "/user/res/Training/icon_36x36" +#define ICON60 "/user/res/Training/icon_60x60" +#define ICON80 "/user/res/Training/icon_80x80" +#define MODULES "/user/res/Training/modules" +#define TRAINING_GIF "/user/res/Training/training_GIF" + + // Icons in the icon_36x36 folder + static constexpr const char *BALL_IMAGE = ICON36 "/Ball.bin"; + static constexpr const char *DANCE_IMAGE = ICON36 "/Dance.bin"; + static constexpr const char *FITNESS_IMAGE = ICON36 "/Fitness.bin"; + static constexpr const char *ICE_IMAGE = ICON36 "/Ice.bin"; + static constexpr const char *JUMPROPE_IMAGE = ICON36 "/Jumprope.bin"; + static constexpr const char *LIMIT_IMAGE = ICON36 "/Limit.bin"; + static constexpr const char *MOUNTAINEERING_IMAGE = ICON36 "/Mountaineering.bin"; + 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"; + + // Icons in the icon_60x60 folder + 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"; + + // 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"; + static constexpr const char *PINGPONG_80_IMAGE = ICON80 "/Pingpong_80.bin"; + static constexpr const char *RIDING_80_IMAGE = ICON80 "/Riding_80.bin"; + + // Modules icons + static constexpr const char *ARROWS_IMAGE = MODULES "/Arrows.bin"; + static constexpr const char *BACK_IMAGE = MODULES "/Back.bin"; + static constexpr const char *BOUTTONGROUND_IMAGE = MODULES "/Bouttonground.bin"; + static constexpr const char *BUTTONGROUND2_IMAGE = MODULES "/Buttonground2.bin"; + static constexpr const char *BUBBLE_IMAGE = MODULES "/Bubble.bin"; + static constexpr const char *BUTTONOK_IMAGE = MODULES "/Buttonok.bin"; + static constexpr const char *CALORIES_IMAGE = MODULES "/Calories.bin"; + static constexpr const char *CALORIES_30_IMAGE = MODULES "/Calories_30.bin"; + static constexpr const char *CONTROL_POINT_IMAGE = MODULES "/Control_point.bin"; + static constexpr const char *DATA_POINT_IMAGE = MODULES "/Data_point.bin"; + static constexpr const char *GO_1_IMAGE = MODULES "/Go_1.bin"; + static constexpr const char *GO_2_IMAGE = MODULES "/Go_2.bin"; + static constexpr const char *GPS_1_IMAGE = MODULES "/GPS_1.bin"; + static constexpr const char *GPS_2_IMAGE = MODULES "/GPS_2.bin"; + static constexpr const char *HEARTRATE_IMAGE = MODULES "/Heartrate.bin"; + static constexpr const char *HEARTRATE_1_IMAGE = MODULES "/Heartrate_1.bin"; + static constexpr const char *HEARTRATE_2_IMAGE = MODULES "/Heartrate_2.bin"; + static constexpr const char *HEARTRATE_30_IMAGE = MODULES "/Heartrate_30.bin"; + static constexpr const char *ICON_IMAGE = MODULES "/Icon.bin"; + static constexpr const char *INCO_UP_IMAGE = MODULES "/Inco_up.bin"; + static constexpr const char *INCO_UP_40_IMAGE = MODULES "/Inco_up_40.bin"; + static constexpr const char *LINE_IMAGE = MODULES "/Line.bin"; + static constexpr const char *LINE_1_IMAGE = MODULES "/Line_1.bin"; + static constexpr const char *LINE_2_IMAGE = MODULES "/Line_2.bin"; + static constexpr const char *MILEAGE_IMAGE = MODULES "/Mileage.bin"; + static constexpr const char *MILEAGE_30_IMAGE = MODULES "/Mileage_30.bin"; + static constexpr const char *MORE_IMAGE = MODULES "/More.bin"; + static constexpr const char *MOREVIEW_IMAGE = MODULES "/MoreView.bin"; + static constexpr const char *NO_IMAGE = MODULES "/No.bin"; + static constexpr const char *NOTE_IMAGE = MODULES "/Note.bin"; + static constexpr const char *PATH_IMAGE = MODULES "/Path.bin"; + static constexpr const char *PIONT_BLACK_IMAGE = MODULES "/Piont_black.bin"; + static constexpr const char *PIONT_BUBBLE_IMAGE = MODULES "/Piont_bubble.bin"; + static constexpr const char *POINT_BLUE_IMAGE = MODULES "/Point_blue.bin"; + static constexpr const char *POINT_GREEN_IMAGE = MODULES "/Point_green.bin"; + static constexpr const char *POINT_ORANGE_IMAGE = MODULES "/Point_orange.bin"; + static constexpr const char *POINT_YELLOW_IMAGE = MODULES "/Point_yellow.bin"; + static constexpr const char *PROGRESS_IMAGE = MODULES "/Progress.bin"; + static constexpr const char *SPORT_CONTINUE_IMAGE = MODULES "/Sport_continue.bin"; + static constexpr const char *SPORT_PAUSE_IMAGE = MODULES "/Sport_pause.bin"; + static constexpr const char *SPORT_STOP_IMAGE = MODULES "/Sport_stop.bin"; + static constexpr const char *SPORT_STRENGTH_IMAGE = MODULES "/Sport_strength.bin"; + static constexpr const char *STEP_30_IMAGE = MODULES "/Step_30.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 *WARNING_IMAGE = MODULES "/Warning.bin"; + static constexpr const char *YES_IMAGE = MODULES "/Yes.bin"; + + // Training GIF + static constexpr const char *TRAINING_GIF_IMAGE_1 = TRAINING_GIF "/win/1.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_2 = TRAINING_GIF "/win/2.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_3 = TRAINING_GIF "/win/3.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_4 = TRAINING_GIF "/win/4.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_5 = TRAINING_GIF "/win/5.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_6 = TRAINING_GIF "/win/6.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_7 = TRAINING_GIF "/win/7.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_8 = TRAINING_GIF "/win/8.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_9 = TRAINING_GIF "/win/9.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_10 = TRAINING_GIF "/win/10.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_11 = TRAINING_GIF "/win/11.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_12 = TRAINING_GIF "/win/12.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_13 = TRAINING_GIF "/win/13.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_14 = TRAINING_GIF "/win/14.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_15 = TRAINING_GIF "/win/15.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_16 = TRAINING_GIF "/win/16.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_17 = TRAINING_GIF "/win/17.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_18 = TRAINING_GIF "/win/18.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_19 = TRAINING_GIF "/win/19.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_20 = TRAINING_GIF "/win/20.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_21 = TRAINING_GIF "/win/21.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_22 = TRAINING_GIF "/win/22.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_23 = TRAINING_GIF "/win/23.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_24 = TRAINING_GIF "/win/24.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_25 = TRAINING_GIF "/win/25.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_26 = TRAINING_GIF "/win/26.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_27 = TRAINING_GIF "/win/27.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_28 = TRAINING_GIF "/win/28.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_29 = TRAINING_GIF "/win/29.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_30 = TRAINING_GIF "/win/30.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_31 = TRAINING_GIF "/win/31.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_32 = TRAINING_GIF "/win/32.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_33 = TRAINING_GIF "/win/33.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_34 = TRAINING_GIF "/win/34.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_35 = TRAINING_GIF "/win/35.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_36 = TRAINING_GIF "/win/36.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_37 = TRAINING_GIF "/win/37.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_38 = TRAINING_GIF "/win/38.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_39 = TRAINING_GIF "/win/39.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_40 = TRAINING_GIF "/win/40.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_41 = TRAINING_GIF "/win/41.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_42 = TRAINING_GIF "/win/42.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_43 = TRAINING_GIF "/win/43.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_44 = TRAINING_GIF "/win/44.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_45 = TRAINING_GIF "/win/45.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_46 = TRAINING_GIF "/win/46.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_47 = TRAINING_GIF "/win/47.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_48 = TRAINING_GIF "/win/48.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_49 = TRAINING_GIF "/win/49.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_50 = TRAINING_GIF "/win/50.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_51 = TRAINING_GIF "/win/51.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_52 = TRAINING_GIF "/win/52.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_53 = TRAINING_GIF "/win/53.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_54 = TRAINING_GIF "/win/54.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_55 = TRAINING_GIF "/win/55.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_56 = TRAINING_GIF "/win/56.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_57 = TRAINING_GIF "/win/57.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_58 = TRAINING_GIF "/win/58.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_59 = TRAINING_GIF "/win/59.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_60 = TRAINING_GIF "/win/60.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_61 = TRAINING_GIF "/win/61.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_62 = TRAINING_GIF "/win/62.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_63 = TRAINING_GIF "/win/63.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_64 = TRAINING_GIF "/win/64.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_65 = TRAINING_GIF "/win/65.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_66 = TRAINING_GIF "/win/66.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_67 = TRAINING_GIF "/win/67.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_68 = TRAINING_GIF "/win/68.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_69 = TRAINING_GIF "/win/69.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_70 = TRAINING_GIF "/win/70.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_71 = TRAINING_GIF "/win/71.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_72 = TRAINING_GIF "/win/72.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_73 = TRAINING_GIF "/win/73.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_74 = TRAINING_GIF "/win/74.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_75 = TRAINING_GIF "/win/75.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_76 = TRAINING_GIF "/win/76.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_77 = TRAINING_GIF "/win/77.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_78 = TRAINING_GIF "/win/78.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_79 = TRAINING_GIF "/win/79.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_80 = TRAINING_GIF "/win/80.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_81 = TRAINING_GIF "/win/81.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_82 = TRAINING_GIF "/win/82.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_83 = TRAINING_GIF "/win/83.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_84 = TRAINING_GIF "/win/84.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_85 = TRAINING_GIF "/win/85.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_86 = TRAINING_GIF "/win/86.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_87 = TRAINING_GIF "/win/87.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_88 = TRAINING_GIF "/win/88.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_89 = TRAINING_GIF "/win/89.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_90 = TRAINING_GIF "/win/90.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_91 = TRAINING_GIF "/win/91.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_92 = TRAINING_GIF "/win/92.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_93 = TRAINING_GIF "/win/93.bin"; + static constexpr const char *TRAINING_GIF_IMAGE_94 = TRAINING_GIF "/win/94.bin"; + +} +#endif diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h new file mode 100644 index 000000000..df259f25f --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h @@ -0,0 +1,60 @@ +#ifndef Traing_MODEL_H +#define Traing_MODEL_H + +#include "BaseView.h" +#include "View.h" +#include "string.h" +#include +#include "components/ui_view_group.h" +#include "components/ui_label.h" +#include "components/ui_image_view.h" +#include "components/ui_button.h" +#include "components/ui_image_animator.h" +#include "components/ui_label_button_ext.h" +#include "components/ui_chart.h" +#include "components/ui_list.h" +#include "components/icon_adapter.h" +#include "wearable_log.h" +#include "ohos_types.h" +#include "components/ui_card_page.h" + +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" + +struct QuickTraining +{ + char *training1_Text; + char *training1_Image; + char *training2_Text; + char *training2_Image; + char *training3_Text; + char *training3_Image; + + //QuickTraining() : training1_Text("健走"), training2_Text("骑行"), training3_Text("跑步"), training1_Image(WALKING_60_IMAGE), training2_Image(RUNNING_60_IMAGE), training3_Image(RIDING_60_IMAGE) {} // 初始化默认值 +}; + +namespace OHOS +{ + class TraingModel + { + public: + TraingModel(); + ~TraingModel(); + static TraingModel *GetInstance(void); + bool InitLabel(UILabel *&label, int left, int top, int width, int height, const char *viewId, const char *text, const char *fontName, int fontSize); + bool InitButton(UIButton *&button, int left, int top, int width, int height, const char *viewId); + bool InitImageView(UIImageView *&imageView, int left, int top, int width, int height, const char *viewId, const char *imagePath); + void InitList(); + + void SetQuickTraining(QuickTraining *quickTraining); + QuickTraining *GetQuickTraining() const; + + private: + TraingModel(const TraingModel &) = delete; + TraingModel &operator=(const TraingModel &) = delete; + + QuickTraining *quickTraining_; + }; +} + +#endif \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingView.h index 7ab6f6a33..a751d0c19 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingView.h @@ -1,27 +1,15 @@ #ifndef _Traing_VIEW_H #define _Traing_VIEW_H -#include "BaseView.h" -#include "View.h" -#include -#include "components/ui_view_group.h" -#include "components/ui_label.h" -#include "components/ui_image_view.h" -#include "components/ui_button.h" -#include "components/ui_image_animator.h" -#include "components/ui_label_button_ext.h" -#include "components/ui_chart.h" -#include "wearable_log.h" -#include "ohos_types.h" -#include "components/ui_card_page.h" - +#include "traing/include/TraingModel.h" +#include "traing/Training_UiConfig.h" #include "TraingPresenter.h" namespace OHOS { -#define BUTTON1 "button1" // 按键1 -#define BUTTON2 "button2" // 按键2 -#define BUTTON3 "button3" // 按键3 -#define BUTTONMORE "button4" // 按键 更多 +#define BUTTON1 "button1" // 按键1 +#define BUTTON2 "button2" // 按键2 +#define BUTTON3 "button3" // 按键3 +#define BUTTONMORE "buttonmore" // 按键 更多 class TraingPresenter; class TraingView : public View @@ -36,8 +24,12 @@ namespace OHOS void OnSetUpView() override; void OnTearDownView() override; void OnStop() override; - void Init(); - void DeInit(); + + bool AddLabel(); + bool AddButton(); + bool AddImageView(); + void InitView(); + void DeInitView(); UIView *GetView(); @@ -47,17 +39,21 @@ namespace OHOS TraingView &operator=(TraingView &&) = delete; UIViewGroup *container_ = nullptr; - UILabel *label1_ = nullptr; - UIButton *button3_ = nullptr; - UIButton *button4_ = nullptr; + + UIButton *buttonmore_ = nullptr; UIButton *button1_ = nullptr; UIButton *button2_ = nullptr; - UIImageView *image1_ = nullptr; - UILabel *label2_ = nullptr; - UIImageView *image3_ = nullptr; - UILabel *label3_ = nullptr; - UIImageView *image5_ = nullptr; - UILabel *label4_ = nullptr; + UIButton *button3_ = nullptr; + + UILabel *title_label = nullptr; + UILabel *btn1_label = nullptr; + UILabel *btn2_label = nullptr; + UILabel *btn3_label = nullptr; + UILabel *btnmore_label = nullptr; + + UIImageView *btn1_image = nullptr; + UIImageView *btn2_image = nullptr; + UIImageView *btn3_image = nullptr; }; } // namespace OHOS #endif // Traing_PRESENTER_H diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp new file mode 100644 index 000000000..633fbc2a7 --- /dev/null +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -0,0 +1,144 @@ +#include "traing/include/TraingModel.h" +#include "wearable_log.h" + +namespace OHOS +{ + TraingModel ::TraingModel() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingModel::TraingModel()"); + //quickTraining_ = &QuickTraining(); // 为quickTraining_赋初值 + } + TraingModel ::~TraingModel() + { + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingModel::~TraingModel()"); + } + TraingModel *TraingModel::GetInstance(void) + { + static TraingModel instance; + return &instance; + } + /*** + * @description: + * @param {QuickTraining} *quickTraining + * @brief 设置快捷训练 + */ + void TraingModel::SetQuickTraining( QuickTraining *quickTraining) + { + quickTraining_ = quickTraining; + } + /*** + * @description: + * @return {quickTraining_} + * @brief 获取快捷训练 + */ + QuickTraining *TraingModel::GetQuickTraining() const + { + return quickTraining_; + } + /*** + * @description: 初始化标签 + * @param {UILabel} * + * @param {int} left + * @param {int} top + * @param {int} width + * @param {int} height + * @param {char} *viewId + * @param {char} *text + * @param {char} *fontName + * @param {int} fontSize + * @return + * @brief 初始化标签 + */ + bool TraingModel::InitLabel(UILabel *&label, int left, int top, int width, int height, const char *viewId, const char *text, const char *fontName, int fontSize) + { + // 检查标签指针是否为空 + if (label == nullptr) + { + label = new UILabel(); + } + if (label == nullptr) + { + return false; // 内存分配失败，返回false + } + // 设置标签的位置和大小 + label->SetPosition(left, top); + label->Resize(width, height); + // 设置标签的视图 ID + label->SetViewId(viewId); + // 设置标签的样式 + label->SetStyle(STYLE_TEXT_FONT, fontSize); + label->SetFont(fontName, fontSize); + // 设置标签的文本和其他属性 + label->SetText(text); + label->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); + label->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); + label->SetRollSpeed(0); + // 设置标签可见 + label->SetVisible(true); + + return true; + } + + /*** + * @description: + * @param {UIButton} * + * @param {int} left + * @param {int} top + * @param {int} width + * @param {int} height + * @param {char} *viewId + * @return + * @brief 初始化按钮 + */ + bool TraingModel::InitButton(UIButton *&button, int left, int top, int width, int height, const char *viewId) + { + // 创建新按钮（如果当前按钮为空） + if (button == nullptr) + { + button = new UIButton(); + } + if (button == nullptr) + { + return false; // 内存分配失败，返回false + } + button->SetPosition(left, top); + button->Resize(width, height); + button->SetViewId(viewId); + button->SetStyle(STYLE_BACKGROUND_COLOR, DEFAULT_BACKGROUND_COLOR); + button->SetStyleForState(STYLE_BACKGROUND_COLOR, DEFAULT_BACKGROUND_COLOR, UIButton::PRESSED); + button->SetStyleForState(STYLE_BORDER_COLOR, PRESSED_BORDER_COLOR, UIButton::PRESSED); + button->SetVisible(true); + return true; + } + + /*** + * @description: + * @param {UIImageView} * + * @param {int} left + * @param {int} top + * @param {int} width + * @param {int} height + * @param {char} *viewId + * @param {char} *imagePath + * @return {*} + * @brief 初始化图片 + */ + bool TraingModel::InitImageView(UIImageView *&imageView, int left, int top, int width, int height, const char *viewId, const char *imagePath) + { + if (imageView == nullptr) + { + imageView = new UIImageView(); + } + if (imageView == nullptr) + { + return false; // 内存分配失败，返回false + } + imageView->SetPosition(left, top); + imageView->Resize(width, height); + imageView->SetViewId(viewId); + imageView->SetSrc(imagePath); + imageView->SetVisible(true); + return true; + } + +} \ No newline at end of file diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMorePresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMorePresenter.cpp index 44119bfec..5b6f363ac 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMorePresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMorePresenter.cpp @@ -61,7 +61,7 @@ namespace OHOS if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && (event.GetDeltaX() > 40) && (event.GetDeltaX() > (2 * MATH_ABS(event.GetDeltaY())))) { - //NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING); + NativeAbility::GetInstance().ChangeSlice(VIEW_TRAINING); } UNUSED(view); return true; diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp index 30006862e..b8c360d2a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp @@ -1,34 +1,100 @@ #include "traing/include/TraingView.h" -#include "common/image_cache_manager.h" -#include "UiConfig.h" -#include "ui_resource_image.h" -#include -#include "components/ui_button.h" namespace OHOS { + // 按钮设置 + static constexpr uint16_t BUTTON_WIDHT = 230; + static constexpr uint16_t BUTTON_HEIGHT = 80; + static constexpr uint16_t BUTTON1_X = 118; + static constexpr uint16_t BUTTON1_Y = 336; + static constexpr uint16_t BUTTON2_X = 118; + static constexpr uint16_t BUTTON2_Y = 336; + static constexpr uint16_t BUTTON3_X = 118; + static constexpr uint16_t BUTTON3_Y = 336; + static constexpr uint16_t BUTTONMORE_X = 118; + static constexpr uint16_t BUTTONMORE_Y = 336; + + // 标签设置 + static constexpr uint16_t LABEL_FONT_SIZE = 30; + static constexpr uint16_t LABEL_X_SIZE = 200; + static constexpr uint16_t LABEL_Y_SIZE = 60; + static constexpr uint16_t TITLE_LABEL_X = 83; + static constexpr uint16_t TITLE_LABEL_Y = 103; + + static constexpr uint16_t BTN1_LABEL_X = 135; + static constexpr uint16_t BTN1_LABEL_Y = 210; + static constexpr uint16_t BTN2_LABEL_X = 286; + static constexpr uint16_t BTN2_LABEL_Y = 210; + static constexpr uint16_t BTN3_LABEL_X = 131; + static constexpr uint16_t BTN3_LABEL_Y = 365; + + // 图片设置 + static constexpr uint16_t BTN_IMAGE_SIZE = 100; + static constexpr uint16_t BTN1_IMAGE_X = 126; + static constexpr uint16_t BTN1_IMAGE_Y = 148; + static constexpr uint16_t BTN2_IMAGE_X = 276; + static constexpr uint16_t BTN2_IMAGE_Y = 148; + static constexpr uint16_t BTNMORE_IMAGE_X = 129; + static constexpr uint16_t BTNMORE_IMAGE_Y = 298; + static TraingView *g_pTraingView{nullptr}; + QuickTraining *data = new QuickTraining; TraingView::TraingView() { - + data = TraingModel::GetInstance()->GetQuickTraining(); g_pTraingView = this; } TraingView::~TraingView() { - DeInit(); + DeInitView(); g_pTraingView = nullptr; + delete data; } - TraingView *TraingView::GetInstance() { - return g_pTraingView; } - void TraingView::Init() + /*** + * @description: + * @return + * @brief 添加标签 + */ + bool TraingView::AddLabel() + { + // 初始化标签 + TraingModel::GetInstance()->InitLabel(title_label, TITLE_LABEL_X, TITLE_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "title_label", "快速训练", DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE); + const char *dataStr1 = data->training1_Text; + const char *dataStr2 = data->training2_Text; + const char *dataStr3 = data->training3_Text; + TraingModel::GetInstance()->InitLabel(btn1_label, BTN1_LABEL_X, BTN1_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu1_label", dataStr1, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE); + TraingModel::GetInstance()->InitLabel(btn2_label, BTN2_LABEL_X, BTN2_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu2_label", dataStr2, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE); + TraingModel::GetInstance()->InitLabel(btn3_label, BTN3_LABEL_X, BTN3_LABEL_Y, LABEL_X_SIZE, LABEL_Y_SIZE, "btu3_label", dataStr3, DEFAULT_VECTOR_FONT_FILENAME, LABEL_FONT_SIZE); + return true; + } + + bool TraingView::AddButton() + { + } + /*** + * @description: + * @return + * @brief 添加图片 + */ + bool TraingView::AddImageView() + { + const char *dataStr1 = data->training1_Image; + const char *dataStr2 = data->training2_Image; + const char *dataStr3 = data->training3_Image; + TraingModel::GetInstance()->InitImageView(btn1_image, BTN1_IMAGE_X, BTN1_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn1_image", dataStr1); + TraingModel::GetInstance()->InitImageView(btn2_image, BTN2_IMAGE_X, BTN2_IMAGE_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn2_image", dataStr2); + TraingModel::GetInstance()->InitImageView(btn3_image, BTN3_LABEL_X, BTN3_LABEL_Y, BTN_IMAGE_SIZE, BTN_IMAGE_SIZE, "btn3_image", dataStr3); + return true; + } + void TraingView::InitView() { if (container_ == nullptr) { @@ -37,27 +103,11 @@ namespace OHOS container_->SetStyle(STYLE_BACKGROUND_OPA, 0); } - // Add Label to App - if (label1_ == nullptr) - { - label1_ = new UILabel(); - } - label1_->SetPosition(173, 52); // widget's left position and top position - label1_->Resize(200, 60); // widget's width and height - label1_->SetViewId("label1"); // Set style - label1_->SetStyle(STYLE_TEXT_FONT, 30); + // 初始化按键 - // Set additional property - label1_->SetText("快速训练"); - label1_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - label1_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label1_->SetRollSpeed(0); - label1_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30); - - // Add to rootView - container_->Add(label1_); - label1_->SetVisible(true); + // 初始化标签 +#if 0 // Add Button to App if (button3_ == nullptr) { @@ -68,26 +118,18 @@ namespace OHOS button3_->SetViewId(BUTTONMORE); // Set style button3_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); button3_->SetStyle(STYLE_BACKGROUND_OPA, 0x00); - - // Set additional property -#ifdef _WIN32 - char *button3defaultImgSrc = "c:/Users/caiking/project/image_converter_tool/output/Training/More.bin"; -#else const char *button3defaultImgSrc = PNG_TRAING_BOUTTONMORE_IMAGE; -#endif char *button3triggeredImgSrc = nullptr; button3_->SetImageSrc(button3defaultImgSrc, button3triggeredImgSrc); button3_->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff33df1c, UIButton::PRESSED); button3_->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); button3_->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); - // Add the CallBack about events UIView::OnClickListener *button3Click = static_cast(TraingPresenter::GetInstance()); button3_->SetOnClickListener(button3Click); // Add to rootView container_->Add(button3_); button3_->SetVisible(true); - // Add Button to App if (button4_ == nullptr) { @@ -98,20 +140,13 @@ namespace OHOS button4_->SetViewId(BUTTON2); // Set style button4_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); button4_->SetStyle(STYLE_BACKGROUND_OPA, 0x00); - - // Set additional property -#ifdef _WIN32 - char *button4defaultImgSrc = "c:/Users/caiking/project/image_converter_tool/output/Training/Buttonground2.bin"; -#else const char *button4defaultImgSrc = PNG_TRAING_BUTTONGRONG2_IMAGE; -#endif char *button4triggeredImgSrc = nullptr; button4_->SetImageSrc(button4defaultImgSrc, button4triggeredImgSrc); button4_->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff33df1c, UIButton::PRESSED); button4_->SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED); button4_->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED); - // Add the CallBack about events UIView::OnClickListener *button4Click = static_cast(TraingPresenter::GetInstance()); button4_->SetOnClickListener(button4Click); // Add to rootView @@ -129,12 +164,7 @@ namespace OHOS button1_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); button1_->SetStyle(STYLE_BACKGROUND_OPA, 0x00); - // Set additional property -#ifdef _WIN32 - char *button1defaultImgSrc = "c:/Users/caiking/project/image_converter_tool/output/Training/Bouttonground.bin"; -#else const char *button1defaultImgSrc = PNG_TRAING_BUTTONGRONG_IMAGE; -#endif char *button1triggeredImgSrc = nullptr; button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc); button1_->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff33df1c, UIButton::PRESSED); @@ -159,12 +189,7 @@ namespace OHOS button2_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); button2_->SetStyle(STYLE_BACKGROUND_OPA, 0x00); - // Set additional property -#ifdef _WIN32 - char *button2defaultImgSrc = "c:/Users/caiking/project/image_converter_tool/output/Training/Bouttonground.bin"; -#else const char *button2defaultImgSrc = PNG_TRAING_BUTTONGRONG_IMAGE; -#endif char *button2triggeredImgSrc = nullptr; button2_->SetImageSrc(button2defaultImgSrc, button2triggeredImgSrc); button2_->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff33df1c, UIButton::PRESSED); @@ -177,135 +202,10 @@ namespace OHOS // Add to rootView container_->Add(button2_); button2_->SetVisible(true); - - // Add ImageView to App - if (image1_ == nullptr) - { - image1_ = new UIImageView(); - } - image1_->SetPosition(276, 148); // widget's left position and top position - image1_->Resize(100, 100); // widget's width and height - image1_->SetViewId("image2"); // Set style - - // Set additional property -#ifdef _WIN32 - char *image1imagesPath = "c:/Users/caiking/project/image_converter_tool/output/Training/riding-big2.bin"; -#else - const char *image1imagesPath = PNG_TRAING_RIDINGBIG_IMAGE; -#endif - image1_->SetSrc(image1imagesPath); - - // Add to rootView - container_->Add(image1_); - image1_->SetVisible(true); - - // Add Label to App - if (label2_ == nullptr) - { - label2_ = new UILabel(); - } - label2_->SetPosition(286, 210); // widget's left position and top position - label2_->Resize(200, 60); // widget's width and height - label2_->SetViewId("label2"); // Set style - label2_->SetStyle(STYLE_TEXT_FONT, 20); - - // Set additional property - label2_->SetText("骑行"); - label2_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - label2_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label2_->SetRollSpeed(0); - label2_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20); - - // Add to rootView - container_->Add(label2_); - label2_->SetVisible(true); - - // Add ImageView to App - if (image3_ == nullptr) - { - image3_ = new UIImageView(); - } - image3_->SetPosition(126, 298); // widget's left position and top position - image3_->Resize(100, 100); // widget's width and height - image3_->SetViewId("image3"); // Set style - - // Set additional property -#ifdef _WIN32 - char *image3imagesPath = "c:/Users/caiking/project/image_converter_tool/output/Training/running-big.bin"; -#else - const char *image3imagesPath = PNG_TRAING_RUNNINGBIG_IMAGE; -#endif - image3_->SetSrc(image3imagesPath); - - // Add to rootView - container_->Add(image3_); - image3_->SetVisible(true); - - // Add Label to App - if (label3_ == nullptr) - { - label3_ = new UILabel(); - } - label3_->SetPosition(135, 210); // widget's left position and top position - label3_->Resize(200, 60); // widget's width and height - label3_->SetViewId("label3"); // Set style - label3_->SetStyle(STYLE_TEXT_FONT, 20); - - // Set additional property - label3_->SetText("健走"); - label3_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - label3_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label3_->SetRollSpeed(0); - label3_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20); - - // Add to rootView - container_->Add(label3_); - label3_->SetVisible(true); - - // Add ImageView to App - if (image5_ == nullptr) - { - image5_ = new UIImageView(); - } - image5_->SetPosition(126, 148); // widget's left position and top position - image5_->Resize(100, 100); // widget's width and height - image5_->SetViewId("image1"); // Set style - - // Set additional property -#ifdef _WIN32 - char *image5imagesPath = "c:/Users/caiking/project/image_converter_tool/output/Training/walking-big.bin"; -#else - const char *image5imagesPath = PNG_TRAING_WALKINGBIG_IMAGE; #endif - image5_->SetSrc(image5imagesPath); - - // Add to rootView - container_->Add(image5_); - image5_->SetVisible(true); - - // Add Label to App - if (label4_ == nullptr) - { - label4_ = new UILabel(); - } - label4_->SetPosition(131, 365); // widget's left position and top position - label4_->Resize(200, 60); // widget's width and height - label4_->SetViewId("label4"); // Set style - label4_->SetStyle(STYLE_TEXT_FONT, 20); - - // Set additional property - label4_->SetText("跑步"); - label4_->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT); - label4_->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER); - label4_->SetRollSpeed(0); - label4_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20); - - // Add to rootView - container_->Add(label4_); - label4_->SetVisible(true); } - void TraingView::DeInit() + void TraingView::DeInitView() { if (container_ != nullptr) { @@ -313,66 +213,11 @@ namespace OHOS delete container_; container_ = nullptr; } - if (label1_ != nullptr) - { - delete label1_; - label1_ = nullptr; - } - if (button3_ != nullptr) - { - delete button3_; - button3_ = nullptr; - } - if (button4_ != nullptr) - { - delete button4_; - button4_ = nullptr; - } - if (button1_ != nullptr) - { - delete button1_; - button1_ = nullptr; - } - if (button2_ != nullptr) - { - delete button2_; - button2_ = nullptr; - } - if (image1_ != nullptr) - { - delete image1_; - image1_ = nullptr; - } - if (label2_ != nullptr) - { - delete label2_; - label2_ = nullptr; - } - if (image3_ != nullptr) - { - delete image3_; - image3_ = nullptr; - } - if (label3_ != nullptr) - { - delete label3_; - label3_ = nullptr; - } - if (image5_ != nullptr) - { - delete image5_; - image5_ = nullptr; - } - if (label4_ != nullptr) - { - delete label4_; - label4_ = nullptr; - } } UIView *TraingView::GetView() { - Init(); + InitView(); return container_; } diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/jumprope.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Jumprope.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/jumprope.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Jumprope.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/mountaineering.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Mountaineering.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/mountaineering.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Mountaineering.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/pingpong.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Pingpong.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/pingpong.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Pingpong.bin 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 similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/riding.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Riding.bin 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 similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/running.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Running.bin 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 similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/walking.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_36x36/Walking.bin 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 similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/riding_60.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/Riding_60.bin 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 similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/running_60.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_60x60/Running_60.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/jumprope_80.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/Jumprope_80.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/jumprope_80.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/Jumprope_80.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/mountaineering_80.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/Mountaineering_80.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/mountaineering_80.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/Mountaineering_80.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/pingpong_80.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/Pingpong_80.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/pingpong_80.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/Pingpong_80.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/riding_80.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/Riding_80.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/riding_80.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_80x80/Riding_80.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/arrows.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Arrows.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/arrows.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Arrows.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/back.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Back.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/back.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Back.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/bubble.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Bubble.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/bubble.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Bubble.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/buttonok.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Buttonok.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/buttonok.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Buttonok.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/calories.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Calories.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/calories.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Calories.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/calories_30.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Calories_30.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/calories_30.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Calories_30.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/control_point.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Control_point.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/control_point.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Control_point.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/data_point.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Data_point.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/data_point.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Data_point.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Go_1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Go.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Go_1.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Go.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/heartrate.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Heartrate.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/heartrate.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Heartrate.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/heartrate_1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Heartrate_1.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/heartrate_1.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Heartrate_1.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/heartrate_2.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Heartrate_2.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/heartrate_2.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Heartrate_2.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/heartrate_30.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Heartrate_30.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/heartrate_30.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Heartrate_30.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/icon.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Icon.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/icon.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Icon.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/inco_up.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Inco_up.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/inco_up.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Inco_up.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/inco_up_40.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Inco_up_40.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/inco_up_40.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Inco_up_40.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Line 1.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Line_1.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Line 1.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Line_1.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Line 2.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Line_2.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Line 2.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Line_2.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/mileage.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Mileage.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/mileage.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Mileage.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/mileage_30.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Mileage_30.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/mileage_30.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Mileage_30.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/no.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/No.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/no.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/No.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/note.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Note.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/note.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Note.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/path.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Path.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/path.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Path.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/piont_bubble.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Piont_bubble.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/piont_bubble.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Piont_bubble.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/piont_black.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Point_black.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/piont_black.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Point_black.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/point_bule.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Point_bule.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/point_bule.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Point_bule.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/point_green.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Point_green.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/point_green.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Point_green.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/point_orange.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Point_orange.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/point_orange.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Point_orange.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/point_yellow.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Point_yellow.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/point_yellow.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Point_yellow.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/progress.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Progress.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/progress.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Progress.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/sport_continue.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_continue.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/sport_continue.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_continue.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/sport_pause.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_pause.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/sport_pause.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_pause.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/sport_stop.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_stop.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/sport_stop.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_stop.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/sport-strength.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_strength.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/sport-strength.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Sport_strength.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/step_30.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Step_30.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/step_30.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Step_30.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/time.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Time.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/time.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Time.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/warning.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Warning.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/warning.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Warning.bin diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/yes.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Yes.bin similarity index 100% rename from code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/yes.bin rename to code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Yes.bin diff --git a/code/sdk/drivers/peripheral/cywee/service/cywee_at_cmd.c b/code/sdk/drivers/peripheral/cywee/service/cywee_at_cmd.c index 2c92dfbc9..8c64553ff 100644 --- a/code/sdk/drivers/peripheral/cywee/service/cywee_at_cmd.c +++ b/code/sdk/drivers/peripheral/cywee/service/cywee_at_cmd.c @@ -48,22 +48,22 @@ static uint32_t cywee_do_test(uint8_t *para, uint32_t paraLen, char *strCommonCm int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != ERRCODE_SUCC) { - PRINT("CYWEETEST ATCMD Convert Command Failed\n"); + //PRINT("CYWEETEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; } if (argc < 1) { - PRINT("CYWEETEST ATCMD Set Parameter Failed\n"); + //PRINT("CYWEETEST ATCMD Set Parameter Failed\n"); return ERRCODE_FAIL; } char *mode = (char*)argv[0]; if (strcmp(mode, "start") == 0) { - PRINT("cywee start\n"); + //PRINT("cywee start\n"); do_cywee_service_check_msg(CYWEE_SERVICE_CMD_START_CHECK); } else if (strcmp(mode, "stop") == 0) { - PRINT("cywee stop\n"); + //PRINT("cywee stop\n"); do_cywee_service_check_msg(CYWEE_SERVICE_CMD_STOP_CHECK); } else if (strcmp(mode, "test") == 0) { - PRINT("cywee test\n"); + //PRINT("cywee test\n"); do_cywee_service_check_msg(CYWEE_SERVICE_CMD_TEST); } return ERRCODE_SUCC;