From: luozheng <1732036298@qq.com> Date: Fri, 27 Dec 2024 07:17:42 +0000 (+0800) Subject: 修复OTA文件传输成功这时屏幕右滑导致死机 X-Git-Tag: v1.3.113-repair_tp~39^2~17 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F1578%2Fhead;p=mirrors%2FFD230.git 修复OTA文件传输成功这时屏幕右滑导致死机 --- diff --git a/code/sdk/application/brandy/brandy_standard/board_init.c b/code/sdk/application/brandy/brandy_standard/board_init.c index d38778c90..5d99e5f73 100755 --- a/code/sdk/application/brandy/brandy_standard/board_init.c +++ b/code/sdk/application/brandy/brandy_standard/board_init.c @@ -130,6 +130,11 @@ void check_pwrkey_3s(void) int pressed_count = 0; // button_api->button_register_callback(PIN_NONE, (osal_irq_handler)button_irq_callback); uapi_ulp_wkup_type_record(); + /* + 首先检查CPU复位原因,然后再检查启动原因,这是因为CPU复位原因可能会影响到启动原因的判断。 + 如果CPU复位原因是应用程序系统复位请求或升级完成,那么就不需要再检查电源键是否按下了3秒, + 因为这种情况下设备已经被复位或升级完成,不需要再进行启动检查。 + */ int cpu_reset_case = get_cpu_utils_reset_cause(); if (cpu_reset_case == REBOOT_CAUSE_APPLICATION_SYSRESETREQ || cpu_reset_case == REBOOT_CAUSE_UPG_COMPLETION) { diff --git a/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp b/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp index 1a169854e..7b36b70b4 100644 --- a/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp +++ b/code/sdk/application/wearable/service/msg_center/src/notify/transmitting.cpp @@ -171,11 +171,14 @@ namespace OHOS static void OTATimerCallBackProc(int data) { #if 0 - updatasider->SetValue(test_flag++); + if(updatasider) + updatasider->SetValue(test_flag++); #else - updatasider->SetValue(get_OTA_recv_value()); + if(updatasider) + updatasider->SetValue(get_OTA_recv_value()); #endif - updatasider->Invalidate(); + if(updatasider) + updatasider->Invalidate(); } void OTATimerCallBack(int data)