diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c index 17b3eafa0..1efd63fd4 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c @@ -158,12 +158,13 @@ int General_MenuCallback(UINT32 uiMessage, UINT32 uiParam) } case IDM_DELAY: { + unsigned int oldSeting = puiPara->PirDelaySwitch; puiPara->PirDelaySwitch = uwOption == 0 ? SF_OFF : SF_ON; - if (SF_OFF == puiPara->PirDelaySwitch) + if (SF_OFF == oldSeting && SF_ON == puiPara->PirDelaySwitch) { puiPara->PirDelayTime.Hour = 0; puiPara->PirDelayTime.Min = 0; - puiPara->PirDelayTime.Sec = 15; + puiPara->PirDelayTime.Sec = 30; } break; } diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c index 4cc00537f..34b467a0b 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c @@ -69,6 +69,13 @@ int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam) case IDM_SETTINGS_CHECK: { puiPara->GprsMode = uwOption; + #define INSTANT_OPTION 1 + if (INSTANT_OPTION == puiPara->GprsMode && SF_OFF == puiPara->PirDelaySwitch) + { + puiPara->PirDelayTime.Hour = 0; + puiPara->PirDelayTime.Min = 0; + puiPara->PirDelayTime.Sec = 15; + } printf("\033[33m[Send_MenuCallback]GprsMode:%d\033[0m\n", puiPara->GprsMode); break; } 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 dc1c6c078..6a49db30a 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -1782,7 +1782,7 @@ static SINT32 sf_cardv_proccess_cmd_file(SF_MESSAGE_BUF_S *pMessageBuf) sf_set_send_statu(FALSE); #define SEND_SUCCEED 0 #define SEND_FAILED -1 - sf_ui_sending_show(SEND_SUCCEED == pMessageBuf->arg1 ? FILE_SENDING_GUI_SEND_SUCCEED : FILE_SENDING_GUI_SEND_FAILED); + sf_ui_sending_show(SEND_SUCCEED == pMessageBuf->arg2 ? FILE_SENDING_GUI_SEND_SUCCEED : FILE_SENDING_GUI_SEND_FAILED); if(sf_get_mode_flag()) { sf_wifi_server_stop_shoot_respond((UINT8)pMessageBuf->arg2);