diff --git a/BSP/linux-kernel/.48720.tmp b/BSP/linux-kernel/.48720.tmp new file mode 100644 index 000000000..50eb84054 Binary files /dev/null and b/BSP/linux-kernel/.48720.tmp differ 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 e37f256ba..6d26011d1 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 @@ -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]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); } }