From 3838e508c4bae50aeba0ce8dd1d00843f4fa456e Mon Sep 17 00:00:00 2001
From: luozheng <1732036298@qq.com>
Date: Fri, 27 Dec 2024 15:17:42 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8DOTA=E6=96=87=E4=BB=B6=E4=BC=A0?=
 =?utf8?q?=E8=BE=93=E6=88=90=E5=8A=9F=E8=BF=99=E6=97=B6=E5=B1=8F=E5=B9=95?=
 =?utf8?q?=E5=8F=B3=E6=BB=91=E5=AF=BC=E8=87=B4=E6=AD=BB=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 code/sdk/application/brandy/brandy_standard/board_init.c | 5 +++++
 .../service/msg_center/src/notify/transmitting.cpp       | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

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)
-- 
2.17.1