训练结束同步训练类型Icon

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h
index d0bbb42..04d125e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h
@@ -17,6 +17,7 @@ namespace OHOS
 #define ICON36 "/user/res/Training/icon_36x36"
 #define ICON60 "/user/res/Training/icon_60x60"
 #define ICON80 "/user/res/Training/icon_80x80"
+#define ICON54 "user/res/Training/icon_54x79"
 #define MODULES "/user/res/Training/modules"
 #define TRAINING_GIF "/user/res/Training/training_GIF"
 
@@ -47,6 +48,17 @@ namespace OHOS
     static constexpr const char *PINGPONG_80_IMAGE = ICON80 "/Pingpong_80.bin";
     static constexpr const char *RIDING_80_IMAGE = ICON80 "/Riding_80.bin";
 
+    // Icon in the icon_54x79 folder
+    static constexpr const char *BALL_54_IMAGE = ICON54 "/Ball_54.bin";
+    static constexpr const char *DANCE_54_IMAGE = ICON54 "/Dance_54.bin";
+    static constexpr const char *FITNESS_54_IMAGE = ICON54 "/Fitness_54.bin";
+    static constexpr const char *ICE_54_IMAGE = ICON54 "/Ice_54.bin";
+    static constexpr const char *LIMIT_54_IMAGE = ICON54 "/Limit_54.bin";
+    static constexpr const char *OTHER_54_IMAGE = ICON54 "/Other_54.bin";
+    static constexpr const char *REST_54_IMAGE = ICON54 "/Rest_54.bin";
+    static constexpr const char *SWIMMING_54_IMAGE = ICON54 "/Swimming_54.bin";
+    static constexpr const char *WALKING_54_IMAGE = ICON54 "/Walking_54.bin";
+
     // Modules icons
     static constexpr const char *ARROWS_IMAGE = MODULES "/Arrows.bin";
     static constexpr const char *BACK_IMAGE = MODULES "/Back.bin";
@@ -95,7 +107,7 @@ namespace OHOS
     static constexpr const char *STEP_30_IMAGE = MODULES "/Step_30.bin";
     static constexpr const char *SPORT_HEARTRATE_IMAGE = MODULES "/sport_heartrate.bin";
     static constexpr const char *TIME_IMAGE = MODULES "/Time.bin";
-    static constexpr const char *WALKING_54_IMAGE = MODULES "/Walking_54.bin";
+    //static constexpr const char *WALKING_54_IMAGE = MODULES "/Walking_54.bin";
     static constexpr const char *WARNING_IMAGE = MODULES "/Warning.bin";
     static constexpr const char *YES_IMAGE = MODULES "/Yes.bin";
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h
index 76b8503..0e30b4b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingEnddataView.h
@@ -79,7 +79,7 @@ namespace OHOS
 
         UILabelButtonExt *buttonexit = nullptr;
 
-        UIImageView *imageLine1 = nullptr;
+        UIImageView *imageIcon = nullptr;
         UIImageView *imageLine2 = nullptr;
         UIImageView *imageLine3 = nullptr;
         UIImageView *imageLine4 = nullptr;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
index 8d1f6aa..c413c0c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
@@ -230,8 +230,8 @@ namespace OHOS
         std::string DisplayMotionDuration();
         /*设置运动类型*/
         void SetSportType(Exercisetype type);
-        /*获取运动类型*/
-        Exercisetype GetSportType();
+        /*获取运动类型图片*/
+        std::string GetSportType();
         /*设置运动项目*/
         void SetSportEvent(UIResourceTextId id);
         /*获取运动项目*/

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
index 5e076de..0d92edb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataPresenter.cpp
@@ -67,7 +67,7 @@ namespace OHOS
     {
         if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT)
         {
-            NativeAbility::GetInstance().EnterSlice(VIEW_TRAINING);
+            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE);
         }
         UNUSED(view);
         return true;
@@ -78,7 +78,7 @@ namespace OHOS
         // 根据控件id查找是哪个控件触发了点击回调
         if (strcmp(view.GetViewId(), BUTTONBACK) == 0)
         {
-            NativeAbility::GetInstance().EnterSlice(VIEW_APPLIST);
+            NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGMORE);
         }
         return true;
     }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
index 50dfab9..c26c62d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
@@ -59,7 +59,7 @@ namespace OHOS
         scrollView_->SetVisible(true);
 
         // 初始化image
