From 59a981e2b51e48b6a2ec2a16e69aa1d5871d63d1 Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Mon, 22 Jan 2024 10:36:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=96=87=E5=AD=97=E5=B7=A6=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c | 40 +++++++++++-------- 1 file changed, 24 insertions(+), 16 deletions(-) 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 7f5fa098f..508b93e56 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 @@ -683,10 +683,11 @@ static void qr_page_task_cb(lv_task_t* task){ if (sf_cardv_get_sim_insert() == 0) { //printf("[qr_page_task_cb]no sim card...\n"); - lv_obj_align(labelInit, qr_info_msgbox, 0, 0, -25); + //lv_obj_align(labelInit, qr_info_msgbox, 0, 0, -25); lv_label_set_text(labelInit, "Please insert the SIM card and restart the camera"); + lv_obj_set_x(labelInit, 8); lv_obj_set_y(labelInit, 31); - printf("Please insert the SIM card and restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); + //printf("Please insert the SIM card and restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); return; } else if (ret == 1) @@ -695,10 +696,11 @@ static void qr_page_task_cb(lv_task_t* task){ printf("[qr_page_task_cb]is esim card...%s\n", puiPara->ModuleImei); if (strlen(puiPara->SimIccid) == 0 && strlen(puiPara->ModuleImei) == 0) { - lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); + //lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); lv_label_set_text(labelInit, "Please restart the camera"); + lv_obj_set_x(labelInit, 8); lv_obj_set_y(labelInit, 56); - printf("Please restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); + //printf("Please restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); return; } snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, "true"); @@ -709,10 +711,11 @@ static void qr_page_task_cb(lv_task_t* task){ printf("[qr_page_task_cb]is sim card...%s\n", puiPara->ModuleImei); if (strlen(puiPara->SimIccid) == 0 && strlen(puiPara->ModuleImei) == 0) { - lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); + //lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); lv_label_set_text(labelInit, "Please restart the camera"); + lv_obj_set_x(labelInit, 8); lv_obj_set_y(labelInit, 56); - printf("Please restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); + //printf("Please restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); return; } snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, "false"); @@ -721,25 +724,28 @@ static void qr_page_task_cb(lv_task_t* task){ { if (sf_cardv_4G_status_get() == SF_4G_SEARCHING) { - lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); + //lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); lv_label_set_text(labelInit, "QR code loading..."); + lv_obj_set_x(labelInit, 8); lv_obj_set_y(labelInit, 56); - printf("QR code loading... X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); + //printf("QR code loading... X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); } else if (sf_cardv_4G_status_get() == SF_4G_FAIL) { - lv_obj_align(labelInit, qr_info_msgbox, 0, 0, -25); + //lv_obj_align(labelInit, qr_info_msgbox, 0, 0, -25); lv_label_set_text(labelInit, "Please restart the camera"); + lv_obj_set_x(labelInit, 8); lv_obj_set_y(labelInit, 56); - printf("Please restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); + //printf("Please restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); } return; } else{ - lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); + //lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); lv_label_set_text(labelInit, "Please restart the camera"); + lv_obj_set_x(labelInit, 8); lv_obj_set_y(labelInit, 56); - printf("Please restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); + //printf("Please restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); return; } /*Create a 100x100 QR code*/ @@ -803,19 +809,21 @@ void show_qr_picture_page(lv_obj_t* obj) //lv_label_set_align(labelInit, LV_LABEL_ALIGN_CENTER); //lv_obj_align(labelInit, qr_info_msgbox, LV_ALIGN_CENTER, 0, -30); - lv_label_set_align(labelInit, LV_LABEL_ALIGN_CENTER); + //lv_label_set_align(labelInit, LV_LABEL_ALIGN_CENTER); if (sf_cardv_get_sim_insert() == 0){ - lv_obj_align(labelInit, qr_info_msgbox, 0, 0, -25); + //lv_obj_align(labelInit, qr_info_msgbox, 0, 0, -25); lv_label_set_text(labelInit, "Please insert the SIM card and restart the camera"); + lv_obj_set_x(labelInit, 8); lv_obj_set_y(labelInit, 31); - printf("Please insert the SIM card and restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); + //printf("Please insert the SIM card and restart the camera X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); } else{ lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); lv_label_set_text(labelInit, "QR code loading..."); + lv_obj_set_x(labelInit, 8); lv_obj_set_y(labelInit, 56); - printf("QR code loading... X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); + //printf("QR code loading... X: %d, Y: %d\n", lv_obj_get_x(labelInit), lv_obj_get_y(labelInit)); }