优化主界面训练卡片，需要更新资源

diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
index 9b87180..7d45191 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp
@@ -38,7 +38,7 @@ namespace OHOS
         {DROPDOWN_CLICK_SETTING, VIEW_SETTING}, // 设置
         //{DROPDOWN_CLICK_DNOTDISTURB, VIEW_FIND_PHONE}, // 勿扰
         {DROPDOWN_CLICK_SAVEELE, VIEW_SAVEELE}, // 省电模式
-        {DROPDOWN_CLICK_FINDMYPHONE,VIEW_FIND_PHONE},
+        {DROPDOWN_CLICK_FINDMYPHONE, VIEW_FIND_PHONE},
     };
 
     static MainPresenterSample *g_pMainPresenterSample = nullptr;
@@ -308,9 +308,9 @@ namespace OHOS
             dynamic_cast<MainClockView *>(view_->GetViewById(WATCH_FACE))->UpdateTime();
 #endif
         }
-        else if (view_->GetHorCurrentPage() == BloodOxygen)
+        else if (view_->GetHorCurrentPage() == BLOODOXGEN)
         {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView");
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodCardView");
         }
     }
 

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 c66c511..687f8a2 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainViewSample.cpp
@@ -29,7 +29,7 @@ namespace OHOS
     static const MainViewMapper PageMapper[] = {
         {WATCH_FACE, &MainViewSample::InitWatchFacePage},
         {HEART_RATE, &MainViewSample::InitHeartRatePage},
-        {BloodOxygen, &MainViewSample::InitBloodOxygenPage},
+        {BLOODOXGEN, &MainViewSample::InitBloodOxygenPage},
         {TRAINING, &MainViewSample::InitTrainingPage},
         {COMPASS, &MainViewSample::InitCompassPage},
         {WEATHER, &MainViewSample::InitWeatherPage},

diff --git a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp
index 914eb21..152a433 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/phone/src/PhoneDirView.cpp
@@ -457,7 +457,7 @@ namespace OHOS
         labelButton7_->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);\r
 \r
         // Set additional property\r
-        labelButton7_->SetText("小梦同学（客服热线）");\r
+        labelButton7_->SetText("KUMI同学（客服热线）");\r
         labelButton7_->SetTextColor(Color::GetColorFromRGBA(0xcc, 0xcc, 0xcc, 0xff));\r
         labelButton7_->SetAlign(TEXT_ALIGNMENT_RIGHT);\r
         labelButton7_->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 26);\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h b/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h
index 6d1190e..a37e746 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/screensetting/include/ScreenModels.h
@@ -20,7 +20,7 @@ namespace OHOS
         WATCH_FACE = 0,
         HEART_RATE,
         TRAINING,
-        BloodOxygen,
+        BLOODOXGEN,
         COMPASS,
         WEATHER,
         MUSIC_PLAYER,

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 ca983b7..a6104ce 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingView.cpp
@@ -24,23 +24,23 @@ namespace OHOS
     static constexpr uint16_t TITLE_LABEL_Y = 52;\r
 \r
     static constexpr uint16_t BTN1_LABEL_X = 65;\r
-    static constexpr uint16_t BTN1_LABEL_Y = 210;\r
+    static constexpr uint16_t BTN1_LABEL_Y = 205;\r
     static constexpr uint16_t BTN2_LABEL_X = 206;\r
-    static constexpr uint16_t BTN2_LABEL_Y = 210;\r
+    static constexpr uint16_t BTN2_LABEL_Y = 205;\r
     static constexpr uint16_t BTN3_LABEL_X = 65;\r
-    static constexpr uint16_t BTN3_LABEL_Y = 365;\r
+    static constexpr uint16_t BTN3_LABEL_Y = 355;\r
 \r
     // 图片设置\r
     static constexpr uint16_t BTN_IMAGE_SIZE = 100;\r
 \r
     static constexpr uint16_t BTN1_IMAGE_X = 126;\r
-    static constexpr uint16_t BTN1_IMAGE_Y = 143;\r
+    static constexpr uint16_t BTN1_IMAGE_Y = 148;\r
 \r
     static constexpr uint16_t BTN2_IMAGE_X = 276;\r
-    static constexpr uint16_t BTN2_IMAGE_Y = 143;\r
+    static constexpr uint16_t BTN2_IMAGE_Y = 148;\r
 \r
     static constexpr uint16_t BTN3_IMAGE_X = 129;\r
