Merge #828 into sdk602patch0626 from refs/changes/828/head

更新闹钟界面退出功能

* refs/changes/828/head: (1 commits squashed)

  - 更新闹钟界面退出功能

Signed-off-by: dingtalk_kaxuzp <2393524978@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/828

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 f112e54..4b1a6a6 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmPresenter.cpp
@@ -483,9 +483,9 @@ bool AlarmStatusBtnChangeListener::OnChange(UICheckBox::UICheckBoxState state)
 \r
 void AlarmPresenter::OnSwipe(UISwipeView &view)\r
 {\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnSwipe ");\r
     UNUSED(view);\r
-\r
-    return;\r
+    \r
+    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmPresenter::OnSwipe ");\r
+    view.SetIntercept((0 == view.GetCurrentPage()) ? false : true);\r
 }\r
 }
\ No newline at end of file

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 fafef37..6a873dc 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp
@@ -80,21 +80,6 @@ MainAlarmView::~MainAlarmView()
     judgeView = nullptr;
     delete newTimeView;
     newTimeView = nullptr;
-    // for (int alarmNum = SET_ZERO; alarmNum <= SET_FIVE; alarmNum++) {
-    //     if (dClock[alarmNum] != nullptr) {
-    //         delete dClock[alarmNum];
-    //         dClock[alarmNum] = nullptr;
-    //     }
-    //     if (statusButton[alarmNum] != nullptr) {
-    //         delete statusButton[alarmNum];
-    //         statusButton[alarmNum] = nullptr;
-    //     }
-    //     if (dLabel[alarmNum] != nullptr) {
-    //         delete dLabel[alarmNum];
-    //         dLabel[alarmNum] = nullptr;
-    //     }
-    //     container[alarmNum] = nullptr;
-    // }
 
     if(nullptr != TitleLabelExt_)
     {
@@ -162,25 +147,6 @@ MainAlarmView *MainAlarmView::GetInstance(void)
     return g_MainAlarmView;
 }
 
-// void MainAlarmView::CreateImage(void)
-// {
-    // UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::AlarmPresenter::GetInstance();
-
-    // addButton = new UIImageView();
-    // if (addButton == nullptr) {
-    //     WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "MainAlarmView:: new addButton fail");
-    //     return;
-    // }
-    // addButton->SetPosition(ADD_BUTTON_X, ADD_BUTTON_Y);
-    // addButton->SetWidth(ADD_BUTTON_W);
-    // addButton->SetHeight(ADD_BUTTON_H);
-    // addButton->SetSrc(ALARM_ADD_BUTTON_PATH);
-    // addButton->SetViewId(ADD_BUTTON);
-    // addButton->SetTouchable(true);
-    // addButton->SetOnClickListener(clickListener);
-    // group->Add(addButton);
-// }
-
 void MainAlarmView::AlarmTitleCreate(void)
 {
     if(nullptr == TitleLabelExt_)
@@ -340,7 +306,6 @@ void MainAlarmView::NewClockCtl(int16_t alarmNum)
     // SwipeView_[alarmNum]->SetViewId(ITEM_SWIPE[alarmNum]);
     SwipeView_[alarmNum]->SetTouchable(true);
     SwipeView_[alarmNum]->SetThrowDrag(true);
-    // SwipeView_[alarmNum]->SetOnDragListener(presenter_);
     SwipeView_[alarmNum]->SetOnSwipeListener(presenter_);
     SwipeView_[alarmNum]->SetStyle(STYLE_BACKGROUND_COLOR, 0xff191919);
     SwipeView_[alarmNum]->SetStyle(STYLE_BACKGROUND_OPA, OPA_OPAQUE);
@@ -524,19 +489,8 @@ void MainAlarmView::RefreshAlarm(void)
         dClock[i]->SetTime24Hour(refreshHour, refreshMin, 0);
     }
     // group->ScrollBy(0, ADD_BUTTON_Y - addButton->GetY());
-    if (dClockNum > (i - 1)) {
-        // group->Remove(dClock[dClockNum]);
-        // delete dClock[dClockNum];
-        // dClock[dClockNum] = nullptr;
-
-        // group->Remove(statusButton[dClockNum]);
-        // delete statusButton[dClockNum];
-        // statusButton[dClockNum] = nullptr;
-
-        // group->Remove(dLabel[dClockNum]);
-        // delete dLabel[dClockNum];
-        // dLabel[dClockNum] = nullptr;
-
+    if (dClockNum > (i - 1))
+    {
         group->Remove(SwipeView_[dClockNum]);
 
         // 0