From d770b62c2dedac7d3bb2e854b5bbd6729c670a5b Mon Sep 17 00:00:00 2001 From: luozheng <1732036298@qq.com> Date: Wed, 3 Jun 2026 18:26:35 +0800 Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=E8=A1=A8=E7=9B=98=E6=B5=8F?= =?utf8?q?=E8=A7=88=E7=89=B9=E6=95=88=E7=95=8C=E9=9D=A2=E6=8C=89=E9=94=AE?= =?utf8?q?=E9=80=80=E5=87=BA=E4=B8=8D=E4=BA=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativelauncher/src/NativeLauncher.cpp | 4 ---- .../set_dial/src/SetDialPresenter.cpp | 3 +-- .../nativeui/set_dial/src/SetDialView.cpp | 2 +- .../include/SetDialStylePresenter.h | 1 + .../src/SetDialStylePresenter.cpp | 5 +++++ .../vibrator/service/vibrator_service.cpp | 19 +------------------ 6 files changed, 9 insertions(+), 25 deletions(-) diff --git a/code/sdk/application/wearable/n9/nativeapp/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/n9/nativeapp/nativelauncher/src/NativeLauncher.cpp index 6744e7ef8..3a513aa25 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/n9/nativeapp/nativelauncher/src/NativeLauncher.cpp @@ -170,10 +170,6 @@ void NativeLauncher::InitNativeLauncher(LaunchMode mode) // 初始化屏幕时长 cm_initializeScreenDuration(); - - // 开机增加震动 页面启动震动一次 - // custom_VibratorFunc_int(0); - } // 注册开机时间 SystemLogData systemlog; diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp index 637580dc1..0e55dbff4 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial/src/SetDialPresenter.cpp @@ -43,7 +43,6 @@ namespace OHOS void SetDialPresenter::OnStart() { - Presenter::OnStart(); } void SetDialPresenter::OnResume(void) @@ -53,7 +52,7 @@ namespace OHOS void SetDialPresenter::OnStop(void) { - model->ClearDialInfo(); + model->ClearDialInfo(); } void SetDialPresenter::OnClickAction(void) diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial/src/SetDialView.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial/src/SetDialView.cpp index 170210bcd..3c307399e 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial/src/SetDialView.cpp +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial/src/SetDialView.cpp @@ -37,7 +37,7 @@ namespace OHOS WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"滚筒流"); SetUpRollerView(); } - + } void SetDialView::SetUpCoverflowView(void) diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial_style/include/SetDialStylePresenter.h b/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial_style/include/SetDialStylePresenter.h index 2a0955ecb..9c136c94d 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial_style/include/SetDialStylePresenter.h +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial_style/include/SetDialStylePresenter.h @@ -18,6 +18,7 @@ namespace OHOS public: SetDialStylePresenter(); ~SetDialStylePresenter(); + void OnResume() override; SetDialStylePresenter(const SetDialStylePresenter &) = delete; SetDialStylePresenter &operator=(const SetDialStylePresenter &) = delete; bool OnClick(UIView &view, const ClickEvent &event) override; diff --git a/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial_style/src/SetDialStylePresenter.cpp b/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial_style/src/SetDialStylePresenter.cpp index 48e9320cf..f59447a03 100644 --- a/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial_style/src/SetDialStylePresenter.cpp +++ b/code/sdk/application/wearable/n9/nativeapp/nativeui/set_dial_style/src/SetDialStylePresenter.cpp @@ -19,6 +19,11 @@ namespace OHOS { } + void SetDialStylePresenter::OnResume(void) + { + RootView::GetInstance()->SetOnKeyActListener(this); + } + bool SetDialStylePresenter::OnClick(UIView &view, const ClickEvent &event) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetDialStylePresenter::OnClick"); diff --git a/code/sdk/zhihui/drivers/vibrator/service/vibrator_service.cpp b/code/sdk/zhihui/drivers/vibrator/service/vibrator_service.cpp index 7b06bf4e6..7dbb252a6 100644 --- a/code/sdk/zhihui/drivers/vibrator/service/vibrator_service.cpp +++ b/code/sdk/zhihui/drivers/vibrator/service/vibrator_service.cpp @@ -106,12 +106,6 @@ void custom_VibratorFunc(OHOS::VibratorType vibratorType) } } -// // UI 界面震动一次接口 -// void ui_api_vibrate_once_func(void) -// { -// custom_VibratorFunc_int(0); -// } - static unsigned long g_app_queue= 0xFFFFFFFF; static bool vibrator_service_running_stat = false; @@ -192,22 +186,11 @@ errcode_t uapi_vibrator_service_init(void) OHOS::VibratorManager::GetInstance()->RegisterVibratorFunc(custom_VibratorFunc); /* ---------------------------------- 开机震动一次 ---------------------------------- */ -#ifdef BOARD_FD272 + PRINT("开机震动一次\n"); custom_VibratorFunc_int(5); -#else - custom_VibratorFunc_int(0); -#endif /* -------------------------------------------------------------------------- */ - return ERRCODE_SUCC; } - -void uapi_vibrator_service_deinit(void) -{ - -} - - #ifdef __cplusplus #if __cplusplus } -- 2.17.1