-    static constexpr uint16_t BTN3_IMAGE_Y = 293;\r
+    static constexpr uint16_t BTN3_IMAGE_Y = 298;\r
 \r
     static constexpr uint16_t BTNMORE_IMAGE_X = 276;\r
     static constexpr uint16_t BTNMORE_IMAGE_Y = 324;\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h
index cdd377c..74a89df 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/include/Training_CardView.h
@@ -54,7 +54,7 @@ namespace OHOS
         UILabelButtonExt *Button3 = nullptr;
         UILabelButtonExt *ButtonMore = nullptr;
 
-        UILabel *titleLabel = nullptr;
+        UILabelExt *titleLabel = nullptr;
         UIImageView *image1 = nullptr;
         UIImageView *image2 = nullptr;
         UIImageView *image3 = nullptr;

diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp
index 4856389..e9f0264 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/Training_CardView.cpp
@@ -3,7 +3,7 @@
 \r
 #include "common/image_cache_manager.h"\r
 #include "components/ui_label_ext.h"\r
-#include"language/font/ui_resource_string.h"\r
+#include "language/font/ui_resource_string.h"\r
 #include "UiConfig.h"\r
 #include "ui_resource_image.h"\r
 #include <ui_scroll_view.h>\r
@@ -12,16 +12,21 @@
 #include "common/image_cache_manager.h"\r
 #include "MainPresenterSample.h"\r
 #include "traing/training_card/include/Training_CardPresenter.h"\r
+#include "traing/include/TraingModel.h"\r
+#include "traing/Training_UiConfig.h"\r
+\r
 namespace OHOS\r
 {\r
-    static Training_CardView *g_pTraining_CardView{nullptr};\r
+        static Training_CardView *g_pTraining_CardView{nullptr};\r
+    static QuickTraining *data = new QuickTraining;\r
 \r
     Training_CardView::Training_CardView()\r
     {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::Training_CardView");\r
+WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::Training_CardView");\r
         SetPosition(0, 0, HORIZONTAL_RESOLUTION, VERTICAL_RESOLUTION);\r
         g_pTraining_CardView = this;\r
-    }\r
+        data = TraingModel::GetInstance()->GetQuickTraining();\r
+            }\r
 \r
     Training_CardView::~Training_CardView()\r
     {\r
@@ -29,34 +34,18 @@ namespace OHOS
         RemoveAll();\r
         DeInit();\r
         g_pTraining_CardView = nullptr;\r
+        delete data;\r
     }\r
 \r
     Training_CardView *Training_CardView::GetInstance()\r
     {\r
         return g_pTraining_CardView;\r
     }\r
-    bool Training_CardView::InitLable()\r
+bool Training_CardView::InitLable()\r
     {\r
-        // 检查标签指针是否为空\r
-        if (titleLabel == nullptr)\r
-        {\r
-            titleLabel = new UILabel();\r
-        }\r
-        // 设置标签的位置和大小\r
-        titleLabel->SetPosition(173, 52);\r
-        titleLabel->Resize(200, 60);\r
-        // 设置标签的视图 ID\r
-        titleLabel->SetViewId("titleLabel");\r
-        // 设置标签的样式\r
-        titleLabel->SetStyle(STYLE_TEXT_FONT, 30);\r
-        titleLabel->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
-        // 设置标签的文本和其他属性\r
-        titleLabel->SetText("快速训练");\r
-        titleLabel->SetLineBreakMode(UILabel::LINE_BREAK_ADAPT);\r
-        titleLabel->SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
-        titleLabel->SetRollSpeed(0);\r
+                //  初始化标签\r
+        TraingModel::GetInstance()->InitLabelExt(titleLabel, 130, 52, 200, 60, "title_label", STR_RAPID_TRAINING, DEFAULT_VECTOR_FONT_FILENAME, 30);\r
         Add(titleLabel);\r
-\r
         return true;\r
     }\r
     /* -------------------------------------------------------------------------- */\r
