From: Caisking <3449750381@qq.com>
Date: Thu, 29 Aug 2024 03:01:20 +0000 (+0800)
Subject: 修改卡片管理UI与figma保持一致
X-Git-Tag: release_V1.2.70_20241020_135402~569
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=0226242ea551a4fe2a4b0bb8e23a722bc88f546d;p=mirrors%2FFD230.git

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