From 8e85e4d273879ad1a5c0ecb3b62cb90fdefc78f9 Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Tue, 9 Jan 2024 19:13:53 +0800 Subject: [PATCH] =?UTF-8?q?10928=20=E8=93=9D=E7=89=99=E5=90=8E=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E9=94=99=E4=B9=B1,=2010792=20=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E6=A1=86=E4=B8=8A=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_all.sh | 6 +-- .../UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c | 46 +++++++++++++------ .../UIFlowMenuCommonOptionEventCallback.c | 2 + .../UIFlowPlay/UIFlowPlayEventCallback.c | 1 + 4 files changed, 39 insertions(+), 16 deletions(-) diff --git a/build_all.sh b/build_all.sh index 913af95c1..4616e2a42 100755 --- a/build_all.sh +++ b/build_all.sh @@ -1,7 +1,7 @@ #!/bin/bash #用于gitlab-ci.yml编译使用 -make app_clean +#make app_clean echo "Start compile." export ROOT_PATH=$PWD @@ -9,7 +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 clean make all > /dev/null cp output/application.bin ../ cp output/rtos-main.bin ../ @@ -18,7 +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 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 04ca71ab8..65bfcefce 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,21 +683,22 @@ 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_label_set_text(labelInit, "Please insert the SIM card and restart the camera"); + 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)); return; - }/* - else if(sf_cardv_4G_status_get() == SF_4G_SEARCHING) - { - printf("[qr_page_task_cb][*x]loading...\n"); - lv_label_set_text(labelInit, "\nQR code loading..."); - }*/ + } else if (ret == 1) { UIMenuStoreInfo *puiPara = sf_ui_para_get(); printf("[qr_page_task_cb]is esim card...%s\n", puiPara->ModuleImei); if (strlen(puiPara->SimIccid) == 0 && strlen(puiPara->ModuleImei) == 0) { - lv_label_set_text(labelInit, "\nPlease restart the camera"); + lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); + lv_label_set_text(labelInit, "Please restart the camera"); + 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)); return; } snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, "true"); @@ -708,7 +709,10 @@ 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_label_set_text(labelInit, "\nPlease restart the camera"); + lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); + lv_label_set_text(labelInit, "Please restart the camera"); + 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)); return; } snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, "false"); @@ -717,16 +721,25 @@ static void qr_page_task_cb(lv_task_t* task){ { if (sf_cardv_4G_status_get() == SF_4G_SEARCHING) { - lv_label_set_text(labelInit, "\nQR code loading..."); + lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); + lv_label_set_text(labelInit, "QR code loading..."); + 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)); } else if (sf_cardv_4G_status_get() == SF_4G_FAIL) { - lv_label_set_text(labelInit, "\nPlease restart the camera"); + lv_obj_align(labelInit, qr_info_msgbox, 0, 0, -25); + lv_label_set_text(labelInit, "Please restart the camera"); + 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)); } return; } else{ - lv_label_set_text(labelInit, "\nPlease restart the camera"); + lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); + lv_label_set_text(labelInit, "Please restart the camera"); + 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)); return; } /*Create a 100x100 QR code*/ @@ -788,13 +801,20 @@ void show_qr_picture_page(lv_obj_t* obj) lv_obj_add_style(labelInit, 0, &gMatrixStylebtn); //lv_label_set_align(labelInit, LV_LABEL_ALIGN_CENTER); //lv_obj_align(labelInit, qr_info_msgbox, LV_ALIGN_CENTER, 0, -30); - lv_obj_align(labelInit, qr_info_msgbox, 0, 0, -30); + 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_label_set_text(labelInit, "Please insert the SIM card and restart the camera"); + 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)); } else{ - lv_label_set_text(labelInit, "\nQR code loading..."); + lv_obj_align(labelInit, qr_info_msgbox, 0, 0, 0); + lv_label_set_text(labelInit, "QR code loading..."); + 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)); } 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 6fd674c52..7c3a8a9f4 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 @@ -1238,6 +1238,8 @@ static void UIFlowMenuCommonOption_ScrClose(lv_obj_t* obj) lv_plugin_menu_set_item_img_id(menu_option, 1, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, itemIconId); lv_plugin_menu_set_item_img_id(menu_option, 2, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, itemIconId); lv_plugin_menu_set_item_img_id(menu_option, 3, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, itemIconId); + extern void hidde_Camera_Info_page(void); + hidde_Camera_Info_page(); } static void UIFlowMenuCommonOption_ChildScrClose(lv_obj_t* obj) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c index 6148a9cda..1f01710ff 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c @@ -1339,6 +1339,7 @@ static void UIFlowPlay_ScrOpen(lv_obj_t* obj) lv_obj_align(label_msgbox, no_file_msgbox, 0, 0, 0); lv_label_set_align(label_msgbox, LV_LABEL_ALIGN_CENTER); lv_label_set_text(label_msgbox, "No File"); + lv_obj_set_y(label_msgbox, 56); } DBG_IND("UIFlowPlay_ScrOpen\r\n");