From abdfef04251524370b4333a6cce8f91ad04f6006 Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Fri, 30 Aug 2024 14:19:47 +0800
Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=E9=97=B9=E9=92=9F=E7=95=8C?=
 =?utf8?q?=E9=9D=A2=E5=8F=B3=E6=BB=91=E5=AE=B9=E6=98=93=E9=80=80=E5=87=BA?=
 =?utf8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../nativeui/alarm/include/AlarmPresenter.h   |  2 ++
 .../nativeui/alarm/src/AlarmPresenter.cpp     | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h
index b572a51f6..508c38108 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/include/AlarmPresenter.h
@@ -142,6 +142,7 @@ public:
     bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件
     bool OnClick(UIView &view, const ClickEvent &event) override;
     bool OnDrag(UIView& view, const DragEvent& event) override;
+    bool OnDragEnd(UIView& view, const DragEvent& event) override;
     void OnSwipe(UISwipeView &view) override;
     bool ClickFuncId(const char *buttonName);
     bool ClickFuncView(UIView &view);
@@ -169,6 +170,7 @@ private:
     uint16_t clockQty{0};
     int16_t interListener;
     bool buttonStratus = true;
+    bool X_DRAG_FLAG{false};
 };
 }
 #endif
\ No newline at end of file
diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp
index 4b1a6a65a..4feaa3507 100644
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp
@@ -360,8 +360,33 @@ bool AlarmPresenter::OnDrag(UIView &view, const DragEvent &event)
         deltaX = event.GetDeltaX();
         deltaY = event.GetDeltaY();
         if (MATH_ABS(deltaX) >= MATH_ABS(deltaY) && MATH_ABS(deltaX) > SLIDING_LENGTH) {
+            // MainAlarmView::GetInstance()->DropView(view);
+            X_DRAG_FLAG = true;
+        }
+    }
+    return true;
+}
+
+bool AlarmPresenter::OnDragEnd(UIView& view, const DragEvent& event)
+{
+    if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && X_DRAG_FLAG) 
+    {
+        if(view.GetViewType() == UIViewType::UI_SWIPE_VIEW)
+        {
+            view.SetIntercept(false);
+        }
+        else
+        {
             MainAlarmView::GetInstance()->DropView(view);
         }
+        X_DRAG_FLAG = false;
+    }
+    else if(event.GetDragDirection() == DragEvent::DIRECTION_RIGHT_TO_LEFT)
+    {
+        if(view.GetViewType() == UIViewType::UI_SWIPE_VIEW)
+        {
+            view.SetIntercept(true);
+        }
     }
     return true;
 }
-- 
2.17.1