From 6ff5c2c0e4e16673591569b0a32ee7710ac26e77 Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Thu, 23 Nov 2023 17:06:42 +0800 Subject: [PATCH] Fixed bug about message screen. --- .../UIFlowMenuCommonItemEventCallback.c | 36 ++++++++++++++----- .../UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c | 5 ++- 2 files changed, 32 insertions(+), 9 deletions(-) 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 dfe6a6581..e85854b7a 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 @@ -4,6 +4,7 @@ #include "UIApp/Network/UIAppNetwork.h" #include "UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h" #include +#include #include #if HUNTING_CAMERA_MCU == ENABLE #include @@ -73,7 +74,7 @@ static BOOL sf_is_4g_module_usb_update_file_exist(UINT8 *updateFname) static unsigned char gBattery = 0; #define UPGRADABLE 0 #define NOT_UPGRADABLE -1 -int is_camera_fw_upgrade(void) +static int is_camera_fw_upgrade(void) { FST_FILE hFile = NULL; // return UPGRADABLE; @@ -92,7 +93,7 @@ int is_camera_fw_upgrade(void) } return UPGRADABLE; } -int is_module_fw_upgrade(void) +static int is_module_fw_upgrade(void) { // return UPGRADABLE; UINT8 updateFileName[60] = {0}; @@ -102,6 +103,18 @@ int is_module_fw_upgrade(void) } return UPGRADABLE; } +#define SEND_TYPE_DISABLE 0 +#define SEND_TYPE_ENABLE 1 +static int is_send_type_disabel(void) +{ + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + #define DAILY_SETTING 0 + if (DAILY_SETTING == puiPara->GprsMode) + { + return SEND_TYPE_ENABLE; + } + return SEND_TYPE_DISABLE; +} #if 0 static lv_obj_t* container_option1 = NULL; static lv_obj_t* container_option2 = NULL; @@ -225,8 +238,9 @@ static void LV_MenuItem_OnPrev(lv_obj_t* obj) pItem = &pPage->pItems[pPage->SelItem]; // BOOL uItem_Locked = true; // TODO: // if(((pItem->ItemId == IDM_CAMERA_FW_UPGRADE) || (pItem->ItemId == IDM_MODULE_FW_UPGRADE)) && uItem_Locked){ - if(((pItem->ItemId == IDM_CAMERA_FW_UPGRADE && is_camera_fw_upgrade() == NOT_UPGRADABLE) || - (pItem->ItemId == IDM_MODULE_FW_UPGRADE && is_module_fw_upgrade() == NOT_UPGRADABLE))){ + if((pItem->ItemId == IDM_CAMERA_FW_UPGRADE && is_camera_fw_upgrade() == NOT_UPGRADABLE) || + (pItem->ItemId == IDM_MODULE_FW_UPGRADE && is_module_fw_upgrade() == NOT_UPGRADABLE) || + (pItem->ItemId == IDM_SEND_TYPE && is_send_type_disabel() == SEND_TYPE_DISABLE)) { lv_plugin_menu_select_prev_item(menu_item); uSel_Jump = true; goto OneMore; @@ -260,8 +274,9 @@ static void LV_MenuItem_OnNext(lv_obj_t* obj) pItem = &pPage->pItems[pPage->SelItem]; // BOOL uItem_Locked = true; // TODO: // if(((pItem->ItemId == IDM_CAMERA_FW_UPGRADE) || (pItem->ItemId == IDM_MODULE_FW_UPGRADE)) && uItem_Locked){ - if(((pItem->ItemId == IDM_CAMERA_FW_UPGRADE && is_camera_fw_upgrade() == NOT_UPGRADABLE) || - (pItem->ItemId == IDM_MODULE_FW_UPGRADE && is_module_fw_upgrade() == NOT_UPGRADABLE))){ + if((pItem->ItemId == IDM_CAMERA_FW_UPGRADE && is_camera_fw_upgrade() == NOT_UPGRADABLE) || + (pItem->ItemId == IDM_MODULE_FW_UPGRADE && is_module_fw_upgrade() == NOT_UPGRADABLE) || + (pItem->ItemId == IDM_SEND_TYPE && is_send_type_disabel() == SEND_TYPE_DISABLE)){ lv_plugin_menu_select_next_item(menu_item); uSel_Jump = true; goto Onetime; @@ -686,7 +701,11 @@ static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu) { lv_plugin_menu_set_item_state(menu_item, i, LV_PLUGIN_MENU_ITEM_STATE_DISABLED); lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, LV_PLUGIN_IMG_ID_SF_MODULE_FW_UPGRADE_DIS); - } + } else if (pItem->ItemId == IDM_SEND_TYPE && is_send_type_disabel() == SEND_TYPE_DISABLE) + { + lv_plugin_menu_set_item_state(menu_item, i, LV_PLUGIN_MENU_ITEM_STATE_DISABLED); + lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, LV_PLUGIN_IMG_ID_SF_MODULE_FW_UPGRADE_DIS); + } else { lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->IconId); } @@ -743,7 +762,8 @@ static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu) if(((pPage->SelItem%PER_PAGE_NUM) == 2)&&(pMenu->Status == TMS_ON_ITEM)){ lv_plugin_img_set_src(image_option_3_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT2); }else{ - if((pItem->ItemId == IDM_CAMERA_FW_UPGRADE) && is_camera_fw_upgrade() == NOT_UPGRADABLE){ + if((pItem->ItemId == IDM_CAMERA_FW_UPGRADE && is_camera_fw_upgrade() == NOT_UPGRADABLE) || + (pItem->ItemId == IDM_SEND_TYPE && is_send_type_disabel() == SEND_TYPE_DISABLE)){ lv_plugin_img_set_src(image_option_3_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT_DIS); } else { lv_plugin_img_set_src(image_option_3_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT1); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c index 24baabea8..f2fb48f2c 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c @@ -50,7 +50,10 @@ static void task_msgbox_timer_cb(lv_task_t* task) { lv_msgbox_start_auto_close(msgbox, 0); } - OpenClosingScreen(); + if (0 == autoClose) + { + OpenClosingScreen(); + } return; } if(string){