From: Caisking Date: Fri, 26 Dec 2025 13:19:18 +0000 (+0800) Subject: 优化心率的停止定时器 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=892a3a915cd75b0077c0f926a4b0cdd5bb719d45;p=mirrors%2FFD230.git 优化心率的停止定时器 --- diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartModel.cpp index 044aba69d..bb65cf7ba 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartModel.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/heartrate/src/HeartModel.cpp @@ -1012,14 +1012,22 @@ void HeartModel::heart_stop_screen60s_timer(void) { if (g_screen60s_timer != nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartModel::heart_stop_screen60s_timer"); - osTimerStop(g_screen60s_timer); - // 删除定时器并置为 nullptr - osStatus_t ret = osTimerDelete(g_screen60s_timer); + // 先停止定时器,避免在回调执行时删除 + osStatus_t ret = osTimerStop(g_screen60s_timer); + if (ret != osOK) { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, + "osTimerStop failed, ret = %lx!!", ret); + // 如果停止失败,仍然尝试删除,但记录错误 + } + // 保存定时器指针,避免在删除过程中被其他线程修改 + osTimerId_t timer_to_delete = g_screen60s_timer; + g_screen60s_timer = nullptr; // 先置为nullptr,防止重复删除 + // 删除定时器 + ret = osTimerDelete(timer_to_delete); if (ret != osOK) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "osTimerDelete failed, ret = %lx!!", ret); } - g_screen60s_timer = nullptr; SCREEN_60S_TIME = 60; } }