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

修复send type界面二级菜单没有>

Browse Source
This commit is contained in:
xiehongyan 2023-12-18 18:24:20 +08:00
parent ec7e70b9e0
commit 1724927f57
6 changed files with 80 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_all.sh
View File

@ -9,6 +9,7 @@ export ROOT_PATH=$PWD
cd rtos cd rtos
source build/envsetup.sh source build/envsetup.sh
lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf
#make clean
make all > /dev/null make all > /dev/null
cp output/application.bin ../ cp output/application.bin ../
cp output/rtos-main.bin ../ cp output/rtos-main.bin ../
@ -17,6 +18,7 @@ cp output/rtos-main.bin ../
cd $ROOT_PATH cd $ROOT_PATH
source build/envsetup.sh source build/envsetup.sh
lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01 lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01
#make clean
make all > /dev/null make all > /dev/null
cd $ROOT_PATH cd $ROOT_PATH

11
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c
View File

@ -399,7 +399,7 @@ static void network_scan_task_cb(lv_task_t* task)
return; return;
} }
} }
printf("[%s][*x] Check simcard...\n", __FUNCTION__);
if(sf_cardv_4G_status_get() == SF_4G_SEARCHING) if(sf_cardv_4G_status_get() == SF_4G_SEARCHING)
{ {
printf("[%s]Searching...\n", __FUNCTION__); printf("[%s]Searching...\n", __FUNCTION__);
@ -414,7 +414,10 @@ static void network_scan_task_cb(lv_task_t* task)
} }
else if(sf_cardv_get_is_esim() == 0) else if(sf_cardv_get_is_esim() == 0)
{ {
lv_label_set_text(plabel, "\nNetwork selection is only available with SIM cards that have multiple networks."); lv_label_set_text(plabel, "Network selection is only available with SIM cards that have multiple networks.");
float fontHeight = lv_font_get_line_height(LV_FONT_DEFAULT);
float verPad = (50 - fontHeight)/2;
lv_obj_set_style_pad_top(plabel, verPpad, 0);
Countdown = 3; Countdown = 3;
return; return;
} }
@ -551,8 +554,8 @@ void show_Network_Selection_page(lv_obj_t* obj, lv_obj_t* menu_obj)
plabel = lv_label_create(obj, NULL); plabel = lv_label_create(obj, NULL);
lv_label_set_long_mode(plabel, LV_LABEL_LONG_BREAK); lv_label_set_long_mode(plabel, LV_LABEL_LONG_BREAK);
// lv_label_set_align(plabel, LV_LABEL_ALIGN_CENTER); //lv_label_set_align(plabel, LV_LABEL_ALIGN_CENTER);
lv_label_set_text(plabel, "");
lv_obj_set_pos(plabel, 32, 63); lv_obj_set_pos(plabel, 32, 63);
lv_obj_set_width(plabel, 256); lv_obj_set_width(plabel, 256);
lv_obj_add_style(plabel, 0, &gMatrixStylebtn); lv_obj_add_style(plabel, 0, &gMatrixStylebtn);

43
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c
View File

@ -378,7 +378,7 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
{ {
printf("first init black > √\n"); printf("first init black > √\n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 259, 0);
} }
else{ else{
printf("first init √\n"); printf("first init √\n");
@ -392,27 +392,39 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
{ {
printf("first init IDM_SEND_TYPE black > √\n"); printf("first init IDM_SEND_TYPE black > √\n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 259, 0);
} }
else if (i == 2) else if (i == 2)
{ {
printf("first init IDM_SEND_TYPE black > √\n"); printf("first init IDM_SEND_TYPE black > √\n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √
lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 259, 0);
} }
else if (i == 3) else if (i == 3)
{ {
printf("first init IDM_SEND_TYPE black > √\n"); printf("first init IDM_SEND_TYPE black > √\n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √
lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 259, 0);
} }
break; break;
} }
default: default:
{ {
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); if(i == 1)
break; {
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0);
}
else if (i == 2)
{
lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 272, 0);
}
else if (i == 3)
{
lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 272, 0);
}
} }
} }
ui_hidden = false; ui_hidden = false;
@ -463,17 +475,17 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
{ {
case 1: case 1:
{ {
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 259, 0);
break; break;
} }
case 2: case 2:
{ {
lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 259, 0);
break; break;
} }
case 3: case 3:
{ {
lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 259, 0);
break; break;
} }
default: default:
@ -558,12 +570,12 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
else if (s_SelOption == 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption){ else if (s_SelOption == 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption){
printf("[LV_MenuCommonOption_UpdateContent] add black √ > \n"); printf("[LV_MenuCommonOption_UpdateContent] add black √ > \n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 262, 0); lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 259, 0);
} }
else{ else{
printf("[LV_MenuCommonOption_UpdateContent] add white √ > \n"); printf("[LV_MenuCommonOption_UpdateContent] add white √ > \n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT1;//white > √ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT1;//white > √
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 259, 0);
} }
ui_hidden = false; ui_hidden = false;
break; break;
@ -584,7 +596,14 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
} }
else if (i == s_SelOption){ else if (i == s_SelOption){
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); if (i == 2)
{
lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 272, 0);
}
else if (i == 3)
{
lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 272, 0);
}
ui_hidden = false; ui_hidden = false;
} }
} }

