#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 49d0ba9..ddc18fe 100644 (file)
--- 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"\r
 #include "components/ui_cross_view.h"\r
 #include "components/ui_canvas_ext.h"\r
-\r
+#include "ui_resource_string.h"\r
+#include "components/ui_label_ext.h"\r
 namespace OHOS\r
 {\r
     typedef struct\r
@@ -32,6 +33,7 @@ namespace OHOS
         CardId id;\r
         bool addFlag;\r
         const char *cardImg;\r
+        UIResourceTextId cardid;\r
     } AddCardInfo;\r
 \r
     class AddCardItem : public UIViewGroup\r
@@ -46,7 +48,7 @@ namespace OHOS
     private:\r
         void SetUpChild();\r
         UIImageView cardImg_;\r
-        UILabelButton cardLabel_;\r
+        UILabelExt cardLabel_;\r
         UIButton button_;\r
         AddCardInfo cardInfo_;\r
         UICanvasExt canvas_;\r

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 575a9c1..6e68bca 100644 (file)
--- 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_);\r
         Add(&cardImg_);\r
         Add(&button_);\r
+        Add(&cardLabel_);\r
     }\r
 \r
     AddCardItem::~AddCardItem()\r
@@ -29,11 +30,12 @@ namespace OHOS
         Remove(&canvas_);\r
         Remove(&cardImg_);\r
         Remove(&button_);\r
+        Remove(&cardLabel_);\r
     }\r
 \r
     void AddCardItem::SetUpChild()\r
     {\r
-        cardImg_.SetPosition(93, 83);\r
+        cardImg_.SetPosition(93, 93);\r
         cardImg_.Resize(280, 280);\r
         cardImg_.SetResizeMode(UIImageView::FILL);\r
         cardImg_.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);\r
@@ -47,7 +49,15 @@ namespace OHOS
         button_.SetStyleForState(STYLE_BORDER_OPA, 0x00, UIButton::PRESSED);\r
         button_.SetStyleForState(STYLE_BORDER_RADIUS, 100, UIButton::PRESSED);\r
 \r
-        canvas_.SetPosition(73, 65);\r
+        cardLabel_.SetPosition(83, 40);\r
+        cardLabel_.Resize(300, 35);\r
+        cardLabel_.SetViewId("cardLabel_");\r
+        cardLabel_.SetLineBreakMode(UILabel::LINE_BREAK_ELLIPSIS);\r
+        cardLabel_.SetAlign(TEXT_ALIGNMENT_CENTER, TEXT_ALIGNMENT_CENTER);\r
+        cardLabel_.SetStyle(STYLE_TEXT_FONT, 30);\r
+        cardLabel_.SetFont(DEFAULT_VECTOR_FONT_FILENAME, 30);\r
+\r
+        canvas_.SetPosition(73, 73);\r
         canvas_.Resize(320, 320);\r
         canvas_.SetStyle(STYLE_BACKGROUND_COLOR, Color::Black().full);\r
         canvas_.SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);\r
@@ -67,6 +77,7 @@ namespace OHOS
     {\r
         cardInfo_ = cardInfo;\r
         cardImg_.SetSrc(cardInfo.cardImg);\r
+        cardLabel_.SetTextId(cardInfo.cardid);\r
         if (cardInfo.addFlag)\r
         {\r
             button_.SetImageSrc(BUTTON_OK_IMGAE, BUTTON_OK_IMGAE);\r

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 6dfd26b..2cc743c 100644 (file)
--- 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 2686cae..c2aee62 100644 (file)
--- 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 @@
 \r
 #include <string>\r
 #include "UiConfig.h"\r
+#include "ui_resource_string.h"\r
 \r
 namespace OHOS\r
 {\r
@@ -18,6 +19,7 @@ namespace OHOS
         CardId id;\r
         const char *cardImg;\r
         bool isVisible;\r
+        UIResourceTextId cardid;\r
     };\r
     struct CardInfoSet\r
     {\r

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 093ac62..5399da8 100644 (file)
--- 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
     /*默认卡片：心率，睡眠，快速训练*/\r
     // 更新主界面卡片需要更新Map\r
     const CardInfo cardInfoMap[] = {\r
-        {HEART_RATE, PNG_SET_CARD_HEART, true},\r
-        {TRAINING, PNG_SET_CARD_TRAIN, true},\r
-        {COMPASS, PNG_SET_CARD_COMPASS, false},\r
-        {SLEEP, PNG_SET_CARD_SLEEP, true},\r
-        {BLOODOXGEN, PNG_SET_CARD_BLOOD, false},\r
-        {GOAL, PNG_SET_CARD_ACTIVITY, false},\r
-        {WEATHER, PNG_SET_CARD_WEATHER, false},\r
-        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, false},\r
+        {HEART_RATE, PNG_SET_CARD_HEART, true,STR_HEART_RATE},\r
+        {TRAINING, PNG_SET_CARD_TRAIN, true,STR_TRAINING},\r
+        {COMPASS, PNG_SET_CARD_COMPASS, false,STR_COMPASS},\r
+        {SLEEP, PNG_SET_CARD_SLEEP, true,STR_SLEEP},\r
+        {BLOODOXGEN, PNG_SET_CARD_BLOOD, false,STR_BLOOD_OXYGEN},\r
+        {GOAL, PNG_SET_CARD_ACTIVITY, false,STR_ACTIVITY},\r
+        {WEATHER, PNG_SET_CARD_WEATHER, false,STR_WEATHER},\r
+        {MUSIC_PLAYER, PNG_SET_CARD_PLAYER, false,STR_MUSIC},\r
     };\r
     /*维护卡片*/\r
     CardInfoSet cardInfoSet[] = {\r