闹钟退出逻辑改为OnDragEnd

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 4feaa35..3d4047f 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp
@@ -371,23 +371,9 @@ bool AlarmPresenter::OnDragEnd(UIView& view, const DragEvent& event)
 {\r
     if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT && X_DRAG_FLAG) \r
     {\r
-        if(view.GetViewType() == UIViewType::UI_SWIPE_VIEW)\r
-        {\r
-            view.SetIntercept(false);\r
-        }\r
-        else\r
-        {\r
-            MainAlarmView::GetInstance()->DropView(view);\r
-        }\r
+        MainAlarmView::GetInstance()->DropView(view);\r
         X_DRAG_FLAG = false;\r
     }\r
-    else if(event.GetDragDirection() == DragEvent::DIRECTION_RIGHT_TO_LEFT)\r
-    {\r
-        if(view.GetViewType() == UIViewType::UI_SWIPE_VIEW)\r
-        {\r
-            view.SetIntercept(true);\r
-        }\r
-    }\r
     return true;\r
 }\r
 \r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
index 023a817..f2611d0 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
@@ -305,9 +305,10 @@ void MainAlarmView::NewClockCtl(int16_t alarmNum)
     }
     // SwipeView_[alarmNum]->SetViewId(ITEM_SWIPE[alarmNum]);
     SwipeView_[alarmNum]->SetTouchable(true);
-    SwipeView_[alarmNum]->SetThrowDrag(true);
-    // SwipeView_[alarmNum]->SetOnSwipeListener(presenter_);
-    SwipeView_[alarmNum]->SetOnDragListener(presenter_);
+    // SwipeView_[alarmNum]->SetThrowDrag(true);
+    SwipeView_[alarmNum]->SetOnSwipeListener(presenter_);
+    SwipeView_[alarmNum]->SetAnimatorTime(50);           // 200:animator drag time(ms)
+    // SwipeView_[alarmNum]->SetOnDragListener(presenter_);
     SwipeView_[alarmNum]->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);
     SwipeView_[alarmNum]->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);
     SwipeView_[alarmNum]->SetStyle(STYLE_BORDER_RADIUS, 100);