● 修改卡片管理样式与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 7da737c..222aa01 100644 (file)
--- 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 ab0f02f..8a51d62 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
@@ -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_);
     }