修改训练Slice的UI

diff --git a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessagePresenter.h b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessagePresenter.h
index 7fa48fc..a023c61 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/include/MessagePresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/include/MessagePresenter.h
@@ -5,13 +5,15 @@
 #include "Presenter.h"
 #include "MessageView.h"
 #include "message/include/MessageModel.h"
+#include "components/ui_list.h"
 namespace OHOS
 {
     class MessageView;
     class MessageModel;
     class MessagePresenter : public Presenter<MessageView>,
                              public UIView::OnClickListener,
-                             public UIView::OnDragListener
+                             public UIView::OnDragListener,
+                             public UIList
     {
     public:
         MessagePresenter();
@@ -28,6 +30,7 @@ namespace OHOS
         // 因为继承了OnClickListener，所以有OnClick属性，至于参数,原函数也这样直接继承;
         bool OnClick(UIView &view, const ClickEvent &event) override;
         bool OnDrag(UIView &view, const DragEvent &event) override;
+        bool DragYInner(int16_t distance) override;
         MessageModel *p_MessageModel{nullptr};
     };
 } // namespace OHOS

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 c66e3bd..9636799 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/message/src/MessagePresenter.cpp
@@ -4,6 +4,9 @@
 #include "message/include/MessagePresenter.h"
 #include "message/include/MessageAdapter.h"
 #include "message/include/MessageItemView.h"
+#include "components/ui_abstract_scroll_bar.h"
+#include "gfx_utils/graphic_log.h"
+
 namespace OHOS
 {
 
@@ -83,5 +86,35 @@ namespace OHOS
         }
         return true;
     }
-    
+    bool MessagePresenter::DragYInner(int16_t distance)
+    {
+#if 0
+        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DragYInner");
+        int16_t listHeight = GetHeight();
+        // 在原有代码的基础上修改，移除滚动空白区域的逻辑
+        if (distance > 0)
+        {
+            if (childrenHead_)
+            {
+                distance = -childrenHead_->GetY(); // 下拉时不留空白区域，直接将子元素移动到顶部
+            }
+        }
+        else
+        {
+            if (childrenTail_)
+            {
+                if (childrenTail_->GetRelativeRect().GetBottom() <= listHeight - childrenTail_->GetStyle(STYLE_MARGIN_BOTTOM))
+                {
+                    distance = 0; // 下拉时不留空白区域，直接将子元素移动到底部
+                }
+                else
+                {
+                    distance = listHeight - childrenTail_->GetY() - childrenTail_->GetRelativeRect().GetHeight() - childrenTail_->GetStyle(STYLE_MARGIN_BOTTOM);
+                }
+            }
+        }
+        return UIList::MoveOffset(0, distance);
+#endif
+    }
+
 }
\ No newline at end of file

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 0016809..a15be2c 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/Training_UiConfig.h
@@ -58,7 +58,7 @@ namespace OHOS
     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_1_IMAGE = MODULES "/Go.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";

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingControlView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingControlView.h
index e96e781..3f6f6eb 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingControlView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingControlView.h
@@ -24,9 +24,7 @@ namespace OHOS
 #define BUTTONPAUSE "button2"\r
 #define BUTTONCONTINUE "button3"\r
 \r
-#define BUTTON_PAUSE_IMG_SRC "/user/res/Training/sport-pause.bin"\r
-#define BUTTON_STOP_IMG_SRC "/user/res/Training/sport-stop.bin"\r
-#define BUTTON_CONTINUE_IMG_SRC "/user/res/Training/sport-continue.bin"\r
+\r
 \r
     class TraingControlPresenter;\r
     class TraingControlView : public View<TraingControlPresenter>\r

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 379695c..6edc60d 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/include/TraingModel.h
@@ -61,7 +61,6 @@ namespace OHOS
     private:
         TraingModel(const TraingModel &) = delete;
         TraingModel &operator=(const TraingModel &) = delete;
-        QuickTraining *quickTraining_;
     };
 }
 

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp
index 70123e6..1f0fe44 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingControlView.cpp
@@ -6,9 +6,11 @@
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r
 #include "components/ui_button.h"\r
+#include "traing/include/TraingModel.h"\r
+#include "traing/Training_UiConfig.h"\r
+\r
 namespace OHOS\r
 {\r
-    static const char *imagePath_point = "/user/res/Training/control_point.bin";\r
 \r
     static TraingControlView *g_pTraingControlView{nullptr};\r
 \r
@@ -129,16 +131,11 @@ namespace OHOS
         //  初始化Button\r
         InitButton(button1_, 100, 202, 100, 100, BUTTONSTOP);\r
         // Set additional property\r
-        char *button1defaultImgSrc = BUTTON_STOP_IMG_SRC;\r
-        char *button1triggeredImgSrc = nullptr;\r
-        button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc);\r
+        button1_->SetImageSrc(SPORT_STOP_IMAGE, nullptr);\r
         container_->Add(button1_);\r
-\r
         InitButton(button2_, 255, 202, 100, 100, BUTTONPAUSE);\r
         // Set additional property\r
-        char *button2defaultImgSrc = BUTTON_PAUSE_IMG_SRC;\r
-        char *button2triggeredImgSrc = nullptr;\r
-        button2_->SetImageSrc(button2defaultImgSrc, button2triggeredImgSrc);\r
+        button2_->SetImageSrc(SPORT_PAUSE_IMAGE, nullptr);\r
         container_->Add(button2_);\r
 \r
         // 初始化Lable\r
@@ -152,7 +149,7 @@ namespace OHOS
         container_->Add(label4_);\r
 \r
         // 初始化Image\r
