From 205ae97cc3594004989e6a219ffb9364189109b3 Mon Sep 17 00:00:00 2001 From: payton Date: Mon, 8 Apr 2024 15:59:37 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0GprsSwitch=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=85=B3=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c | 3 ++- .../source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c index bc274ea1b..aa17728a4 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c @@ -342,6 +342,7 @@ static void MovieFast_ShutDown(void) #endif #if HUNTING_CAMERA_MCU + UIMenuStoreInfo *puiPara = sf_ui_para_get(); #if SF_TRIGGER_TIME_TEST != ENABLE sf_fastboot_msg_en(ENABLE); #endif @@ -392,7 +393,7 @@ static void MovieFast_ShutDown(void) FileSys_CloseEx('A', FST_TIME_INFINITE); FileSys_CloseEx('B', FST_TIME_INFINITE); #if SF_IQ_TEST != ENABLE - if(sf_get_power_off_flag()){ + if((sf_get_power_off_flag()) || (!puiPara->GprsSwitch)){ sf_mcu_reg_set(SF_MCU_POWEROFF,0); }else{ fastboot_set_done(BOOT_FLOW_BOOT); diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c index 0a52bfe2d..003e6f46f 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c @@ -2333,6 +2333,7 @@ static void PhotoFast_ShutDown(void) } #endif #if HUNTING_CAMERA_MCU == ENABLE + UIMenuStoreInfo *puiPara = sf_ui_para_get(); #if SF_TRIGGER_TIME_TEST != ENABLE sf_fastboot_msg_en(ENABLE); #endif @@ -2379,7 +2380,7 @@ static void PhotoFast_ShutDown(void) FileSys_CloseEx('A', FST_TIME_INFINITE); FileSys_CloseEx('B', FST_TIME_INFINITE); #if SF_IQ_TEST != ENABLE - if(sf_get_power_off_flag()){ + if((sf_get_power_off_flag()) || (!puiPara->GprsSwitch)){ sf_mcu_reg_set(SF_MCU_POWEROFF,0); }else{ fastboot_set_done(BOOT_FLOW_BOOT);