Cancel code of ding about item screen.
This commit is contained in:
parent
c3891c3ac5
commit
43cd5a0844
|
@ -216,7 +216,7 @@ static void LV_MenuItem_OnPrev(lv_obj_t* obj)
|
||||||
BOOL uSel_Jump = false;
|
BOOL uSel_Jump = false;
|
||||||
|
|
||||||
pPage = &pMenu->pPages[pMenu->SelPage];
|
pPage = &pMenu->pPages[pMenu->SelPage];
|
||||||
pItem = &pPage->pItems[pPage->SelItem];
|
// 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 !");
|
||||||
|
@ -228,10 +228,10 @@ static void LV_MenuItem_OnPrev(lv_obj_t* obj)
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
OneMore:
|
OneMore:
|
||||||
pItem = &pPage->pItems[pPage->SelItem - 1];
|
// pItem = &pPage->pItems[pPage->SelItem - 1];
|
||||||
if(((pItem->ItemId == IDM_BATTERY_TYPE) && 0)){
|
// if(((pItem->ItemId == IDM_BATTERY_TYPE) && 0)){
|
||||||
pPage->SelItem = 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;
|
||||||
|
@ -241,8 +241,6 @@ static void LV_MenuItem_OnPrev(lv_obj_t* obj)
|
||||||
}
|
}
|
||||||
pPage->SelItem--;
|
pPage->SelItem--;
|
||||||
pItem = &pPage->pItems[pPage->SelItem];
|
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) ||
|
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_MODULE_FW_UPGRADE && is_module_fw_upgrade() == NOT_UPGRADABLE) ||
|
||||||
(pItem->ItemId == IDM_SEND_TYPE && is_send_type_disabel() == SEND_TYPE_DISABLE)) {
|
(pItem->ItemId == IDM_SEND_TYPE && is_send_type_disabel() == SEND_TYPE_DISABLE)) {
|
||||||
|
@ -265,27 +263,28 @@ 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;
|
// static BOOL FisrtSel_Jump = false;
|
||||||
|
|
||||||
pPage = &pMenu->pPages[pMenu->SelPage];
|
pPage = &pMenu->pPages[pMenu->SelPage];
|
||||||
pItem = &pPage->pItems[pPage->SelItem];
|
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;
|
||||||
if(((pItem->ItemId == IDM_BATTERY_TYPE) && 0)){
|
|
||||||
pPage->SelItem = 1;
|
|
||||||
FisrtSel_Jump = true;
|
|
||||||
}else{
|
|
||||||
pPage->SelItem = 0;
|
pPage->SelItem = 0;
|
||||||
}
|
// pMenu->Status = TMS_ON_ITEM;
|
||||||
|
// 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, pPage->SelItem);
|
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++;
|
||||||
pItem = &pPage->pItems[pPage->SelItem];
|
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) ||
|
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_MODULE_FW_UPGRADE && is_module_fw_upgrade() == NOT_UPGRADABLE) ||
|
||||||
(pItem->ItemId == IDM_SEND_TYPE && is_send_type_disabel() == SEND_TYPE_DISABLE)){
|
(pItem->ItemId == IDM_SEND_TYPE && is_send_type_disabel() == SEND_TYPE_DISABLE)){
|
||||||
|
@ -295,15 +294,21 @@ static void LV_MenuItem_OnNext(lv_obj_t* obj)
|
||||||
}
|
}
|
||||||
|
|
||||||
if(pPage->SelItem >= pPage->Count){
|
if(pPage->SelItem >= pPage->Count){
|
||||||
if(FisrtSel_Jump /**&& uItem_Locked**/){
|
|
||||||
pPage->SelItem = 1;
|
|
||||||
}else{
|
|
||||||
pPage->SelItem = 0;
|
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){
|
||||||
|
|
Loading…
Reference in New Issue
Block a user