-        InitImageView(image1_, 193, 421, 80, 20, "image1", imagePath_point);\r
+        InitImageView(image1_, 193, 421, 80, 20, "image1", CONTROL_POINT_IMAGE);\r
         container_->Add(image1_);\r
     }\r
 \r
@@ -173,13 +170,13 @@ namespace OHOS
     {\r
         if (TraingControlPresenter::GetInstance()->test == "继续")\r
         {\r
-            //button2_->SetViewId(BUTTONCONTINUE);\r
-            button2_->SetImageSrc(BUTTON_CONTINUE_IMG_SRC, nullptr);\r
+            // button2_->SetViewId(BUTTONCONTINUE);\r
+            button2_->SetImageSrc(SPORT_CONTINUE_IMAGE, nullptr);\r
         }\r
         if (TraingControlPresenter::GetInstance()->test == "暂停")\r
         {\r
-            //button2_->SetViewId(BUTTONPAUSE);\r
-            button2_->SetImageSrc(BUTTON_PAUSE_IMG_SRC, nullptr);\r
+            // button2_->SetViewId(BUTTONPAUSE);\r
+            button2_->SetImageSrc(SPORT_PAUSE_IMAGE, nullptr);\r
         }\r
     }\r
     /******************************************************************************************************/\r
@@ -188,6 +185,7 @@ namespace OHOS
     void TraingControlView::DeInit()\r
     {\r
         // 删除Label\r
+        container_->RemoveAll();\r
         if (label1_ != nullptr)\r
         {\r
             container_->Remove(label1_);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp
index 8a184e7..659715f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDataView.cpp
@@ -6,15 +6,11 @@
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r
 #include "components/ui_button.h"\r
+#include "traing/include/TraingModel.h"\r
+#include "traing/Training_UiConfig.h"\r
+\r
 namespace OHOS\r
 {\r
-    static const char *imagePath_point = "/user/res/Training/data_point.bin";\r
-    static const char *imagePath_progress = "/user/res/Training/progress.bin";\r
-    static const char *imagePath_incoup = "/user/res/Training/inco_up.bin";\r
-    static const char *imagePath_arrows = "/user/res/Training/arrows.bin";\r
-    static const char *imagePath_strength = "/user/res/Training/sport-strength.bin";\r
-    static const char *imagePath_note = "/user/res/Training/note.bin";\r
-\r
     static TraingDataView *g_pTraingDataView{nullptr};\r
 \r
     TraingDataView::TraingDataView()\r
@@ -132,11 +128,11 @@ namespace OHOS
         }\r
 \r
         // 初始化Image\r
-        InitImageView(image1_, 13, 13, 440, 386, "image1", imagePath_progress);\r
-        InitImageView(image2_, 208, 297, 20, 20, "image2", imagePath_arrows);\r
-        InitImageView(image3_, 98, 314, 270, 20, "image3", imagePath_strength);\r
-        InitImageView(image4_, 225, 396, 16, 10, "image4", imagePath_incoup);\r
-        InitImageView(image5_, 193, 421, 80, 20, "image5", imagePath_point);\r
+        InitImageView(image1_, 13, 13, 440, 386, "image1", PROGRESS_IMAGE);\r
+        InitImageView(image2_, 208, 297, 20, 20, "image2", ARROWS_IMAGE);\r
+        InitImageView(image3_, 98, 314, 270, 20, "image3", SPORT_STRENGTH_IMAGE);\r
+        InitImageView(image4_, 225, 396, 16, 10, "image4", INCO_UP_IMAGE);\r
+        InitImageView(image5_, 193, 421, 80, 20, "image5", CONTROL_POINT_IMAGE);\r
         container_->Add(image1_);\r
         container_->Add(image2_);\r
         container_->Add(image3_);\r
@@ -156,9 +152,7 @@ namespace OHOS
         //  初始化Button\r
         InitButton(button1_, 275, 350, 26, 26, BUTTONNOTE);\r
         // Set additional property\r
-        static const char *button1defaultImgSrc = imagePath_note;\r
-        char *button1triggeredImgSrc = nullptr;\r
-        button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc);\r
+        button1_->SetImageSrc(NOTE_IMAGE, nullptr);\r
         container_->Add(button1_);\r
     }\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp
index 2f08671..306679e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingDetailView.cpp
@@ -6,6 +6,9 @@
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r
 #include "components/ui_button.h"\r
+#include "traing/include/TraingModel.h"\r
+#include "traing/Training_UiConfig.h"\r
+\r
 namespace OHOS\r
 {\r
     static const char *imagePath_heartrate = "/user/res/Training/heartrat_30.bin";\r
@@ -132,13 +135,13 @@ namespace OHOS
         }\r
 \r
         // 初始化Image\r
-        InitImageView(image1_, 134, 58, 30, 30, "image1", imagePath_heartrate);\r
-        InitImageView(image2_, 44, 189, 30, 30, "image2", imagePath_mileage);\r
-        InitImageView(image3_, 297, 189, 30, 30, "image3", imagePath_step);\r
-        InitImageView(image4_, 129, 335, 30, 30, "image4", imagePath_calories);\r
-        InitImageView(image5_, 0, 160, 10, 466, "image5", imagePath_line1);\r
-        InitImageView(image6_, 233, 193, 80, 20, "image5", imagePath_line2);\r
-        InitImageView(image7_, 0, 306, 10, 466, "image5", imagePath_line1);\r
+        InitImageView(image1_, 134, 58, 30, 30, "image1", HEARTRATE_30_IMAGE);\r
+        InitImageView(image2_, 44, 189, 30, 30, "image2", MILEAGE_30_IMAGE);\r
+        InitImageView(image3_, 297, 189, 30, 30, "image3", STEP_30_IMAGE);\r
+        InitImageView(image4_, 129, 335, 30, 30, "image4", CALORIES_30_IMAGE);\r
+        InitImageView(image5_, 0, 160, 10, 466, "image5", LINE_1_IMAGE);\r
+        InitImageView(image6_, 233, 193, 80, 20, "image5", LINE_2_IMAGE);\r
+        InitImageView(image7_, 0, 306, 10, 466, "image5", LINE_1_IMAGE);\r
         container_->Add(image1_);\r
         container_->Add(image2_);\r
         container_->Add(image3_);\r
