diff --git a/build_all.sh b/build_all.sh index 4616e2a42..913af95c1 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.rar b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM.rar index a5b4a7756..22bdf0425 100644 Binary files a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM.rar and b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM.rar 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 afaacf662..b315bdfa4 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 @@ -693,9 +693,9 @@ static void qr_page_task_cb(lv_task_t* task){ { 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) + if (strlen(puiPara->SimIccid) == 0 && strlen(puiPara->ModuleImei) == 0) { - lv_label_set_text(labelInit, "Please restart the camera"); + lv_label_set_text(labelInit, "\nPlease restart the camera"); return; } snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, "true"); @@ -704,9 +704,9 @@ static void qr_page_task_cb(lv_task_t* task){ { UIMenuStoreInfo *puiPara = sf_ui_para_get(); 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, "Please restart the camera"); + lv_label_set_text(labelInit, "\nPlease restart the camera"); return; } snprintf(qr_date, QR_DATA_LENGTH, qr_code_str, puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, "false"); @@ -784,9 +784,10 @@ void show_qr_picture_page(lv_obj_t* obj) lv_obj_set_hidden(qr_info_msgbox, false); labelInit = lv_label_create(qr_info_msgbox, label_msg_scr_uiflowwrnmsg); 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); - lv_obj_align(labelInit, qr_info_msgbox, LV_ALIGN_CENTER, 0, -30); - if (sf_cardv_get_sim_insert() == 0){ lv_label_set_text(labelInit, "Please insert the SIM card and restart the camera"); } 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 90a501335..2a6ad4902 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 @@ -319,6 +319,10 @@ void Option_play_Selection_Key(lv_obj_t* obj, uint32_t key) UIFlowMenuCommonConfirmAPI_Open(IDM_DELETE_THIS); break; } + else + { + lv_obj_set_hidden(no_file_msgbox, false); + } } else //GO TO STORAGE OPTIONS { @@ -1303,9 +1307,9 @@ static void UIFlowPlay_ScrOpen(lv_obj_t* obj) no_file_msgbox = lv_btn_create(obj, button_msg_bg_scr_uiflowwrnmsg); lv_obj_set_hidden(no_file_msgbox, true); is_no_file = 0; - label_msgbox = lv_label_create(no_file_msgbox, label_msg_scr_uiflowwrnmsg); + label_msgbox = lv_label_create(no_file_msgbox, label_msg_scr_uiflowwrnmsg); + lv_obj_align(label_msgbox, no_file_msgbox, 0, 0, 0); lv_label_set_align(label_msgbox, LV_LABEL_ALIGN_CENTER); - lv_obj_align(label_msgbox, no_file_msgbox, LV_ALIGN_CENTER, 0, 0); lv_label_set_text(label_msgbox, "No File"); } diff --git a/code/lib/source/playback/libplayback.a b/code/lib/source/playback/libplayback.a index bb1f96583..9c7074b3e 100644 Binary files a/code/lib/source/playback/libplayback.a and b/code/lib/source/playback/libplayback.a differ diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c index a6be3d4b7..64812fc8e 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -284,7 +284,7 @@ void sf_mode_detect(void) } else if((sf_get_pir_statu_flag()) && (CMD_FORMAT_SD_STA != sf_get_card_statu())) { - //printf("[sf_mode_detect][*x] empezar going to pir................................\n"); + printf("[sf_mode_detect]start going to pir...\n"); pwroffcnt++; //printf("[%s:%d]pwroffcnt=%d\n",__FUNCTION__,__LINE__,pwroffcnt); //sf_enter_auto_mode_count_down_show(4 - pwroffcnt); @@ -348,7 +348,7 @@ void sf_mode_detect(void) } else */if(AutoOfftime == KeepAliveTime_s - 1) { - sf_set_pir_statu_flag(TRUE); + //sf_set_pir_statu_flag(TRUE); //countDownOffFlg = 0; //sf_sys_status_led_set(SF_LED_SYS_STATE_GOING_TO_PIR); }