From 96110bbc3fda2df353e31854f25d69283eaa3891 Mon Sep 17 00:00:00 2001 From: payton Date: Mon, 27 Nov 2023 11:14:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E5=8F=91=E9=80=81=E9=99=90=E5=88=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c | 2 +- .../source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c index d2b99cb71..6a0501e73 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c @@ -1455,7 +1455,7 @@ static void MovieExe_UserEventCb(UINT32 id, MOVIE_USER_CB_EVENT event_id, UINT32 #if HUNTING_CAMERA_MCU == ENABLE DBG_IND(" ===== MOVIE_USER_CB_EVENT_CLOSE_FILE_COMPLETED ===== id:%d \r\n", id); UIMenuStoreInfo *puiPara = sf_ui_para_get(); - if(((SF_CAM_MODE_VIDEO2 == puiPara->CamMode) || (SF_CAM_MODE_PHOTO_VIDEO == puiPara->CamMode)) && (id == _CFG_REC_ID_1) && (sf_cardv_get_cq_signal())) + if(((SF_CAM_MODE_VIDEO2 == puiPara->CamMode) || (SF_CAM_MODE_PHOTO_VIDEO == puiPara->CamMode)) && (id == _CFG_REC_ID_1) && (FALSE == sf_check_net_work_flag()) && (0 < sf_cardv_get_cq_signal())) { if(SUCCESS == sf_share_mem_file_down(0, 0)){ sf_set_send_statu(TRUE); diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c index 4de5280ec..2929e5f2c 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c @@ -6825,7 +6825,7 @@ INT32 PhotoExe_Preview_SliceEncode_CB3(void* user_data) snprintf(tmp2, sizeof(tmp2), "W%s%s.JPG", folder, number); /* DCF 8.3 naming rule */ DBG_DUMP("PHOTO THUMB %s \n %s\n", tmp, tmp2); sf_file_thumb_cfg_fill(tmp, tmp2, queue_ele_in->jpg_thumb_size, enFileType); - if(sf_cardv_get_cq_signal() && ((SF_CAM_MODE_PHOTO == puiPara->CamMode) || ((!sf_get_mode_flag()) && (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2)))) + if((FALSE == sf_check_net_work_flag()) && (0 < sf_cardv_get_cq_signal()) && ((SF_CAM_MODE_PHOTO == puiPara->CamMode) || ((!sf_get_mode_flag()) && (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2)))) { if(SUCCESS == sf_share_mem_file_down(0, 0)){ sf_set_send_statu(TRUE); From 0ef0217d0fdb33c3dfc3c56c0c9446f1fd94a499 Mon Sep 17 00:00:00 2001 From: payton Date: Mon, 27 Nov 2023 11:14:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.date=20time=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c | 11 ++++++++++- .../cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c index bb1b3b7d3..ddff14480 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c @@ -1540,7 +1540,16 @@ void SysSetFixedFlagSysInit(void) void SysResetFlag(void) { #if HUNTING_CAMERA_MCU == ENABLE + CHAR dateAuto;/*Auto/Manual*/ UIMenuStoreInfo *puiPara = sf_ui_para_get(); + if((SF_DATE_MANUAL == puiPara->DateAuto) && (!puiPara->OtaFlag)) + { + dateAuto = SF_DATE_MANUAL; + } + else + { + dateAuto = DEFAULT_DATE_AUTO; + } memset(puiPara, 0, sizeof(UIMenuStoreInfo)); #endif // Set system flag default value here @@ -1747,7 +1756,7 @@ void SysResetFlag(void) puiPara->TimeSend2.Hour = 0; puiPara->TimeSend2.Min = 0; - puiPara->DateAuto = DEFAULT_DATE_AUTO; + puiPara->DateAuto = dateAuto; //NTPZoneS, //NTPZoneH, //NTPZoneM, diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c index 83be31694..13a3f0818 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c @@ -952,7 +952,16 @@ void SysSetFixedFlagSysInit(void) void SysResetFlag(void) { #if HUNTING_CAMERA_MCU == ENABLE + CHAR dateAuto;/*Auto/Manual*/ UIMenuStoreInfo *puiPara = sf_ui_para_get(); + if((SF_DATE_MANUAL == puiPara->DateAuto) && (!puiPara->OtaFlag)) + { + dateAuto = SF_DATE_MANUAL; + } + else + { + dateAuto = DEFAULT_DATE_AUTO; + } memset(puiPara, 0, sizeof(UIMenuStoreInfo)); #endif // Set system flag default value here @@ -1159,7 +1168,7 @@ void SysResetFlag(void) puiPara->TimeSend2.Hour = 0; puiPara->TimeSend2.Min = 0; - puiPara->DateAuto = DEFAULT_DATE_AUTO; + puiPara->DateAuto = dateAuto; //NTPZoneS, //NTPZoneH, //NTPZoneM, From ee09338f5913279fd2efd7675d1d6afce744470d Mon Sep 17 00:00:00 2001 From: payton Date: Mon, 27 Nov 2023 11:49:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8DWiFi=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=8B=8D=E7=85=A7=E5=8F=91=E5=9B=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c index 73519a909..128b012f1 100755 --- a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c +++ b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c @@ -1965,7 +1965,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen) case WIFI_CONTROL_CAMERA_SHOOT: MLOGI("[WIFI_SET_CAMERA_SHOOT] shoot:%d\n",pMsgStruct->msgBuf.ctrlShoot.shoot); - if((System_GetState(SYS_STATE_CARD) == CARD_INSERTED) && (TRUE == sf_is_preview()) && (pMsgStruct->msgBuf.ctrlShoot.shoot <= 3)) + if((FALSE == sf_get_send_statu()) && (System_GetState(SYS_STATE_CARD) == CARD_INSERTED) && (TRUE == sf_is_preview()) && (pMsgStruct->msgBuf.ctrlShoot.shoot <= 3)) { if((puiPara->CamMode != 1) && (pMsgStruct->msgBuf.ctrlShoot.shoot < 3)) {