From: Caisking <3449750381@qq.com>
Date: Thu, 15 Aug 2024 10:04:50 +0000 (+0800)
Subject: ● 修改卡片管理样式与figma保持一致纵向
X-Git-Tag: release_V1.2.70_20241020_135402~663
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7809c7531a8723b2a63b0f67650b8584cc0a35f3;p=mirrors%2FFD230.git

● 修改卡片管理样式与figma保持一致纵向
● 增加卡片管理表冠控制
● 增加卡片管理滑动条效果
---

diff --git a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp
index 7da737cc0..222aa0107 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/add_card/src/AddCardPresenter.cpp
@@ -51,8 +51,9 @@ namespace OHOS
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardPresenter::OnDrag");
         UNUSED(view);
-        /*从下自上 回退*/
-        if ((event.GetDragDirection() == DragEvent::DIRECTION_BOTTOM_TO_TOP))
+        /*回退*/
+        if ((event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) && (event.GetDeltaX() > X_DRAG_OFFSET) &&
+            (event.GetDeltaX() > (DOUBLES * MATH_ABS(event.GetDeltaY()))))
         {
             // 回退
             NativeAbility::GetInstance().Back();
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 ab0f02ff3..8a51d6211 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
@@ -11,7 +11,7 @@
 
 namespace OHOS
 {
-    AddCardView::AddCardView() : contentList_(UIList::HORIZONTAL)
+    AddCardView::AddCardView()
     {
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AddCardView::AddCardView");
     }
@@ -112,7 +112,12 @@ namespace OHOS
         contentList_.SetMaxScrollDistance(1000);
         contentList_.SetLoopState(true);
         contentList_.SetAdapter(addCardAdapter_);
+
         contentList_.SetVisible(true);
+        contentList_.SetRotateFactor(1.0);
+        contentList_.RequestFocus();
+        contentList_.SetYScrollBarVisible(true); // 设置滑动滚动条
+
         container_->Add(&contentList_);
     }