From 453ca794d59e9c5df4ce7f08d772063e0e73bd3b Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Tue, 19 Dec 2023 10:06:17 +0800 Subject: [PATCH] =?UTF-8?q?bug:10415=20=E4=BF=AE=E5=A4=8D=E8=BF=9B?= =?UTF-8?q?=E5=85=A5network=E4=BC=9A=E9=BB=91=E5=B1=8F=E4=B8=80=E6=AE=B5?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BSP/linux-kernel/.48720.tmp | Bin 0 -> 768 bytes .../UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c | 23 +++++++++++------- .../UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c | 16 ++++++------ 3 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 BSP/linux-kernel/.48720.tmp diff --git a/BSP/linux-kernel/.48720.tmp b/BSP/linux-kernel/.48720.tmp new file mode 100644 index 0000000000000000000000000000000000000000..50eb840545eda0b881894cd1a9dda37acce2f685 GIT binary patch literal 768 zcmah{QBT4!5Wa28c%M9wE#W@2egEETiQ~o@_ql*T;8q#Qa0KiSq0@E)C|1^j5-VF3YtyQ-8r!nB*$%5) zd&Pr%b=_6oQ-F_8?bWNj)GdGwRz8f}Ug6FPFRbt)z;r$y1Mu`^qGX6xCE7k3q@rg9 zd?=L!9;PYqK|Gm6Q}j(^74hC}-%XVqJOK~xZn#t`8HIBdrAwv$B)b@;xv`st==;wI z8gnQ688%b?mUo1CCDi}&PO|gp(Mae#zCe1Rx}>L>)n0(mfXtfyy2!ES%!DbgWe8f6 tM>hX*@5tX!sb^AprFB&Necv-6geq<{cSPKrw}IHqO8zuser_data; - + printf("[%s]Check simcard...\n", __FUNCTION__); if(Countdown) { printf("[%s]Countdown:%d\n", __FUNCTION__, Countdown); @@ -399,7 +399,6 @@ 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,10 +413,7 @@ static void network_scan_task_cb(lv_task_t* task) } else if(sf_cardv_get_is_esim() == 0) { - 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); + lv_label_set_text(plabel, "\nNetwork selection is only available with SIM cards that have multiple networks."); Countdown = 3; return; } @@ -556,12 +552,21 @@ void show_Network_Selection_page(lv_obj_t* obj, lv_obj_t* menu_obj) lv_label_set_long_mode(plabel, LV_LABEL_LONG_BREAK); //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, 67); lv_obj_set_width(plabel, 256); lv_obj_add_style(plabel, 0, &gMatrixStylebtn); + lv_task_t tas = { + 0, + 0, + NULL, + NULL, + 0, + 3, + }; + network_scan_task_cb(&tas); if(network_scan_task == NULL){ Countdown = 0; - network_scan_task = lv_task_create(network_scan_task_cb, 1000, LV_TASK_PRIO_MID, (void*)obj); + network_scan_task = lv_task_create(network_scan_task_cb, 1000, LV_TASK_PRIO_HIGHEST, (void*)obj); } } 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 e37f256ba..996cf49dc 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 @@ -380,9 +380,9 @@ static void network_scan_task_cb(lv_task_t* task) int fd = -1; int BuffLen; unsigned char Buff[1024] = { 0 }; - //lv_label_set_text(plabel, "\n\nSearching..."); + lv_obj_t* obj = (lv_obj_t*)task->user_data; - + printf("[%s][*x] Check simcard...\n", __FUNCTION__); if(Countdown) { printf("[%s]Countdown:%d\n", __FUNCTION__, Countdown); @@ -399,7 +399,6 @@ 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,10 +413,7 @@ static void network_scan_task_cb(lv_task_t* task) } else if(sf_cardv_get_is_esim() == 0) { - 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); + lv_label_set_text(plabel, "\nNetwork selection is only available with SIM cards that have multiple networks."); Countdown = 3; return; } @@ -556,12 +552,14 @@ void show_Network_Selection_page(lv_obj_t* obj, lv_obj_t* menu_obj) lv_label_set_long_mode(plabel, LV_LABEL_LONG_BREAK); //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, 67); lv_obj_set_width(plabel, 256); lv_obj_add_style(plabel, 0, &gMatrixStylebtn); + lv_task_t tas = {}; + network_scan_task_cb(&tas); if(network_scan_task == NULL){ Countdown = 0; - network_scan_task = lv_task_create(network_scan_task_cb, 1000, LV_TASK_PRIO_MID, (void*)obj); + network_scan_task = lv_task_create(network_scan_task_cb, 1000, LV_TASK_PRIO_HIGHEST, (void*)obj); } }