@@ -95,7 +84,7 @@ namespace OHOS
     {\r
         struct ButtonInfo\r
         {\r
-            std::string text;\r
+            UIResourceTextId textid;\r
             char *viewid;\r
             uint32_t defaultImgSrc;\r
             UILabelButtonExt *button;\r
@@ -104,10 +93,10 @@ namespace OHOS
         };\r
 \r
         ButtonInfo buttons[] = {\r
-            {"健走", BUTTON1, TRAINING_BUTTONGROUND2, Button1, 86, 118},\r
-            {"骑行", BUTTON2, TRAINING_BOUTTONGROUND, Button2, 236, 118},\r
-            {"跑步", BUTTON3, TRAINING_BOUTTONGROUND, Button3, 86, 268},\r
-            {"更多", BUTTONMORE, TRAINING_MORE, ButtonMore, 236, 268}};\r
+            {data->training1_Text, BUTTON1, TRAINING_BUTTONGROUND2, Button1, 86, 118},\r
+            {data->training2_Text, BUTTON2, TRAINING_BOUTTONGROUND, Button2, 236, 118},\r
+            {data->training3_Text, BUTTON3, TRAINING_BOUTTONGROUND, Button3, 86, 268},\r
+            {STR_MORE, BUTTONMORE, TRAINING_MORE, ButtonMore, 236, 268}};\r
 \r
         for (auto &buttonInfo : buttons)\r
         {\r
@@ -124,10 +113,10 @@ namespace OHOS
 \r
             buttonInfo.button->SetPosition(buttonInfo.posX, buttonInfo.posY);\r
             buttonInfo.button->Resize(140, 140);\r
-            //WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Id:[%s]", buttonInfo.viewid);\r
-            buttonInfo.button->SetText(buttonInfo.text.c_str());\r
+            // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Id:[%s]", buttonInfo.viewid);\r
+            buttonInfo.button->SetTextId(buttonInfo.textid);\r
             buttonInfo.button->SetLabelPosition(0, 70);\r
-            buttonInfo.button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 20);\r
+            buttonInfo.button->SetFont(DEFAULT_VECTOR_FONT_FILENAME, 25);\r
             buttonInfo.button->SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff19ff41, UIButton::PRESSED);\r
             buttonInfo.button->SetStyleForState(STYLE_BORDER_COLOR, 0xff0b1928, UIButton::PRESSED);\r
             buttonInfo.button->SetViewId(buttonInfo.viewid);\r
@@ -143,16 +132,16 @@ namespace OHOS
 \r
         return true;\r
     }\r
-\r
+    \r
     bool Training_CardView::InitImage()\r
     {\r
         struct ImageInfo\r
         {\r
             UIImageView *image;\r
-            const int imagePath;\r
+        const int imagePath;\r
             uint16_t posX;\r
             uint16_t posY;\r
-            const char *viewId;\r
+        const char *viewId;\r
         };\r
 \r
         ImageInfo images[] = {\r
@@ -179,7 +168,7 @@ namespace OHOS
 \r
         return true;\r
     }\r
-    /* -------------------------------------------------------------------------- */\r
+/* -------------------------------------------------------------------------- */\r
     bool Training_CardView::InitView()\r
     {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Training_CardView::InitView()");\r
@@ -198,30 +187,30 @@ namespace OHOS
         // SetCoverable(true);\r
         return true;\r
     }\r
-\r
+        \r
     void Training_CardView::DeInit()\r
-    {\r
-        UIImageView *imageViews[] = {image1, image2, image3};\r
+        {\r
+            UIImageView *imageViews[] = {image1, image2, image3};\r
         UIButton *buttons[] = {ButtonMore, Button1, Button3, Button2};\r
 \r
         for (auto &imageView : imageViews)\r
         {\r
             if (imageView != nullptr)\r
-            {\r
-                delete imageView;\r
+        {\r
+            delete imageView;\r
                 imageView = nullptr;\r
-            }\r
+        }\r
         }\r
 \r
         for (auto &button : buttons)\r
         {\r
             if (button != nullptr)\r
-            {\r
-                delete button;\r
+        {\r
+            delete button;\r
                 button = nullptr;\r
-            }\r
+}\r
         }\r
-\r
+        \r
         if (titleLabel != nullptr)\r
         {\r
             delete titleLabel;\r
@@ -236,7 +225,7 @@ namespace OHOS
             InitView();\r
             viewiInitStatus = true;\r
         }\r
-        // if (!resLoadStatus)\r
+    // if (!resLoadStatus)\r
         // {\r
         //     resLoadStatus = true;\r
         // }\r
@@ -244,7 +233,7 @@ namespace OHOS
 \r
     void Training_CardView::UnLoad(void)\r
     {\r
-        // if (resLoadStatus)\r
+// if (resLoadStatus)\r
         // {\r
         //     //ImageCacheManager::GetInstance().UnloadAllInMultiRes(TRAINING_IAMGES);\r
         //     resLoadStatus = false;\r

diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Training.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Training.bin
index d7b3459..3fe1da2 100644 (file)
Binary files a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Training.bin and b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/maincard/Training.bin differ