From 5b8200295787411a438a85008096b70cdd4af74d Mon Sep 17 00:00:00 2001 From: xue <2144439972@qq.com> Date: Fri, 23 Jan 2026 11:30:02 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/thunderbird/include/ThunderBirdModel.h | 1 + .../nativeui/thunderbird/src/ThunderBirdModel.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdModel.h b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdModel.h index 4d181f929..db519315c 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdModel.h +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/include/ThunderBirdModel.h @@ -42,6 +42,7 @@ namespace OHOS void StopCountUpTimer(void); void StartFactoryResetTimer(uint32_t delaySeconds); void StopFactoryResetTimer(void); + void HandleFactoryReset(void); int GetCountUpValue() const; // 常亮屏刷新定时器(用于压测模式,每50分钟刷新一次,避免1小时超时) diff --git a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp index 86e5966d1..504470f4a 100644 --- a/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp +++ b/code/sdk/application/wearable/ln/nativeapp/nativeui/thunderbird/src/ThunderBirdModel.cpp @@ -357,10 +357,12 @@ extern "C" { return m_countUpValue; } - // 故事模式超时定时器回调函数前向声明 - static void StoryModeTimeoutTimerCallback(uint8_t data); - // 故事模式音频播放超时定时器回调函数前向声明 - static void StoryAudioPlaybackTimeoutTimerCallback(uint8_t data); + // 故事模式超时定时器回调函数前向声明 + static void StoryModeTimeoutTimerCallback(uint8_t data); + // 故事模式音频播放超时定时器回调函数前向声明 + static void StoryAudioPlaybackTimeoutTimerCallback(uint8_t data); + // 恢复出厂设置定时器回调函数前向声明 + static void FactoryResetTimerCallback(uint8_t data); // ---------------------- 故事模式超时定时器 ---------------------- void ThunderBirdModel::StartStoryModeTimeoutTimer(void) -- 2.17.1