修复OTA文件传输成功这时屏幕右滑导致死机

diff --git a/code/sdk/application/brandy/brandy_standard/board_init.c b/code/sdk/application/brandy/brandy_standard/board_init.c
index d38778c..5d99e5f 100755 (executable)
--- 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;\r
     // button_api->button_register_callback(PIN_NONE, (osal_irq_handler)button_irq_callback);\r
     uapi_ulp_wkup_type_record();\r
+    /*\r
+        首先检查CPU复位原因，然后再检查启动原因，这是因为CPU复位原因可能会影响到启动原因的判断。\r
+        如果CPU复位原因是应用程序系统复位请求或升级完成，那么就不需要再检查电源键是否按下了3秒，\r
+        因为这种情况下设备已经被复位或升级完成，不需要再进行启动检查。\r
+    */\r
     int cpu_reset_case = get_cpu_utils_reset_cause();\r
     if (cpu_reset_case == REBOOT_CAUSE_APPLICATION_SYSRESETREQ || cpu_reset_case == REBOOT_CAUSE_UPG_COMPLETION) \r
     {\r

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 1a16985..7b36b70 100644 (file)
--- 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)