-        TraingModel::GetInstance()->InitImageView(imageLine1, 80, 132, 54, 80, "image5", WALKING_54_IMAGE);
+        TraingModel::GetInstance()->InitImageView(imageIcon, 80, 132, 54, 80, "image5", WALKING_54_IMAGE);
         TraingModel::GetInstance()->InitImageView(imageLine2, 97, 214, 80, 20, "image6", LINE_IMAGE);
         TraingModel::GetInstance()->InitImageView(imageLine3, 97, 344, 80, 20, "image8", LINE_IMAGE);
         TraingModel::GetInstance()->InitImageView(imageLine4, 97, 474, 80, 20, "image9", LINE_IMAGE);
@@ -70,7 +70,7 @@ namespace OHOS
         scrollView_->Add(imageLine4);
         scrollView_->Add(imageLine5);
         scrollView_->Add(imageLine6);
-        scrollView_->Add(imageLine1);
+        scrollView_->Add(imageIcon);
 
         // 初始化Lable
         // 初始化标签
@@ -208,10 +208,10 @@ namespace OHOS
             buttonexit = nullptr;
         }
         /*图片*/
-        if (imageLine1 != nullptr)
+        if (imageIcon != nullptr)
         {
-            delete imageLine1;
-            imageLine1 = nullptr;
+            delete imageIcon;
+            imageIcon = nullptr;
         }
         if (imageLine2 != nullptr)
         {
@@ -259,7 +259,10 @@ namespace OHOS
     void TraingEnddataView::InitData()
     {
         SportData *enddata = TraingModel::GetInstance()->GetSportdata();
-
+        // 训练图标Icon
+        std::string imageStr = TraingModel::GetInstance()->GetSportType();
+        imageIcon->SetSrc(imageStr.c_str());
+        
         // 运动项目
         labelsport->SetTextId(enddata->sportId);
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
index 2800963..5471fe9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -432,10 +432,21 @@ namespace OHOS
     {
         sportType_ = type;
     }
-    /*获取运动类型*/
-    Exercisetype TraingModel::GetSportType()
+    /*结束数据icon*/
+    std::string sportImages[8] = {
+        FITNESS_54_IMAGE,
+        DANCE_54_IMAGE,
+        REST_54_IMAGE,
+        BALL_54_IMAGE,
+        SWIMMING_54_IMAGE,
+        ICE_54_IMAGE,
+        LIMIT_54_IMAGE,
+        OTHER_54_IMAGE,
+    };
+    /*获取运动类型图片*/
+    std::string TraingModel::GetSportType()
     {
-        return sportType_;
+        return sportImages[static_cast<int>(sportType_)];
     }
     /*设置运动Id*/
     void TraingModel::SetSportEvent(UIResourceTextId id)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
index fd78117..1c37781 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp
@@ -9,6 +9,7 @@
 #include <chrono>\r
 #include <thread>\r
 #include "traing/training_card/include/TraingCardPresenter.h"\r
+#include "traing/training_card/include/TrainingControlView.h"\r
 #include "traing/include/TraingModel.h"\r
 #include "custom_utils.h"\r
 #include "vibrator_service.h"\r
@@ -286,7 +287,8 @@ namespace OHOS
         }\r
         uapi_set_screen_on_api();                                    // 亮屏检测\r
         NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD); // 切换Slice\r
-\r
+        // 增加打印\r
+        PRINT("cmd->sportType[%d],cmd->controlmd[%d],cmd->sportTagType[%d],cmd->sportType[%d]\r\n", cmd->sportType, cmd->controlmd, cmd->sportTagType, cmd->sportType);\r
         switch (cmd->sportType)\r
         {\r
         // 室外走路\r

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ball_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ball_54.bin
new file mode 100644 (file)
index 0000000..b93746a
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ball_54.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Dance_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Dance_54.bin
new file mode 100644 (file)
index 0000000..85cb1e0
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Dance_54.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Fitness_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Fitness_54.bin
new file mode 100644 (file)
index 0000000..85ce2a0
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Fitness_54.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ice_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ice_54.bin
new file mode 100644 (file)
index 0000000..2ff4572
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Ice_54.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Other_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Other_54.bin
new file mode 100644 (file)
index 0000000..f6dd40b
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Other_54.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Rest_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Rest_54.bin
new file mode 100644 (file)
index 0000000..2141e2e
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Rest_54.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Swimming_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Swimming_54.bin
new file mode 100644 (file)
index 0000000..9443d83
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Swimming_54.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Walking_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Walking_54.bin
new file mode 100644 (file)
index 0000000..7e498ca
Binary files /dev/null and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/icon_54x79/Walking_54.bin differ

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Walking_54.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Walking_54.bin
deleted file mode 100644 (file)
index 0c97705..0000000
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/Training/modules/Walking_54.bin and /dev/null differ