payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc

Browse Source
This commit is contained in:
payton 2024-01-09 19:28:46 +08:00
commit 1efad71d96
4 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_all.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
#用于gitlab-ci.yml编译使用 #用于gitlab-ci.yml编译使用
make app_clean #make app_clean
echo "Start compile." echo "Start compile."
export ROOT_PATH=$PWD export ROOT_PATH=$PWD
@ -9,7 +9,7 @@ export ROOT_PATH=$PWD
cd rtos cd rtos
source build/envsetup.sh source build/envsetup.sh
lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf 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 make all > /dev/null
cp output/application.bin ../ cp output/application.bin ../
cp output/rtos-main.bin ../ cp output/rtos-main.bin ../
@ -18,7 +18,7 @@ cp output/rtos-main.bin ../
cd $ROOT_PATH cd $ROOT_PATH
source build/envsetup.sh source build/envsetup.sh
lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01 lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01
make clean #make clean
make all > /dev/null make all > /dev/null
cd $ROOT_PATH cd $ROOT_PATH

46
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c
View File

@ -683,21 +683,22 @@ static void qr_page_task_cb(lv_task_t* task){
if (sf_cardv_get_sim_insert() == 0) if (sf_cardv_get_sim_insert() == 0)
{ {
//printf("[qr_page_task_cb]no sim card...\n"); //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_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; 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) else if (ret == 1)
{ {
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
printf("[qr_page_task_cb]is esim card...%s\n", puiPara->ModuleImei); printf("[qr_page_task_cb]is esim card...%s\n", puiPara->ModuleImei);
if (strlen(puiPara->SimIccid) == 0 && strlen(puiPara->ModuleImei) == 0) 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; return;
} }
snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, "true"); 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); printf("[qr_page_task_cb]is sim card...%s\n", puiPara->ModuleImei);
if (strlen(puiPara->SimIccid) == 0 && strlen(puiPara->ModuleImei) == 0) 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; return;
} }
snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, "false"); 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) 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) 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; return;
} }
else{ 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; return;
} }
/*Create a 100x100 QR code*/ /*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_obj_add_style(labelInit, 0, &gMatrixStylebtn);
//lv_label_set_align(labelInit, LV_LABEL_ALIGN_CENTER); //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, LV_ALIGN_CENTER, 0, -30);
lv_obj_align(labelInit, qr_info_msgbox, 0, 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){ 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_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{ 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));
} }

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c
View File

@ -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, 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, 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); 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) static void UIFlowMenuCommonOption_ChildScrClose(lv_obj_t* obj)

1
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c
View File

@ -1339,6 +1339,7 @@ static void UIFlowPlay_ScrOpen(lv_obj_t* obj)
lv_obj_align(label_msgbox, no_file_msgbox, 0, 0, 0); lv_obj_align(label_msgbox, no_file_msgbox, 0, 0, 0);
lv_label_set_align(label_msgbox, LV_LABEL_ALIGN_CENTER); lv_label_set_align(label_msgbox, LV_LABEL_ALIGN_CENTER);
lv_label_set_text(label_msgbox, "No File"); lv_label_set_text(label_msgbox, "No File");
lv_obj_set_y(label_msgbox, 56);
} }
DBG_IND("UIFlowPlay_ScrOpen\r\n"); DBG_IND("UIFlowPlay_ScrOpen\r\n");