From 791d3ca7fbfb2c2540cddf9686aa251ba22dfbde Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Tue, 12 Dec 2023 11:40:47 +0800 Subject: [PATCH] Fixed bug number 10049. --- .../UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c | 16 +++++++++++++++- .../UIFlowMenuCommonItemEventCallback.c | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) 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 b3cc7caae..2a5d56365 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 @@ -75,6 +75,7 @@ int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam) { puiPara->GprsMode = uwOption; #define INSTANT_OPTION 1 + #define HYBIRD_OPTION 2 if (INSTANT_OPTION == puiPara->GprsMode && SF_OFF == puiPara->PirDelaySwitch) { puiPara->PirDelaySwitch = SF_ON; @@ -83,7 +84,20 @@ int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam) puiPara->PirDelayTime.Sec = 15; } printf("\033[33m[Send_MenuCallback]GprsMode:%d\033[0m\n", puiPara->GprsMode); - break; + if (INSTANT_OPTION == puiPara->GprsMode || HYBIRD_OPTION == puiPara->GprsMode) + { + #define SYNC_SEND_TYPE_SETTING 0 + uwOption = SYNC_SEND_TYPE_SETTING; + printf("Sync send type settings.\n"); + memset(&(puiPara->TimeSend1), 0, sizeof(SF_PARA_TIME_S)); + memset(&(puiPara->TimeSend2), 0, sizeof(SF_PARA_TIME_S)); + memset(&(puiPara->TimeSend3), 0, sizeof(SF_PARA_TIME_S)); + memset(&(puiPara->TimeSend4), 0, sizeof(SF_PARA_TIME_S)); + } + else + { + break; + } } case IDM_SEND_TYPE: { diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c index 0b0a7865b..4da122afa 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c @@ -1044,6 +1044,7 @@ static void UIFlowMenuCommonItem_ChildScrClose(lv_obj_t* obj,const LV_USER_EVENT set_indev_keypad_group(obj); if(msg){ if(msg->event == NVTRET_ENTER_MENU){ + load_info_from_sf(); TM_MENU* pMenu = TM_GetMenu(); TM_PAGE *pPage; // TM_ITEM *pItem;