2
code/application/source/cardv/SrcCode/UIWnd/s530-ntk/build_all.sh
View File

@ -9,6 +9,7 @@ export ROOT_PATH=$PWD
cd rtos cd rtos
source build/envsetup.sh source build/envsetup.sh
lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf
#make clean
make all > /dev/null make all > /dev/null
cp output/application.bin ../ cp output/application.bin ../
cp output/rtos-main.bin ../ cp output/rtos-main.bin ../
@ -17,6 +18,7 @@ cp output/rtos-main.bin ../
cd $ROOT_PATH cd $ROOT_PATH
source build/envsetup.sh source build/envsetup.sh
lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01 lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01
#make clean
make all > /dev/null make all > /dev/null
cd $ROOT_PATH cd $ROOT_PATH

11
code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c
View File

@ -399,7 +399,7 @@ static void network_scan_task_cb(lv_task_t* task)
return; return;
} }
} }
printf("[%s][*x] Check simcard...\n", __FUNCTION__);
if(sf_cardv_4G_status_get() == SF_4G_SEARCHING) if(sf_cardv_4G_status_get() == SF_4G_SEARCHING)
{ {
printf("[%s]Searching...\n", __FUNCTION__); printf("[%s]Searching...\n", __FUNCTION__);
@ -414,7 +414,10 @@ static void network_scan_task_cb(lv_task_t* task)
} }
else if(sf_cardv_get_is_esim() == 0) else if(sf_cardv_get_is_esim() == 0)
{ {
lv_label_set_text(plabel, "\nNetwork selection is only available with SIM cards that have multiple networks."); lv_label_set_text(plabel, "Network selection is only available with SIM cards that have multiple networks.");
float fontHeight = lv_font_get_line_height(LV_FONT_DEFAULT);
float verPad = (50 - fontHeight)/2;
lv_obj_set_style_pad_top(plabel, verPpad, 0);
Countdown = 3; Countdown = 3;
return; return;
} }
@ -551,8 +554,8 @@ void show_Network_Selection_page(lv_obj_t* obj, lv_obj_t* menu_obj)
plabel = lv_label_create(obj, NULL); plabel = lv_label_create(obj, NULL);
lv_label_set_long_mode(plabel, LV_LABEL_LONG_BREAK); lv_label_set_long_mode(plabel, LV_LABEL_LONG_BREAK);
// lv_label_set_align(plabel, LV_LABEL_ALIGN_CENTER); //lv_label_set_align(plabel, LV_LABEL_ALIGN_CENTER);
lv_label_set_text(plabel, "");
lv_obj_set_pos(plabel, 32, 63); lv_obj_set_pos(plabel, 32, 63);
lv_obj_set_width(plabel, 256); lv_obj_set_width(plabel, 256);
lv_obj_add_style(plabel, 0, &gMatrixStylebtn); lv_obj_add_style(plabel, 0, &gMatrixStylebtn);

43
code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c
View File

@ -378,7 +378,7 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
{ {
printf("first init black > √\n"); printf("first init black > √\n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 259, 0);
} }
else{ else{
printf("first init √\n"); printf("first init √\n");
@ -392,27 +392,39 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
{ {
printf("first init IDM_SEND_TYPE black > √\n"); printf("first init IDM_SEND_TYPE black > √\n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 259, 0);
} }
else if (i == 2) else if (i == 2)
{ {
printf("first init IDM_SEND_TYPE black > √\n"); printf("first init IDM_SEND_TYPE black > √\n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √
lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 259, 0);
} }
else if (i == 3) else if (i == 3)
{ {
printf("first init IDM_SEND_TYPE black > √\n"); printf("first init IDM_SEND_TYPE black > √\n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √
lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 259, 0);
} }
break; break;
} }
default: default:
{ {
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); if(i == 1)
break; {
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0);
}
else if (i == 2)
{
lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 272, 0);
}
else if (i == 3)
{
lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 272, 0);
}
} }
} }
ui_hidden = false; ui_hidden = false;
@ -463,17 +475,17 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
{ {
case 1: case 1:
{ {
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 259, 0);
break; break;
} }
case 2: case 2:
{ {
lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 259, 0);
break; break;
} }
case 3: case 3:
{ {
lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 259, 0);
break; break;
} }
default: default:
@ -558,12 +570,12 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
else if (s_SelOption == 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption){ else if (s_SelOption == 1 && enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption){
printf("[LV_MenuCommonOption_UpdateContent] add black √ > \n"); printf("[LV_MenuCommonOption_UpdateContent] add black √ > \n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2;//black > √
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 262, 0); lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 259, 0);
} }
else{ else{
printf("[LV_MenuCommonOption_UpdateContent] add white √ > \n"); printf("[LV_MenuCommonOption_UpdateContent] add white √ > \n");
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT1;//white > √ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT1;//white > √
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 259, 0);
} }
ui_hidden = false; ui_hidden = false;
break; break;
@ -584,7 +596,14 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
} }
else if (i == s_SelOption){ else if (i == s_SelOption){
itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√
lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); if (i == 2)
{
lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 272, 0);
}
else if (i == 3)
{
lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 272, 0);
}
ui_hidden = false; ui_hidden = false;
} }
} }