From 4614891001ba064274f71304bdab6d8cad84b4b1 Mon Sep 17 00:00:00 2001
From: payton <shenhzdl@gmail.com>
Date: Fri, 28 Jul 2023 17:48:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8D=87=E7=BA=A7=E8=B0=83=E6=95=B4;2.?=
 =?UTF-8?q?=E6=8C=87=E7=A4=BA=E7=81=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sifar/code/source/common/sf_common.c      | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c
index b2e126d98..27e34d47f 100755
--- a/code/lib/source/sifar/code/source/common/sf_common.c
+++ b/code/lib/source/sifar/code/source/common/sf_common.c
@@ -142,7 +142,7 @@ void sf_mode_detect(void)
 	static UINT32 timeBak = 0;
 	static UINT32 time=0;
 	static UINT8  pwroffcnt = 0;
-	static UINT8  countDownOffFlg = 0;
+	//static UINT8  countDownOffFlg = 0;
 	static UINT8  pirDelay = 0;
     VOS_TICK tticktmp=0;
     static VOS_TICK ttick=0;
@@ -209,7 +209,7 @@ void sf_mode_detect(void)
                 vos_perf_mark(&ttick);
                 //sf_sys_status_led_set(SF_LED_SYS_STATE_OFF);
                 //sf_enter_auto_mode_show(3);
-                if(!countDownOffFlg)
+                //if(!countDownOffFlg)
                     sf_sys_status_led_set(SF_LED_SYS_STATE_GOING_TO_PIR);
             }
             vos_perf_mark(&tticktmp);
@@ -232,7 +232,7 @@ void sf_mode_detect(void)
             if(pwroffcnt == 1)
             {
                 //sf_enter_auto_mode_show(3);
-                if(!countDownOffFlg)
+                //if(!countDownOffFlg)
                     sf_sys_status_led_set(SF_LED_SYS_STATE_GOING_TO_PIR);
             }
             else if(pwroffcnt == 6)
@@ -260,6 +260,7 @@ void sf_mode_detect(void)
             pwroffcnt = 0;
             cmdflag = 0;
             timeBak = 0;
+            //countDownOffFlg = 0;
         }
 
         if(puiPara->AutoOffSwitch == 0 ||  (0x04 == NetWorkFlag/*SF_4G_SENDING*/) || (0x05 == NetWorkFlag/*SF_4G_SEARCHING*/) || (sf_get_fw_update()) || (sf_get_module_update())/*|| (appActiveStateGet() == APP_STATE_CUSTOMER_TRANSFER)*/)
@@ -272,10 +273,8 @@ void sf_mode_detect(void)
         if(sf_is_preview())
         {	
             //printf("----AutoOfftime=%d\n",AutoOfftime);
-            if(AutoOfftime<185)
+            /*if(AutoOfftime<184)
             {
-                AutoOfftime++;
-
                 if(countDownOffFlg)
                 {
                     countDownOffFlg = 0;
@@ -284,11 +283,14 @@ void sf_mode_detect(void)
                         sf_sys_status_led_set(SF_LED_SYS_STATE_EXIT_GO_TO_PIR);
                 }
             }
-            else if(AutoOfftime == 185) 
+            else */if(AutoOfftime == 184) 
             {
                 sf_set_pir_statu_flag(TRUE);
-                countDownOffFlg = 1;
+                //countDownOffFlg = 0;
+                //sf_sys_status_led_set(SF_LED_SYS_STATE_GOING_TO_PIR);
             }
+            AutoOfftime++;
+
         }	
         else
         {
@@ -1154,7 +1156,7 @@ BOOL sf_cmd_auto_off_time(unsigned char argc, char **argv)
     	sscanf_s(argv[0],"%d", &value);
     	sf_set_auto_off_time(value);
     }
-    printf("[%s:%d] value:%s\n", __FUNCTION__, __LINE__,value);
+    printf("[%s:%d] value:%d\n", __FUNCTION__, __LINE__,value);
 
 	return TRUE;
 }
@@ -2006,6 +2008,7 @@ static UINT32 sf_fwupdate(void)
 void* sf_sys_do_upgrade(void *arg)
 {
     //int s32Ret = 0;
+    UIMenuStoreInfo *puiPara = sf_ui_para_get();
 
     SLOGW("Begin to do Upgrade!\n");
 
@@ -2023,15 +2026,19 @@ void* sf_sys_do_upgrade(void *arg)
             sf_sys_status_led_set(SF_LED_SYS_STATE_ERROR);
         }
         else {
-            SysResetFlag();
+            //SysResetFlag();
+            puiPara->OtaFlag = 1;
             Save_MenuInfo();
             //sync();
         }
         sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 1);
         sf_set_send_statu(FALSE);
         sf_set_fw_update(0);
-        vos_util_delay_ms(1000);
-        Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, 0);
+        if(PWR_ON_SETUP == sf_cardv_convert_power_on_mode()){
+            vos_util_delay_ms(1000);
+            Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, 0);
+        }
+
     }
 
 	UpgradeTskParam.IsRun = 2;