From: xue <2144439972@qq.com> Date: Fri, 23 Jan 2026 03:30:02 +0000 (+0800) Subject: 修复编译bug X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F3159%2Ftarget%2F1;p=mirrors%2FFD230.git 修复编译bug --- 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)