修改卡片管理UI与figma保持一致

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 43022a4..49d0ba9 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
@@ -47,7 +47,7 @@ namespace OHOS
         void SetUpChild();\r
         UIImageView cardImg_;\r
         UILabelButton cardLabel_;\r
-        UIToggleButton cardToggleButton_;\r
+        UIButton button_;\r
         AddCardInfo cardInfo_;\r
         UICanvasExt canvas_;\r
     };\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 5aaa4d9..575a9c1 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
@@ -1,20 +1,17 @@
-/*** \r
- * @Date: 2024-04-15 10:55:58\r
- * @LastEditors: Caisking 3449750381@qq.com\r
- * @LastEditTime: 2024-07-15 14:10:35\r
- * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp\r
- */\r
 /***\r
  * @Date: 2024-04-15 10:55:58\r
  * @LastEditors: Caisking 3449750381@qq.com\r
- * @LastEditTime: 2024-06-28 16:53:33\r
+ * @LastEditTime: 2024-08-29 10:25:30\r
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardItem.cpp\r
  */\r
+\r
 #include "AddCardItem.h"\r
 #include "AddCardPresenter.h"\r
 #include "wearable_log.h"\r
 #include "components/ui_canvas_ext.h"\r
 \r
+static constexpr const char *BUTTON_OK_IMGAE = "/user/res/add_card/button_ok.bin";\r
+static constexpr const char *BUTTON_NO_IMGAE = "/user/res/add_card/button_no.bin";\r
 namespace OHOS\r
 {\r
     AddCardItem::AddCardItem()\r
@@ -24,14 +21,14 @@ namespace OHOS
         SetUpChild();\r
         Add(&canvas_);\r
         Add(&cardImg_);\r
-        Add(&cardToggleButton_);\r
+        Add(&button_);\r
     }\r
 \r
     AddCardItem::~AddCardItem()\r
     {\r
         Remove(&canvas_);\r
         Remove(&cardImg_);\r
-        Remove(&cardToggleButton_);\r
+        Remove(&button_);\r
     }\r
 \r
     void AddCardItem::SetUpChild()\r
@@ -41,10 +38,14 @@ namespace OHOS
         cardImg_.SetResizeMode(UIImageView::FILL);\r
         cardImg_.SetStyle(STYLE_IMAGE_OPA, OPA_OPAQUE);\r
 \r
-        cardToggleButton_.SetPosition(153, 296);\r
-        cardToggleButton_.Resize(160, 160);\r
-        cardToggleButton_.SetViewId("toggleButton");\r
-        cardToggleButton_.SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
+        button_.SetPosition(143, 334);\r
+        button_.Resize(180, 70);\r
+        button_.SetViewId("toggleButton");\r
+        button_.SetStyle(STYLE_BACKGROUND_OPA, 0x00);\r
+        button_.SetStyleForState(STYLE_BACKGROUND_COLOR, 0xff000000, UIButton::PRESSED);\r
+        button_.SetStyleForState(STYLE_BACKGROUND_OPA, 0x00, UIButton::PRESSED);\r
+        button_.SetStyleForState(STYLE_BORDER_OPA, 0x00, UIButton::PRESSED);\r
+        button_.SetStyleForState(STYLE_BORDER_RADIUS, 100, UIButton::PRESSED);\r
 \r
         canvas_.SetPosition(73, 65);\r
         canvas_.Resize(320, 320);\r
@@ -57,7 +58,7 @@ namespace OHOS
         paint.SetStrokeColor(Color::Cyan());\r
         paint.SetAntialiased(true);\r
         RadialGradient radial = {158, 158, 150, 150, 152};\r
-        ColorStop stops[3] = {{0, Color::White().full}, {0.8, Color::White().full}, {1, 0x00ffffff}};\r
+        ColorStop stops[3] = {{0, Color::Green().full}, {0.8, Color::White().full}, {1, 0x00ffffff}};\r
         paint.SetRadialGradient(radial, stops, 3); // 3: count\r
         canvas_.DrawCircle(center, 140, paint);\r
     }\r
@@ -66,21 +67,34 @@ namespace OHOS
     {\r
         cardInfo_ = cardInfo;\r
         cardImg_.SetSrc(cardInfo.cardImg);\r
-\r
-        cardToggleButton_.SetState(cardInfo.addFlag);\r
+        if (cardInfo.addFlag)\r
+        {\r
+            button_.SetImageSrc(BUTTON_OK_IMGAE, BUTTON_OK_IMGAE);\r
+        }\r
+        else\r
+        {\r
+            button_.SetImageSrc(BUTTON_NO_IMGAE, BUTTON_NO_IMGAE);\r
+        }\r
     }\r
 \r
     void AddCardItem::UpdateItemInfo(bool addFlag)\r
     {\r
         cardInfo_.addFlag = addFlag;\r
-        cardToggleButton_.SetState(cardInfo_.addFlag);\r
+        if (addFlag)\r
+        {\r
+            button_.SetImageSrc(BUTTON_OK_IMGAE, BUTTON_OK_IMGAE);\r
+        }\r
+        else\r
+        {\r
+            button_.SetImageSrc(BUTTON_NO_IMGAE, BUTTON_NO_IMGAE);\r
+        }\r
         Invalidate();\r
     }\r
 \r
     void AddCardItem::SetOnClickListener(OnClickListener *onClickListener)\r
     {\r
         // cardLabel_.SetOnClickListener(onClickListener);\r
-        cardToggleButton_.SetOnClickListener(onClickListener);\r
+        button_.SetOnClickListener(onClickListener);\r
     }\r
 \r
 };\r