From 1724927f578965c6f556aae6ea75370f75ab1193 Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Mon, 18 Dec 2023 18:24:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsend=20type=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E8=8F=9C=E5=8D=95=E6=B2=A1=E6=9C=89>?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_all.sh | 2 + .../UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c | 11 +++-- .../UIFlowMenuCommonOptionEventCallback.c | 43 +++++++++++++------ .../cardv/SrcCode/UIWnd/s530-ntk/build_all.sh | 2 + .../UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c | 11 +++-- .../UIFlowMenuCommonOptionEventCallback.c | 43 +++++++++++++------ 6 files changed, 80 insertions(+), 32 deletions(-) diff --git a/build_all.sh b/build_all.sh index 6920cd9e7..4616e2a42 100755 --- a/build_all.sh +++ b/build_all.sh @@ -9,6 +9,7 @@ export ROOT_PATH=$PWD cd rtos source build/envsetup.sh 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 cp output/application.bin ../ cp output/rtos-main.bin ../ @@ -17,6 +18,7 @@ cp output/rtos-main.bin ../ cd $ROOT_PATH source build/envsetup.sh lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01 +#make clean make all > /dev/null cd $ROOT_PATH diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c index c3c443552..e37f256ba 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c @@ -399,7 +399,7 @@ static void network_scan_task_cb(lv_task_t* task) return; } } - + printf("[%s][*x] Check simcard...\n", __FUNCTION__); if(sf_cardv_4G_status_get() == SF_4G_SEARCHING) { 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) { - 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; 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); 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_width(plabel, 256); lv_obj_add_style(plabel, 0, &gMatrixStylebtn); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c index 0b1b8eacd..a1244c2b4 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c @@ -378,7 +378,7 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) { printf("first init black > √\n"); 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{ printf("first init √\n"); @@ -392,27 +392,39 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) { printf("first init IDM_SEND_TYPE black > √\n"); 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) { printf("first init IDM_SEND_TYPE black > √\n"); 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) { printf("first init IDM_SEND_TYPE black > √\n"); 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; } default: { itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); - break; + if(i == 1) + { + 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; @@ -463,17 +475,17 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) { case 1: { - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 259, 0); break; } case 2: { - lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 260, 0); + lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 259, 0); break; } case 3: { - lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 260, 0); + lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 259, 0); break; } 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){ printf("[LV_MenuCommonOption_UpdateContent] add black √ > \n"); 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{ printf("[LV_MenuCommonOption_UpdateContent] add white √ > \n"); 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; break; @@ -584,7 +596,14 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) } else if (i == s_SelOption){ 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; } } diff --git a/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/build_all.sh b/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/build_all.sh index 6920cd9e7..4616e2a42 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/build_all.sh +++ b/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/build_all.sh @@ -9,6 +9,7 @@ export ROOT_PATH=$PWD cd rtos source build/envsetup.sh 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 cp output/application.bin ../ cp output/rtos-main.bin ../ @@ -17,6 +18,7 @@ cp output/rtos-main.bin ../ cd $ROOT_PATH source build/envsetup.sh lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01 +#make clean make all > /dev/null cd $ROOT_PATH diff --git a/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c b/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c index c3c443552..e37f256ba 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c +++ b/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c @@ -399,7 +399,7 @@ static void network_scan_task_cb(lv_task_t* task) return; } } - + printf("[%s][*x] Check simcard...\n", __FUNCTION__); if(sf_cardv_4G_status_get() == SF_4G_SEARCHING) { 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) { - 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; 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); 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_width(plabel, 256); lv_obj_add_style(plabel, 0, &gMatrixStylebtn); diff --git a/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c index 0b1b8eacd..a1244c2b4 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/s530-ntk/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c @@ -378,7 +378,7 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) { printf("first init black > √\n"); 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{ printf("first init √\n"); @@ -392,27 +392,39 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) { printf("first init IDM_SEND_TYPE black > √\n"); 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) { printf("first init IDM_SEND_TYPE black > √\n"); 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) { printf("first init IDM_SEND_TYPE black > √\n"); 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; } default: { itemIconId = LV_PLUGIN_IMG_ID_SF_LIST_SELECTED;//√ - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 272, 0); - break; + if(i == 1) + { + 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; @@ -463,17 +475,17 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) { case 1: { - lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 260, 0); + lv_obj_set_pos(image_option2_scr_uiflowmenucommonoption, 259, 0); break; } case 2: { - lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 260, 0); + lv_obj_set_pos(image_option3_scr_uiflowmenucommonoption, 259, 0); break; } case 3: { - lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 260, 0); + lv_obj_set_pos(image_option4_scr_uiflowmenucommonoption, 259, 0); break; } 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){ printf("[LV_MenuCommonOption_UpdateContent] add black √ > \n"); 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{ printf("[LV_MenuCommonOption_UpdateContent] add white √ > \n"); 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; break; @@ -584,7 +596,14 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) } else if (i == s_SelOption){ 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; } }