From c9cc2f22b26eee7d68056d3eebfbf299a80375ed Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Fri, 16 Jan 2026 11:27:31 +0800 Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=E7=9D=A1=E7=9C=A0slice?= =?utf8?q?=E6=81=AF=E5=B1=8F=E6=8C=89=E9=94=AE=E5=A4=B1=E6=95=88=E9=97=AE?= =?utf8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/calculator/src/CalculatorPresenter.cpp | 4 ++-- .../nativeui/sleep/include/SleepControlPresenter.h | 2 -- .../nativeui/sleep/src/SleepControlPresenter.cpp | 13 +------------ .../nativeui/sleep/src/SleepControlView.cpp | 3 --- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/calculator/src/CalculatorPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/calculator/src/CalculatorPresenter.cpp index 927425e6b..67fda82e1 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/calculator/src/CalculatorPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/calculator/src/CalculatorPresenter.cpp @@ -14,8 +14,8 @@ #include "uicomponents/UIComponents.h" namespace OHOS { - REGIST_MENU_PRO( VIEW_CALCULATOR, CalculatorView, CalculatorPresenter, - PNG_APPLIST_INFORMATION_IMAGE_BIG, PNG_APPLIST_INFORMATION_IMAGE, PNG_APPLIST_INFORMATION_IMAGE, "计算器", STR_CALCULATOR); +// REGIST_MENU_PRO( VIEW_CALCULATOR, CalculatorView, CalculatorPresenter, +// PNG_APPLIST_INFORMATION_IMAGE_BIG, PNG_APPLIST_INFORMATION_IMAGE, PNG_APPLIST_INFORMATION_IMAGE, "计算器", STR_CALCULATOR); static CalculatorPresenter *g_pMainView = nullptr; CalculatorPresenter::CalculatorPresenter() diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/include/SleepControlPresenter.h b/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/include/SleepControlPresenter.h index 998b9746f..4d4cad25b 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/include/SleepControlPresenter.h +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/include/SleepControlPresenter.h @@ -36,9 +36,7 @@ namespace OHOS virtual ~SleepControlPresenter(); void OnStart() override; - void OnPause() override; void OnResume() override; - void OnStop() override; static SleepControlPresenter *GetInstance(); diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlPresenter.cpp index 724a4a22d..35ff5274c 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlPresenter.cpp @@ -50,22 +50,11 @@ namespace OHOS void SleepControlPresenter::OnStart() { - Presenter::OnStart(); - } - - void SleepControlPresenter::OnPause(void) - { - Presenter::OnPause(); } void SleepControlPresenter::OnResume(void) { - Presenter::OnResume(); - } - - void SleepControlPresenter::OnStop(void) - { - Presenter::OnStop(); + RootView::GetInstance()->SetOnKeyActListener(this); } bool SleepControlPresenter::OnDrag(UIView &view, const DragEvent &event) diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlView.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlView.cpp index c4f93a972..edc2a79d3 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlView.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/sleep/src/SleepControlView.cpp @@ -102,10 +102,7 @@ namespace OHOS { SleepModel::GetInstance().msg_save_sleep_data(); - GetRootContainer()->SetTouchable(true); - GetRootContainer()->SetDraggable(true); AddViewToRootContainer(GetSleepControlPageView()); - // GetRootContainer()->Add(GetSleepControlPageView()); if (SleepSwipeViewList == nullptr) { -- 2.17.1