From: Caisking <3449750381@qq.com>
Date: Sun, 17 Nov 2024 09:12:09 +0000 (+0800)
Subject: #1172 手表，卡片管理增加卡片名称
X-Git-Tag: fd230_release_V1.3.102~66
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=8d8edf5063c42d8179c7d263a1dd0dae7375391d;p=mirrors%2FFD230.git

#1172 手表，卡片管理增加卡片名称
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardItem.h b/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardItem.h
index 49d0ba931..ddc18fe6c 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardItem.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/add_card/include/AddCardItem.h
@@ -24,7 +24,8 @@
 #include "UiConfig.h"
 #include "components/ui_cross_view.h"
 #include "components/ui_canvas_ext.h"
-
+#include "ui_resource_string.h"
+#include "components/ui_label_ext.h"
 namespace OHOS
 {
     typedef struct
@@ -32,6 +33,7 @@ namespace OHOS
         CardId id;
         bool addFlag;
         const char *cardImg;
+        UIResourceTextId cardid;
     } AddCardInfo;
 
     class AddCardItem : public UIViewGroup
@@ -46,7 +48,7 @@ namespace OHOS
     private:
         void SetUpChild();
         UIImageView cardImg_;
-        UILabelButton cardLabel_;
+        UILabelExt cardLabel_;
         UIButton button_;
         AddCardInfo cardInfo_;
         UICanvasExt canvas_;
diff --git a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp
index 575a9c1dc..6e68bcab9 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp
@@ -22,6 +22,7 @@ namespace OHOS
         Add(&canvas_);
         Add(&cardImg_);
         Add(&button_);
+        Add(&cardLabel_);
     }
 
     AddCardItem::~AddCardItem()
@@ -29,11 +30,12 @@ namespace OHOS
         Remove(&canvas_);
         Remove(&cardImg_);
         Remove(&button_);
+        Remove(&cardLabel_);
     }
 
     void AddCardItem::SetUpChild()
     {
-        cardImg_.SetPosition(93, 83);
+        cardImg_.SetPosition(93, 93);
         cardImg_.Resize(280, 280);
         cardImg_.SetResizeMode(UIImageView::FILL);
         cardImg_.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);
@@ -47,7 +49,15 @@ namespace OHOS
         button_.SetStyleForState(STYLE_BORDER_OPA, 0x00, UIButton::PRESSED);
         button_.SetStyleForState(STYLE_BORDER_RADIUS, 100, UIButton::PRESSED);
 
-        canvas_.SetPosition(73, 65);
+        cardLabel_.SetPosition(83, 40);
+        cardLabel_.Resize(300, 35);
+        cardLabel_.SetViewId("cardLabel_");
+        cardLabel_.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);
+        cardLabel_.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);
+        cardLabel_.SetStyle(STYLE_TEXT_FONT, 30);
+        cardLabel_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);
+
+        canvas_.SetPosition(73, 73);
         canvas_.Resize(320, 320);
         canvas_.SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);
         canvas_.SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);
@@ -67,6 +77,7 @@ namespace OHOS
     {
         cardInfo_ = cardInfo;
         cardImg_.SetSrc(cardInfo.cardImg);
+        cardLabel_.SetTextId(cardInfo.cardid);
         if (cardInfo.addFlag)
         {
             button_.SetImageSrc(BUTTON_OK_IMGAE, BUTTON_OK_IMGAE);
diff --git a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardView.cpp
index 6dfd26b45..2cc743c51 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardView.cpp
@@ -81,6 +81,7 @@ namespace OHOS
                 AddCardInfo addInfo;
                 addInfo.id = info->id;
                 addInfo.cardImg = info->cardImg;
+                addInfo.cardid = info->cardid;
                 addInfo.addFlag = false;
                 for (uint8_t j = 0; j < cardCount; j++)
                 {
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h
index 2686cae94..c2aee624f 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/include/MainModel.h
@@ -10,6 +10,7 @@
 
 #include <string>
 #include "UiConfig.h"
+#include "ui_resource_string.h"
 
 namespace OHOS
 {
@@ -18,6 +19,7 @@ namespace OHOS
         CardId id;
         const char *cardImg;
         bool isVisible;
+        UIResourceTextId cardid;
     };
     struct CardInfoSet
     {
diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
index 093ac6221..5399da870 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/MainModel.cpp
@@ -29,14 +29,14 @@ namespace OHOS
     /*默认卡片：心率，睡眠，快速训练*/
     // 更新主界面卡片需要更新Map
     const CardInfo cardInfoMap[] = {
-        {HEART_RATE, PNG_SET_CARD_HEART, true},
-        {TRAINING, PNG_SET_CARD_TRAIN, true},
-        {COMPASS, PNG_SET_CARD_COMPASS, false},
-        {SLEEP, PNG_SET_CARD_SLEEP, true},
-        {BLOODOXGEN, PNG_SET_CARD_BLOOD, false},
-        {GOAL, PNG_SET_CARD_ACTIVITY, false},
-        {WEATHER, PNG_SET_CARD_WEATHER, false},
-        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, false},
+        {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE},
+        {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING},
+        {COMPASS, PNG_SET_CARD_COMPASS, false,STR_COMPASS},
+        {SLEEP, PNG_SET_CARD_SLEEP, true,STR_SLEEP},
+        {BLOODOXGEN, PNG_SET_CARD_BLOOD, false,STR_BLOOD_OXYGEN},
+        {GOAL, PNG_SET_CARD_ACTIVITY, false,STR_ACTIVITY},
+        {WEATHER, PNG_SET_CARD_WEATHER, false,STR_WEATHER},
+        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, false,STR_MUSIC},
     };
     /*维护卡片*/
     CardInfoSet cardInfoSet[] = {