@@ -168,6 +171,7 @@ namespace OHOS
     /* DeInit：删除组件 */\r
     void TraingDetailView::DeInit()\r
     {\r
+        container_->RemoveAll();\r
         UIView *view = static_cast<UIViewGroup *>(container_)->GetChildrenHead();\r
         while (view != nullptr)\r
         {\r

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 db4f865..19496b1 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEnddataView.cpp
@@ -6,14 +6,11 @@
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
+#include "traing/include/TraingModel.h"
+#include "traing/Training_UiConfig.h"
+
 namespace OHOS
 {
-    static const char *imagePath_path = "/user/res/Training/path.bin";
-    static const char *imagePath_bubble = "/user/res/Training/bubble.bin";
-    static const char *imagePath_bubblepiont = "/user/res/Training/bubble_piont.bin";
-    static const char *imagePath_Line = "/user/res/Training/Line.bin";
-    static const char *imagePath_spot = "/user/res/Training/Walking_54.bin";
-    static const char *imagePath_incoup = "/user/res/Training/inco_up_40.bin";
 
     static TraingEnddataView *g_pTraingEnddataView{nullptr};
 
@@ -149,16 +146,16 @@ namespace OHOS
         scrollView1_->SetVisible(true);
 
         // 初始化Image
-        InitImageView(image1_, 200, 131, 80, 48, "image1", imagePath_bubble);
-        InitImageView(image2_, 230, 183, 20, 20, "image2", imagePath_bubblepiont);
-        InitImageView(image3_, 96, 118, 271, 233, "image3", imagePath_path);
-        InitImageView(image4_, 212, 402, 40, 40, "image4", imagePath_incoup);
-        InitImageView(image5_, 80, 470, 54, 80, "image5", imagePath_spot);
-        InitImageView(image6_, 97, 552, 80, 20, "image6", imagePath_Line);
-        InitImageView(image8_, 97, 682, 80, 20, "image6", imagePath_Line);
-        InitImageView(image9_, 97, 812, 80, 20, "image6", imagePath_Line);
-        InitImageView(image10_, 97, 942, 80, 20, "image6", imagePath_Line);
-        InitImageView(image11_, 97, 1072, 80, 20, "image6", imagePath_Line);
+        InitImageView(image1_, 200, 131, 80, 48, "image1", BUBBLE_IMAGE);
+        InitImageView(image2_, 230, 183, 20, 20, "image2", PIONT_BUBBLE_IMAGE);
+        InitImageView(image3_, 96, 118, 271, 233, "image3", PATH_IMAGE);
+        InitImageView(image4_, 212, 402, 40, 40, "image4", INCO_UP_40_IMAGE);
+        InitImageView(image5_, 80, 470, 54, 80, "image5", WALKING_54_IMAGE);
+        InitImageView(image6_, 97, 552, 80, 20, "image6", LINE_IMAGE);
+        InitImageView(image8_, 97, 682, 80, 20, "image6", LINE_IMAGE);
+        InitImageView(image9_, 97, 812, 80, 20, "image6", LINE_IMAGE);
+        InitImageView(image10_, 97, 942, 80, 20, "image6", LINE_IMAGE);
+        InitImageView(image11_, 97, 1072, 80, 20, "image6", LINE_IMAGE);
 
         scrollView1_->Add(image3_);
         scrollView1_->Add(image6_);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp
index 0285ef2..6d25692 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnote2View.cpp
@@ -6,10 +6,11 @@
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
+#include "traing/include/TraingModel.h"
+#include "traing/Training_UiConfig.h"
+
 namespace OHOS
 {
-    static const char *imagePath_no = "/user/res/Training/no.bin";
-    static const char *imagePath_yes = "/user/res/Training/yes.bin";
 
     static TraingEndnote2View *g_pTraingEndnote2View{nullptr};
 
@@ -136,15 +137,11 @@ namespace OHOS
 
         InitButton(button1_, 111, 299, 100, 100, BUTTONNO);
         // Set additional property
-        const char *button1defaultImgSrc = imagePath_no;
-        char *button1triggeredImgSrc = nullptr;
-        button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc);
+        button1_->SetImageSrc(NO_IMAGE, nullptr);
 
         InitButton(button2_, 256, 299, 100, 100, BUTTONYES);
         // Set additional property
-        const char *button2defaultImgSrc = imagePath_yes;
-        char *button2triggeredImgSrc = nullptr;
-        button2_->SetImageSrc(button2defaultImgSrc, button2triggeredImgSrc);
+        button2_->SetImageSrc(YES_IMAGE, nullptr);
 
         container_->Add(button1_);
         container_->Add(button2_);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp
index e2c1d81..44e93a6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingEndnoteView.cpp
@@ -6,6 +6,9 @@
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
+#include "traing/include/TraingModel.h"
+#include "traing/Training_UiConfig.h"
+
 namespace OHOS
 {
     static const char *imagePath_no = "/user/res/Training/no.bin";
@@ -136,15 +139,11 @@ namespace OHOS
 
         InitButton(button1_, 111, 299, 100, 100, BUTTONNO);
         // Set additional property
-        const char *button1defaultImgSrc = imagePath_no;
-        char *button1triggeredImgSrc = nullptr;
-        button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc);
+        button1_->SetImageSrc(NO_IMAGE, nullptr);
 
         InitButton(button2_, 256, 299, 100, 100, BUTTONYES);
         // Set additional property
-        const char *button2defaultImgSrc = imagePath_yes;
-        char *button2triggeredImgSrc = nullptr;
-        button2_->SetImageSrc(button2defaultImgSrc, button2triggeredImgSrc);
+        button2_->SetImageSrc(YES_IMAGE, nullptr);
 
         container_->Add(button1_);
         container_->Add(button2_);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSView.cpp
index 46d4807..5b05f35 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSView.cpp
@@ -6,10 +6,11 @@
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
+#include "traing/include/TraingModel.h"
+#include "traing/Training_UiConfig.h"
+
 namespace OHOS
 {
-    static const char *imagePath_heartrate = "/user/res/Training/heartrate_1.bin";
-    static const char *imagePath_GPS = "/user/res/Training/GPS_1.bin";
     static TraingGPSView *g_pTraingGPSView{nullptr};
 
     TraingGPSView::TraingGPSView()
@@ -137,16 +138,14 @@ namespace OHOS
         InitLabel(label4_, 361, 237, 54, 41, "lable4", "GPS", DEFAULT_VECTOR_FONT_FILENAME, 35);
         container_->Add(label4_);
         // 初始化image
-        InitImageView(image1_, 48, 193, 40, 40, "image1", imagePath_heartrate);
-        InitImageView(image2_, 375, 193, 40, 40, "image2", imagePath_GPS);
+        InitImageView(image1_, 48, 193, 40, 40, "image1", HEARTRATE_1_IMAGE);
+        InitImageView(image2_, 375, 193, 40, 40, "image2", GPS_1_IMAGE);
         container_->Add(image1_);
         container_->Add(image2_);
         // 初始化Button
         InitButton(button1_, 133, 133, 200, 200, BUTTONGO);
-        // Set additional property
-        char *button1defaultImgSrc = "/user/res/Training/Go.bin";
-        char *button1triggeredImgSrc = nullptr;
-        button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc);
+
+        button1_->SetImageSrc(GO_1_IMAGE, nullptr);
 
         InitButton(button2_, 160, 370, 146, 35, BUTTONSET);
         button2_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000); // 设置为透明按键
@@ -159,6 +158,7 @@ namespace OHOS
     /* DeInit：删除组件*/
     void TraingGPSView::DeInit()
     {
+        container_->RemoveAll();
         UIView *view = static_cast<UIViewGroup *>(container_)->GetChildrenHead();
         while (view != nullptr)
         {

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSbackView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSbackView.cpp
index 2244133..4fc1744 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSbackView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSbackView.cpp
@@ -6,9 +6,10 @@
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
+#include "traing/include/TraingModel.h"
+#include "traing/Training_UiConfig.h"
 namespace OHOS
 {
-    static const char *imagePath_warning = "/user/res/Training/back.bin";
     static TraingGPSbackView *g_pTraingGPSbackView{nullptr};
 
     TraingGPSbackView::TraingGPSbackView()
@@ -133,7 +134,7 @@ namespace OHOS
         container_->Add(label2_);
         
         // 初始化image
-        InitImageView(image1_, 193, 140, 40, 40, "image1", imagePath_warning); 
+        InitImageView(image1_, 193, 140, 40, 40, "image1", BACK_IMAGE); 
         container_->Add(image1_);
 
         // 初始化Button

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlackView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlackView.cpp
index 383e6a6..f3b40e9 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlackView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlackView.cpp
@@ -6,10 +6,12 @@
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
+#include "traing/include/TraingModel.h"
+#include "traing/Training_UiConfig.h"
+
 namespace OHOS
 {
-    static const char *imagePath_heartrate = "/user/res/Training/heartrate_2.bin";
-    static const char *imagePath_GPS = "/user/res/Training/GPS_2.bin";
+
     static TraingGPSlackView *g_pTraingGPSlackView{nullptr};
 
     TraingGPSlackView::TraingGPSlackView()
@@ -137,8 +139,8 @@ namespace OHOS
         InitLabel(label4_, 361, 237, 54, 41, "lable4", "--", DEFAULT_VECTOR_FONT_FILENAME, 35);
         container_->Add(label4_);
         // 初始化image
-        InitImageView(image1_, 48, 193, 40, 40, "image1", imagePath_heartrate);
-        InitImageView(image2_, 375, 193, 40, 40, "image2", imagePath_GPS);
+        InitImageView(image1_, 48, 193, 40, 40, "image1", HEARTRATE_2_IMAGE);
+        InitImageView(image2_, 375, 193, 40, 40, "image2", GPS_2_IMAGE);
         container_->Add(image1_);
         container_->Add(image2_);
         // 初始化Button

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlostView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlostView.cpp
index aa275c6..76c8d13 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlostView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSlostView.cpp
@@ -6,9 +6,11 @@
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
+#include "traing/include/TraingModel.h"
+#include "traing/Training_UiConfig.h"
 namespace OHOS
 {
-    static const char *imagePath_warning = "/user/res/Training/warning.bin";
+
     static TraingGPSlostView *g_pTraingGPSlostView{nullptr};
 
     TraingGPSlostView::TraingGPSlostView()
@@ -131,19 +133,16 @@ namespace OHOS
         container_->Add(label1_);
         InitLabel(label2_, 55, 253, 146, 35, "label2", "当前位置搜索不到GPS信号", DEFAULT_VECTOR_FONT_FILENAME, 30);
         container_->Add(label2_);
-        
+
         // 初始化image
-        InitImageView(image1_, 193, 140, 40, 40, "image1", imagePath_warning); 
+        InitImageView(image1_, 193, 140, 40, 40, "image1", WARNING_IMAGE);
         container_->Add(image1_);
 
         // 初始化Button
         InitButton(button1_, 0, 366, 466, 100, BUTTONOK);
         // Set additional property
-        char *button1defaultImgSrc = "/user/res/Training/buttonok.bin";
-        char *button1triggeredImgSrc = nullptr;
-        button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc);   
+        button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr);
         container_->Add(button1_);
-
     }
     /* DeInit：删除组件*/
     void TraingGPSlostView::DeInit()

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSnoteView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSnoteView.cpp
index 34c4f75..b50ef52 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSnoteView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSnoteView.cpp
@@ -6,9 +6,11 @@
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
+#include "traing/include/TraingModel.h"
+#include "traing/Training_UiConfig.h"
+
 namespace OHOS
 {
-    static const char *imagePath_warning = "/user/res/Training/warning.bin";
 
     static TraingGPSnoteView *g_pTraingGPSnoteView{nullptr};
 
@@ -144,7 +146,7 @@ namespace OHOS
         scrollView1_->SetVisible(true);
 
         // 初始化Image
-        InitImageView(image1_, 193, 111, 80, 80, "image1", imagePath_warning);
+        InitImageView(image1_, 193, 111, 80, 80, "image1", WARNING_IMAGE);
         scrollView1_->Add(image1_);
 
         // 初始化button

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSsetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSsetView.cpp
index bd19af4..b1f85d8 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSsetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingGPSsetView.cpp
@@ -6,16 +6,15 @@
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
+#include "traing/include/TraingModel.h"
+#include "traing/Training_UiConfig.h"
+
 namespace OHOS
 {
     // 定义全局变量
-    static char *imagePaths[] = {"/user/res/Training/time.bin",
-                                 "/user/res/Training/mileage.bin",
-                                 "/user/res/Training/calories.bin",
-                                 "/user/res/Training/walking.bin"};
+    static const char *imagePaths[] = {TIME_IMAGE, MILEAGE_IMAGE, CALORIES_IMAGE, WARNING_IMAGE};
 
     static char *text[] = {"时长", "距离", "卡路里", "步数"};
-    static const char *imagePath_iocn = "/user/res/Training/icon.bin";
     static TraingGPSsetView *g_pTraingGPSsetView{nullptr};
 
     TraingGPSsetView::TraingGPSsetView()
@@ -146,9 +145,18 @@ namespace OHOS
         for (int i = 0; i < 4; ++i)
         {
             IconItemNode *listData = new IconItemNode();
-            listData->imagePath = imagePaths[i];
+            // 检查是否需要分配内存空间
+            if (listData->imagePath == nullptr)
+            {
+                listData->imagePath = new char[strlen(imagePaths[i]) + 1];
+            }
+            strcpy(listData->imagePath, imagePaths[i]);
             listData->txt = text[i];
             list1data_->PushBack(listData);
+
+            // 释放内存空间
+            // delete[] listData->imagePath;
+            // delete listData;
         }
 
         if (list1adapter_ == nullptr)
@@ -201,10 +209,10 @@ namespace OHOS
         scrollView1_->Add(button4_);
 
         // 初始化Image
-        InitImageView(image1_, 380, 160, 100, 100, "image1", imagePath_iocn);
-        InitImageView(image2_, 380, 280, 100, 100, "image2", imagePath_iocn);
-        InitImageView(image3_, 380, 400, 100, 100, "image3", imagePath_iocn);
-        InitImageView(image4_, 380, 520, 100, 100, "image4", imagePath_iocn);
+        InitImageView(image1_, 380, 160, 100, 100, "image1", ICON_IMAGE);
+        InitImageView(image2_, 380, 280, 100, 100, "image2", ICON_IMAGE);
+        InitImageView(image3_, 380, 400, 100, 100, "image3", ICON_IMAGE);
+        InitImageView(image4_, 380, 520, 100, 100, "image4", ICON_IMAGE);
         scrollView1_->Add(image1_);
         scrollView1_->Add(image2_);
         scrollView1_->Add(image3_);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingLimitView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingLimitView.cpp
index 5ebde5c..a45e392 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingLimitView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingLimitView.cpp
@@ -6,11 +6,13 @@
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r
 #include "components/ui_button.h"\r
+\r
+#include "traing/include/TraingModel.h"\r
+#include "traing/Training_UiConfig.h"\r
 namespace OHOS\r
 {\r
 \r
     static char *text[] = {"一般极限运动", "滑板", "高空弹跳/蹦极", "跑酷", "BMX", "定向越野", "跳伞", "铁人三项运动"};\r
-    static const char *imagePath_iocn = "/user/res/Training/icon.bin";\r
 \r
     static TraingLimitView *g_pTraingLimitView{nullptr};\r
 \r
@@ -144,7 +146,7 @@ namespace OHOS
         for (int i = 0; i < 8; ++i)\r
         {\r
             IconItemNode *listData = new IconItemNode();\r
-            //listData->imagePath = imagePaths[i];\r
+            // listData->imagePath = imagePaths[i];\r
             listData->txt = text[i];\r
             list1data_->PushBack(listData);\r
         }\r
@@ -206,14 +208,14 @@ namespace OHOS
         scrollView1_->Add(button7_);\r
         scrollView1_->Add(button8_);\r
         // 初始化image\r
-        InitImageView(image1_, 360, 160, 100, 100, "image1", imagePath_iocn);\r
-        InitImageView(image2_, 360, 280, 100, 100, "image2", imagePath_iocn);\r
-        InitImageView(image3_, 360, 400, 100, 100, "image3", imagePath_iocn);\r
-        InitImageView(image4_, 360, 520, 100, 100, "image4", imagePath_iocn);\r
-        InitImageView(image5_, 360, 640, 100, 100, "image5", imagePath_iocn);\r
-        InitImageView(image6_, 360, 760, 100, 100, "image6", imagePath_iocn);\r
-        InitImageView(image7_, 360, 880, 100, 100, "image7", imagePath_iocn);\r
-        InitImageView(image8_, 360, 1000, 100, 100, "image8", imagePath_iocn);\r
+        InitImageView(image1_, 360, 160, 100, 100, "image1", ICON_IMAGE);\r
+        InitImageView(image2_, 360, 280, 100, 100, "image2", ICON_IMAGE);\r
+        InitImageView(image3_, 360, 400, 100, 100, "image3", ICON_IMAGE);\r
+        InitImageView(image4_, 360, 520, 100, 100, "image4", ICON_IMAGE);\r
+        InitImageView(image5_, 360, 640, 100, 100, "image5", ICON_IMAGE);\r
+        InitImageView(image6_, 360, 760, 100, 100, "image6", ICON_IMAGE);\r
+        InitImageView(image7_, 360, 880, 100, 100, "image7", ICON_IMAGE);\r
+        InitImageView(image8_, 360, 1000, 100, 100, "image8", ICON_IMAGE);\r
         scrollView1_->Add(image1_);\r
         scrollView1_->Add(image2_);\r
         scrollView1_->Add(image3_);\r
@@ -229,6 +231,7 @@ namespace OHOS
     /* DeInit：删除组件*/\r
     void TraingLimitView::DeInit()\r
     {\r
+        container_->RemoveAll();\r
         if (label1_ != nullptr)\r
         {\r
             delete label1_;\r
@@ -332,6 +335,7 @@ namespace OHOS
         }\r
         if (scrollView1_ != nullptr)\r
         {\r
+            scrollView1_->RemoveAll();\r
             delete scrollView1_;\r
             scrollView1_ = nullptr;\r
         }\r

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 72d54ae..dc36572 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
@@ -8,8 +8,7 @@ namespace OHOS
     TraingModel ::TraingModel()
     {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingModel::TraingModel()");
-        quickTraining_ = new QuickTraining(); // 为quickTraining_赋初值
-#if 1
+#if 0
         printf(" quickTraining_--training1_Text: %s\n", quickTraining_->training1_Text.c_str());
         printf(" quickTraining_--training1_Image: %s\n", quickTraining_->training1_Image.c_str());
         printf(" quickTraining_--training2_Text: %s\n", quickTraining_->training2_Text.c_str());
@@ -35,7 +34,7 @@ namespace OHOS
      */
     void TraingModel::SetQuickTraining(QuickTraining *quickTraining)
     {
-        quickTraining_ = quickTraining;
+        // quickTraining_ = quickTraining;
     }
     /***
      * @description:
@@ -44,6 +43,7 @@ namespace OHOS
      */
     QuickTraining *TraingModel::GetQuickTraining() const
     {
+        QuickTraining *quickTraining_ = new QuickTraining(); // 为quickTraining_赋初值
         return quickTraining_;
     }
     /***

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMoreView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMoreView.cpp
index f821077..23da15b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMoreView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingMoreView.cpp
@@ -1,5 +1,7 @@
 \r
 #include "traing/include/TraingMoreView.h"\r
+#include "traing/include/TraingModel.h"\r
+#include "traing/Training_UiConfig.h"\r
 \r
 #include "common/image_cache_manager.h"\r
 #include "UiConfig.h"\r
@@ -9,17 +11,9 @@
 namespace OHOS\r
 {\r
     // 定义全局变量\r
-    static char *imagePaths[] = {"/user/res/Training/Fitness.bin",\r
-                          "/user/res/Training/Dance.bin",\r
-                          "/user/res/Training/Rest.bin",\r
-                          "/user/res/Training/Ball.bin",\r
-                          "/user/res/Training/Swimming.bin",\r
-                          "/user/res/Training/Ice.bin",\r
-                          "/user/res/Training/Limit.bin",\r
-                          "/user/res/Training/Other.bin"};\r
+    static const char *imagePaths[] = {FITNESS_IMAGE, DANCE_IMAGE, REST_IMAGE, BALL_IMAGE, SWIMMING_IMAGE, ICE_IMAGE, LIMIT_IMAGE, OTHER_IMAGE};\r
 \r
     static char *text[] = {"健身类", "舞蹈类", "休闲运动", "球类", "水上运动", "冰上运动", "极限运动", "其他"};\r
-    static const char *imagePath_iocn = "/user/res/Training/icon.bin";\r
 \r
     static TraingMoreView *g_pTraingMoreView{nullptr};\r
 \r
@@ -153,9 +147,18 @@ namespace OHOS
         for (int i = 0; i < 8; ++i)\r
         {\r
             IconItemNode *listData = new IconItemNode();\r
-            listData->imagePath = imagePaths[i];\r
+            // 检查是否需要分配内存空间\r
+            if (listData->imagePath == nullptr)\r
+            {\r
+                listData->imagePath = new char[strlen(imagePaths[i]) + 1];\r
+            }\r
+            strcpy(listData->imagePath, imagePaths[i]);\r
             listData->txt = text[i];\r
             list1data_->PushBack(listData);\r
+\r
+            // 释放内存空间\r
+            // delete[] listData->imagePath;\r
+            // delete listData;\r
         }\r
 \r
         if (list1adapter_ == nullptr)\r
@@ -217,14 +220,14 @@ namespace OHOS
         scrollView1_->Add(button7_);\r
         scrollView1_->Add(button8_);\r
         // 初始化image\r
-        InitImageView(image1_, 360, 160, 100, 100, "image1", imagePath_iocn);\r
-        InitImageView(image2_, 360, 280, 100, 100, "image2", imagePath_iocn);\r
-        InitImageView(image3_, 360, 400, 100, 100, "image3", imagePath_iocn);\r
-        InitImageView(image4_, 360, 520, 100, 100, "image4", imagePath_iocn);\r
-        InitImageView(image5_, 360, 640, 100, 100, "image5", imagePath_iocn);\r
-        InitImageView(image6_, 360, 760, 100, 100, "image6", imagePath_iocn);\r
-        InitImageView(image7_, 360, 880, 100, 100, "image7", imagePath_iocn);\r
-        InitImageView(image8_, 360, 1000, 100, 100, "image8", imagePath_iocn);\r
+        InitImageView(image1_, 360, 160, 100, 100, "image1", ICON_IMAGE);\r
+        InitImageView(image2_, 360, 280, 100, 100, "image2", ICON_IMAGE);\r
+        InitImageView(image3_, 360, 400, 100, 100, "image3", ICON_IMAGE);\r
+        InitImageView(image4_, 360, 520, 100, 100, "image4", ICON_IMAGE);\r
+        InitImageView(image5_, 360, 640, 100, 100, "image5", ICON_IMAGE);\r
+        InitImageView(image6_, 360, 760, 100, 100, "image6", ICON_IMAGE);\r
+        InitImageView(image7_, 360, 880, 100, 100, "image7", ICON_IMAGE);\r
+        InitImageView(image8_, 360, 1000, 100, 100, "image8", ICON_IMAGE);\r
         scrollView1_->Add(image1_);\r
         scrollView1_->Add(image2_);\r
         scrollView1_->Add(image3_);\r
@@ -240,6 +243,7 @@ namespace OHOS
     /* DeInit：删除组件*/\r
     void TraingMoreView::DeInit()\r
     {\r
+        container_->RemoveAll();\r
         if (label1_ != nullptr)\r
         {\r
             delete label1_;\r
@@ -343,6 +347,7 @@ namespace OHOS
         }\r
         if (scrollView1_ != nullptr)\r
         {\r
+            scrollView1_->RemoveAll();\r
             delete scrollView1_;\r
             scrollView1_ = nullptr;\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
index 0ffafd0..8f853ce 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalView.cpp
@@ -6,6 +6,9 @@
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
+#include "traing/include/TraingModel.h"
+#include "traing/Training_UiConfig.h"
+
 namespace OHOS
 {
 
@@ -111,9 +114,7 @@ namespace OHOS
         // 初始化Button
         InitButton(button1_, 133, 133, 200, 200, BUTTONGO);
         // Set additional property
-        char *button1defaultImgSrc = "/user/res/Training/Go.bin";
-        char *button1triggeredImgSrc = nullptr;
-        button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc);
+        button1_->SetImageSrc(GO_1_IMAGE, nullptr);
 
         InitButton(button2_, 160, 370, 146, 35, BUTTONSET);
         button2_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff000000);//设置为透明按键

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp
index 5d5ff2a..c15f556 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetCaluliView.cpp
@@ -10,7 +10,8 @@
 #include <sstream>\r
 #include <string>\r
 #include <vector>\r
-\r
+#include "traing/include/TraingModel.h"\r
+#include "traing/Training_UiConfig.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -180,9 +181,7 @@ namespace OHOS
         //  初始化Button\r
         InitButton(button1_, 0, 366, 466, 100, BUTTONOK);\r
         // Set additional property\r
-        char *button1defaultImgSrc = "/user/res/Training/buttonok.bin";\r
-        char *button1triggeredImgSrc = nullptr;\r
-        button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc);\r
+        button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr);\r
         container_->Add(button1_);\r
     }\r
     /* DeInit：删除组件 */\r
@@ -226,7 +225,7 @@ namespace OHOS
     {\r
         if (!viewiInitStatus)\r
         {\r
-            //printf("init traingsetcaluliview\n");\r
+            // printf("init traingsetcaluliview\n");\r
             InitView();\r
             viewiInitStatus = true;\r
         }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp
index 634ea19..a979c31 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetDistView.cpp
@@ -10,6 +10,8 @@
 #include <sstream>
 #include <string>
 #include <vector>
+#include "traing/include/TraingModel.h"
+#include "traing/Training_UiConfig.h"
 
 namespace OHOS
 {
@@ -180,9 +182,8 @@ namespace OHOS
         //  初始化Button
         InitButton(button1_, 0, 366, 466, 100, BUTTONOK);
         // Set additional property
-        char *button1defaultImgSrc = "/user/res/Training/buttonok.bin";
-        char *button1triggeredImgSrc = nullptr;
-        button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc);
+
+        button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr);
         container_->Add(button1_);
     }
     /* DeInit：删除组件 */
@@ -226,7 +227,7 @@ namespace OHOS
     {
         if (!viewiInitStatus)
         {
-            //printf("init TraingSetDistview\n");
+            // printf("init TraingSetDistview\n");
             InitView();
             viewiInitStatus = true;
         }

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp
index 8bd73c1..5f5519e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetSeptView.cpp
@@ -10,7 +10,8 @@
 #include <sstream>
 #include <string>
 #include <vector>
-
+#include "traing/include/TraingModel.h"
+#include "traing/Training_UiConfig.h"
 namespace OHOS
 {
 
@@ -180,9 +181,7 @@ namespace OHOS
         //  初始化Button
         InitButton(button1_, 0, 366, 466, 100, BUTTONOK);
         // Set additional property
-        char *button1defaultImgSrc = "/user/res/Training/buttonok.bin";
-        char *button1triggeredImgSrc = nullptr;
-        button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc);
+        button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr);
         container_->Add(button1_);
     }
     /* DeInit：删除组件 */

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp
index e123b4e..158f556 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetTimeView.cpp
@@ -10,7 +10,8 @@
 #include <sstream>\r
 #include <string>\r
 #include <vector>\r
-\r
+#include "traing/include/TraingModel.h"\r
+#include "traing/Training_UiConfig.h"\r
 namespace OHOS\r
 {\r
 \r
@@ -180,9 +181,7 @@ namespace OHOS
         //  初始化Button\r
         InitButton(button1_, 0, 366, 466, 100, BUTTONOK);\r
         // Set additional property\r
-        char *button1defaultImgSrc = "/user/res/Training/buttonok.bin";\r
-        char *button1triggeredImgSrc = nullptr;\r
-        button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc);\r
+        button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr);\r
         container_->Add(button1_);\r
     }\r
     /* DeInit：删除组件 */\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
index 02a1114..5d01b3b 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetView.cpp
@@ -6,11 +6,11 @@
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r
 #include "components/ui_button.h"\r
+#include "traing/include/TraingModel.h"\r
+#include "traing/Training_UiConfig.h"\r
+\r
 namespace OHOS\r
 {\r
-    static const char *imagePath_iocn = "/user/res/Training/icon.bin";\r
-    static const char *imagePath_time = "/user/res/Training/time.bin";\r
-    static const char *imagePath_calories = "/user/res/Training/calories.bin";\r
 \r
     static TraingSetView *g_pTraingSetView{nullptr};\r
 \r
@@ -147,10 +147,10 @@ namespace OHOS
         container_->Add(label5_);\r
 \r
         // 初始化Image\r
-        InitImageView(image1_, 70, 150, 100, 100, "image1", imagePath_time);\r
-        InitImageView(image2_, 70, 270, 100, 100, "image2", imagePath_calories);\r
-        InitImageView(image3_, 380, 160, 100, 100, "image3", imagePath_iocn);\r
-        InitImageView(image4_, 380, 280, 100, 100, "image4", imagePath_iocn);\r
+        InitImageView(image1_, 70, 150, 100, 100, "image1", TIME_IMAGE);\r
+        InitImageView(image2_, 70, 270, 100, 100, "image2", CALORIES_IMAGE);\r
+        InitImageView(image3_, 380, 160, 100, 100, "image3", ICON_IMAGE);\r
+        InitImageView(image4_, 380, 280, 100, 100, "image4", ICON_IMAGE);\r
         container_->Add(image1_);\r
         container_->Add(image2_);\r
         container_->Add(image3_);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp
index e9b58b8..c805d9e 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingStrongView.cpp
@@ -6,12 +6,12 @@
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
+#include "traing/include/TraingModel.h"
+#include "traing/Training_UiConfig.h"
+
 namespace OHOS
 {
-    static const char *imagePath_blue = "/user/res/Training/bule.bin";
-    static const char *imagePath_yellow = "/user/res/Training/yellow.bin";
-    static const char *imagePath_orange = "/user/res/Training/orange.bin";
-    static const char *imagePath_green = "/user/res/Training/green.bin";
+
 
     static TraingStrongView *g_pTraingStrongView{nullptr};
 
@@ -163,10 +163,10 @@ namespace OHOS
         scrollView1_->Add(label6_);
 
         // 初始化Image
-        InitImageView(image1_, 510, 60, 100, 100, "image1", imagePath_blue);
-        InitImageView(image2_, 550, 60, 100, 100, "image2", imagePath_green);
-        InitImageView(image3_, 590, 60, 100, 100, "image3", imagePath_orange);
-        InitImageView(image4_, 630, 60, 100, 100, "image4", imagePath_yellow);
+        InitImageView(image1_, 510, 60, 100, 100, "image1", POINT_BLUE_IMAGE);
+        InitImageView(image2_, 550, 60, 100, 100, "image2", POINT_GREEN_IMAGE);
+        InitImageView(image3_, 590, 60, 100, 100, "image3", POINT_ORANGE_IMAGE);
+        InitImageView(image4_, 630, 60, 100, 100, "image4", POINT_YELLOW_IMAGE);
         scrollView1_->Add(image1_);
         scrollView1_->Add(image2_);
         scrollView1_->Add(image3_);

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp
index 6b16ccd..7023057 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingWinView.cpp
@@ -6,10 +6,12 @@
 #include "ui_resource_image.h"
 #include <ui_scroll_view.h>
 #include "components/ui_button.h"
+#include "traing/include/TraingModel.h"
+#include "traing/Training_UiConfig.h"
 
 namespace OHOS
 {
-    static const char *imagePath_win = "/user/res/Training/win.bin";
+
     static TraingWinView *g_pTraingWinView{nullptr};
     TraingWinView::TraingWinView()
     {
@@ -224,7 +226,7 @@ namespace OHOS
         */
 
         // 初始化图片数组
-        const char *basePath = "/user/res/Training/win/";
+        const char *basePath = "/user/res/Training/training_GIF/win/";
         const char *fileExtension = "bin";
         const char **imagePaths = CreateImagePathsArray(basePath, fileExtension, 94);
         InitImageAnimatorSource(imageAnimator, imagePaths, 94, 173, 100, 120, 120, "imageAnimator1", 10);
@@ -234,9 +236,8 @@ namespace OHOS
         // 初始化Button
         InitButton(button1_, 0, 366, 466, 100, BUTTONOK);
         // Set additional property
-        char *button1defaultImgSrc = "/user/res/Training/buttonok.bin";
-        char *button1triggeredImgSrc = nullptr;
-        button1_->SetImageSrc(button1defaultImgSrc, button1triggeredImgSrc);
+
+        button1_->SetImageSrc(BUTTONOK_IMAGE, nullptr);
         container_->Add(button1_);
     }