From: Caisking <3449750381@qq.com> Date: Thu, 5 Sep 2024 07:17:45 +0000 (+0800) Subject: 删除applist的心率值的notify 统一由model管理 X-Git-Tag: release_V1.2.70_20241020_135402~518^2~28 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=d617cd18c7781d846c70d24b1a5c72a718008b47;p=mirrors%2FFD230.git 删除applist的心率值的notify 统一由model管理 --- diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartChartPresenter.h b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartChartPresenter.h index 876166b71..06e5c187a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartChartPresenter.h +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/include/HeartChartPresenter.h @@ -23,7 +23,6 @@ namespace OHOS class HeartChartView; class HeartChartPresenter : public Presenter, - public ModelListenerSample, public UIView::OnClickListener, public UIView::OnDragListener, public RootView::OnKeyActListener, @@ -37,8 +36,6 @@ namespace OHOS void OnStart() override; void OnResume() override; void OnStop() override; - void OnTickEvent() override; - void Notify() override {} bool OnClick(UIView &view, const ClickEvent &event) override; bool OnDrag(UIView &view, const DragEvent &event) override; bool OnKeyAct(UIView &view, const KeyEvent &event) override; // 增加按键事件 diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp index 53fd91c18..5f1a6353e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp @@ -1,3 +1,9 @@ +/*** + * @Date: 2024-08-15 18:39:25 + * @LastEditors: Caisking 3449750381@qq.com + * @LastEditTime: 2024-09-03 21:04:56 + * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartChartPresenter.cpp + */ /* * Copyright (c) CompanyNameMagicTag 2021-2021. All rights reserved. * Description: HeartChartPresenter.cpp @@ -28,7 +34,6 @@ namespace OHOS g_pHeartChartPresenter = this; display_time = DisplayBrightnessModel::GetInstance()->GetScreenDurationTime(); display_api->set_screen_auto_off_timeout(300 * 1000); // 设置常亮 - ResetTickTimer(); #ifdef MEM_CHECK MemCheck::GetInstance()->EnableLeakCheck(true); #endif @@ -94,28 +99,6 @@ namespace OHOS return true; } - void HeartChartPresenter::OnTickEvent() - { - // 更新显示心率数据 - HeartChartView::GetInstance()->UpdateShowHeart(); -#if 0 - /*该界面一直在检测 不需要做超时 具有无效数标志*/ - uint64_t current_time = osKernelGetTick2ms(); - if ((startTime != 0) && (current_time - startTime > HEART_KEEP_TIME)) - { - // 超时处理 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "检测结果: 超时处理 HEART_KEEP_TIME: %lld", current_time - startTime); - HeartModel::GetInstance()->SetResult(HeartResult::TIMEOUT); - HeartModel::GetInstance()->Heart_Stop(); - startTime = 0; // 重置 - - } -#endif - } - void HeartChartPresenter::ResetTickTimer(void) - { - startTime = osKernelGetTick2ms(); - } // 增加按键事件 bool HeartChartPresenter::OnKeyAct(UIView &view, const KeyEvent &event) {