From 7809c7531a8723b2a63b0f67650b8584cc0a35f3 Mon Sep 17 00:00:00 2001
From: Caisking <3449750381@qq.com>
Date: Thu, 15 Aug 2024 18:04:50 +0800
Subject: [PATCH] =?utf8?q?=E2=97=8F=20=E4=BF=AE=E6=94=B9=E5=8D=A1=E7=89=87?=
 =?utf8?q?=E7=AE=A1=E7=90=86=E6=A0=B7=E5=BC=8F=E4=B8=8Efigma=E4=BF=9D?=
 =?utf8?q?=E6=8C=81=E4=B8=80=E8=87=B4=E7=BA=B5=E5=90=91=20=E2=97=8F=20?=
 =?utf8?q?=E5=A2=9E=E5=8A=A0=E5=8D=A1=E7=89=87=E7=AE=A1=E7=90=86=E8=A1=A8?=
 =?utf8?q?=E5=86=A0=E6=8E=A7=E5=88=B6=20=E2=97=8F=20=E5=A2=9E=E5=8A=A0?=
 =?utf8?q?=E5=8D=A1=E7=89=87=E7=AE=A1=E7=90=86=E6=BB=91=E5=8A=A8=E6=9D=A1?=
 =?utf8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../fd230app/nativeui/add_card/src/AddCardPresenter.cpp    | 5 +++--
 .../fd230app/nativeui/add_card/src/AddCardView.cpp         | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

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_);
     }
 
-- 
2.17.1