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

Megre code of ding to fixed disable item.

Browse Source
This commit is contained in:
xiaojiazhu 2023-12-08 14:42:57 +08:00
parent 61ccc09bee
commit f170293da0
2 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMore.c
View File

@ -6,7 +6,7 @@ TMDEF_BEGIN_OPTIONS(BATTERY_TYPE)
TMDEF_OPTION_TEXT_S(BATTERY_TYPE_ALKALINE, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(BATTERY_TYPE_ALKALINE, TM_OPTION_ENABLE)
TMDEF_OPTION_TEXT_S(BATTERY_TYPE_NI_MH, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(BATTERY_TYPE_NI_MH, TM_OPTION_ENABLE)
TMDEF_OPTION_TEXT_S(BATTERY_TYPE_LITHIUM, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(BATTERY_TYPE_LITHIUM, TM_OPTION_ENABLE)
// TMDEF_OPTION_TEXT_S(BATTERY_TYPE_LITH_PACK, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(BATTERY_TYPE_LITH_PACK, TM_OPTION_ENABLE)
TMDEF_END_OPTIONS() TMDEF_END_OPTIONS()
TMDEF_BEGIN_OPTIONS(SD_LOOP) TMDEF_BEGIN_OPTIONS(SD_LOOP)
TMDEF_OPTION_TEXT_S(SD_LOOP_OFF, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(SD_LOOP_OFF, TM_OPTION_ENABLE)

43
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c
View File

@ -214,8 +214,9 @@ static void LV_MenuItem_OnPrev(lv_obj_t* obj)
TM_PAGE *pPage; TM_PAGE *pPage;
TM_ITEM *pItem; TM_ITEM *pItem;
BOOL uSel_Jump = false; BOOL uSel_Jump = false;
pPage = &pMenu->pPages[pMenu->SelPage]; pPage = &pMenu->pPages[pMenu->SelPage];
pItem = &pPage->pItems[pPage->SelItem];
if (pMenu->Status == TMS_ON_TAB){ if (pMenu->Status == TMS_ON_TAB){
if(pPage->SelItem == 0){ if(pPage->SelItem == 0){
// DBG_WRN("already foucs on tab !"); // DBG_WRN("already foucs on tab !");
@ -227,6 +228,10 @@ static void LV_MenuItem_OnPrev(lv_obj_t* obj)
} }
}else{ }else{
OneMore: OneMore:
pItem = &pPage->pItems[pPage->SelItem - 1];
if(((pItem->ItemId == IDM_BATTERY_TYPE) && 0)){
pPage->SelItem = 0;
}
//if item = 0; up key foucs to tab //if item = 0; up key foucs to tab
if(pPage->SelItem == 0){ if(pPage->SelItem == 0){
pMenu->Status = TMS_ON_TAB; pMenu->Status = TMS_ON_TAB;
@ -260,14 +265,21 @@ static void LV_MenuItem_OnNext(lv_obj_t* obj)
TM_PAGE *pPage; TM_PAGE *pPage;
TM_ITEM *pItem; TM_ITEM *pItem;
BOOL uSel_Jump = false; BOOL uSel_Jump = false;
static BOOL FisrtSel_Jump = false;
pPage = &pMenu->pPages[pMenu->SelPage]; pPage = &pMenu->pPages[pMenu->SelPage];
// DBG_DUMP("\r\n %s pMenu Status= %d\r\n", __func__, pMenu->Status); pItem = &pPage->pItems[pPage->SelItem];
if (pMenu->Status == TMS_ON_TAB){ if (pMenu->Status == TMS_ON_TAB){
pMenu->Status = TMS_ON_ITEM; pMenu->Status = TMS_ON_ITEM;
pPage->SelItem = 0; if(((pItem->ItemId == IDM_BATTERY_TYPE) && 0)){
pPage->SelItem = 1;
FisrtSel_Jump = true;
}else{
pPage->SelItem = 0;
}
LV_MenuCommonItem_UpdateContent(pMenu); LV_MenuCommonItem_UpdateContent(pMenu);
lv_plugin_menu_select_item(menu_item, 0); lv_plugin_menu_select_item(menu_item, pPage->SelItem);
}else{ }else{
Onetime: Onetime:
pPage->SelItem++; pPage->SelItem++;
@ -283,15 +295,15 @@ static void LV_MenuItem_OnNext(lv_obj_t* obj)
} }
if(pPage->SelItem >= pPage->Count){ if(pPage->SelItem >= pPage->Count){
pPage->SelItem = 0; if(FisrtSel_Jump /**&& uItem_Locked**/){
pPage->SelItem = 1;
}else{
pPage->SelItem = 0;
}
LV_MenuCommonItem_UpdateContent(pMenu); LV_MenuCommonItem_UpdateContent(pMenu);
lv_plugin_menu_select_item(menu_item, pPage->SelItem); lv_plugin_menu_select_item(menu_item, pPage->SelItem);
return; return;
} }
//#NT#2023/11/03#Eric - begin
//#NT#Support IVOT_N12144_CO-148 -5
PrevSel_Img = false;
//#NT#2023/11/03#Eric - end
LV_MenuCommonItem_UpdateContent(pMenu); LV_MenuCommonItem_UpdateContent(pMenu);
lv_plugin_menu_select_next_item(menu_item); lv_plugin_menu_select_next_item(menu_item);
if(uSel_Jump){ if(uSel_Jump){
@ -707,6 +719,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_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_SEND_TYPE_DIS); lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, LV_PLUGIN_IMG_ID_SF_SEND_TYPE_DIS);
} }
else if (pItem->ItemId == IDM_BATTERY_TYPE && 0)
{
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_SEND_TYPE_DIS);
}
else { else {
lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->IconId); lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->IconId);
} }
@ -722,7 +739,11 @@ static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu)
if(((pPage->SelItem%PER_PAGE_NUM) == 0)&&(pMenu->Status == TMS_ON_ITEM)){ if(((pPage->SelItem%PER_PAGE_NUM) == 0)&&(pMenu->Status == TMS_ON_ITEM)){
lv_plugin_img_set_src(image_option_1_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT2); lv_plugin_img_set_src(image_option_1_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT2);
}else{ }else{
lv_plugin_img_set_src(image_option_1_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT1); if(pItem->ItemId == IDM_BATTERY_TYPE && 0){
lv_plugin_img_set_src(image_option_1_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT_DIS);
} else {
lv_plugin_img_set_src(image_option_1_scr_uiflowmenucommonitem, LV_PLUGIN_IMG_ID_SF_NEXT1);
}
} }
//#NT#2023/11/03#Eric - end //#NT#2023/11/03#Eric - end
if(pItem->ItemId == IDM_NETWORK_SELECTION) if(pItem->ItemId == IDM_NETWORK_SELECTION)