payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug number 9751.

Browse Source
This commit is contained in:
xiaojiazhu 2023-11-13 15:21:22 +08:00
parent 52bd40f539
commit 62d6ab47ff
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c
View File

@ -158,12 +158,13 @@ int General_MenuCallback(UINT32 uiMessage, UINT32 uiParam)
} }
case IDM_DELAY: case IDM_DELAY:
{ {
unsigned int oldSeting = puiPara->PirDelaySwitch;
puiPara->PirDelaySwitch = uwOption == 0 ? SF_OFF : SF_ON; 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.Hour = 0;
puiPara->PirDelayTime.Min = 0; puiPara->PirDelayTime.Min = 0;
puiPara->PirDelayTime.Sec = 15; puiPara->PirDelayTime.Sec = 30;
} }
break; break;
} }

7
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c
View File

@ -69,6 +69,13 @@ int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam)
case IDM_SETTINGS_CHECK: case IDM_SETTINGS_CHECK:
{ {
puiPara->GprsMode = uwOption; 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); printf("\033[33m[Send_MenuCallback]GprsMode:%d\033[0m\n", puiPara->GprsMode);
break; break;
} }

2
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -1782,7 +1782,7 @@ static SINT32 sf_cardv_proccess_cmd_file(SF_MESSAGE_BUF_S *pMessageBuf)
sf_set_send_statu(FALSE); sf_set_send_statu(FALSE);
#define SEND_SUCCEED 0 #define SEND_SUCCEED 0
#define SEND_FAILED -1 #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()) if(sf_get_mode_flag())
{ {
sf_wifi_server_stop_shoot_respond((UINT8)pMessageBuf->arg2); sf_wifi_server_stop_shoot_respond((UINT8)pMessageBuf->arg2);