From: Caisking <3449750381@qq.com> Date: Fri, 2 Aug 2024 07:52:19 +0000 (+0800) Subject: 屏蔽自动设置表盘 X-Git-Tag: release_V1.2.70_20241020_135402~690^2~26 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=37d8750ad57726f954740a4f249a90e79db7ffb4;p=mirrors%2FFD230.git 屏蔽自动设置表盘 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialPresenter.cpp index 2dc21b60e..fb4c6b9df 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/set_dial/src/SetDialPresenter.cpp @@ -9,7 +9,8 @@ #include "SetDialModel.h" #include "SetDialPresenter.h" -namespace OHOS { +namespace OHOS +{ SetDialPresenter::SetDialPresenter() { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SetDialPresenter::SetDialPresenter"); @@ -20,7 +21,8 @@ namespace OHOS { SetDialPresenter::~SetDialPresenter() { - if (keyActListenr != nullptr) { + if (keyActListenr != nullptr) + { delete keyActListenr; keyActListenr = nullptr; } @@ -29,11 +31,15 @@ namespace OHOS { void SetDialPresenter::OnStart() { Presenter::OnStart(); - if (keyActListenr == nullptr) { + if (keyActListenr == nullptr) + { keyActListenr = new KeyInputListener(); - if (keyActListenr != nullptr) { + if (keyActListenr != nullptr) + { RootView::GetInstance()->SetOnKeyActListener(keyActListenr); - } else { + } + else + { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ApplistPresenter::OnStart: new KeyInputListener fail"); } } @@ -67,7 +73,7 @@ namespace OHOS { return true; } - void SetDialPresenter::OnScroll(UIRollerView* roller, std::string currentItemName, float currentItemAngle) + void SetDialPresenter::OnScroll(UIRollerView *roller, std::string currentItemName, float currentItemAngle) { view_->RollerViewScroll(currentItemName, currentItemAngle); } @@ -77,7 +83,7 @@ namespace OHOS { return model->GetDialCount(); } - std::vector& SetDialPresenter::GetDialInfo(void) + std::vector &SetDialPresenter::GetDialInfo(void) { return model->GetDialInfo(); } @@ -89,10 +95,13 @@ namespace OHOS { void SetDialPresenter::OnTickEvent() { + // 屏蔽自动设置表盘 +#if 0 uint64_t current_time = osKernelGetTick2ms(); if ((startTime != 0) && (current_time - startTime > MISS_DIAL_OPERATION_TIME)) { OnClickAction(); } +#endif } void SetDialPresenter::ResetTickTimer(void)