From 4bbed98e07aabb472f31ab766b248c43c4eef59b Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Fri, 2 Aug 2024 19:31:27 +0800 Subject: [PATCH] =?utf8?q?applist=20=E6=A0=B7=E5=BC=8F=E5=A6=82=E6=9E=9C?= =?utf8?q?=E4=B8=BAlist=20=EF=BC=8C=E5=8F=B3=E6=BB=91=E5=9B=9E=E5=88=B0?= =?utf8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=B0=86=E6=B8=85=E7=A9=BA=E5=90=8E?= =?utf8?q?=E9=80=80=E6=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp | 1 + .../wearable/fd230app/nativeui/applist/include/ApplistView.h | 1 + 2 files changed, 2 insertions(+) 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 bfbf8aff9..bf60a22c4 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/MainAlarmView.cpp @@ -488,6 +488,7 @@ void MainAlarmView::DropView(UIView& view) uint16_t preSlice = AlarmClockModel::GetInstance()->JudgePreSlice(); WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "MainAlarmView::DropView::container[MAIN_INTERFACE]"); NativeAbility::GetInstance().ChangeSlice(preSlice); + NativeAbility::GetInstance().Back(); } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h index b5a238853..fcfe2b99c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h +++ b/code/sdk/application/wearable/fd230app/nativeui/applist/include/ApplistView.h @@ -47,6 +47,7 @@ public: if ((event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) && (event.GetDeltaX() > X_DRAG_OFFSET) && (event.GetDeltaX() > (DOUBLES * MATH_ABS(event.GetDeltaY())))) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Applist Ondrag!!"); + NativeAbility::GetInstance().ClearSliceIdStack();/*凡是回到主界面都要清空栈*/ NativeAbility::GetInstance().ChangeSlice(VIEW_MAIN, TransitionType::TRANSITION_ZOOM); } -- 2.17.1