diff --git a/build_all.sh b/build_all.sh index 021b279f6..1b9785abd 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 bear 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 bear make all > /dev/null cd $ROOT_PATH diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c index f8fdce837..a5e3a50ef 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c @@ -327,7 +327,7 @@ void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID) case IDM_ENTER_WORK_MODE: strID = LV_PLUGIN_STRING_ID_STRING_ENTER_WORK_MODE; gBKGEvt = NVTEVT_BKW_ENTER_WORK_MODE; - lv_label_set_text(Confirm_label, "Enter Work Mdoe"); + lv_label_set_text(Confirm_label, "Enter Work Mode"); break; default: gBKGEvt = 0; 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 01d6812f4..02db893bb 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 @@ -798,7 +798,8 @@ void show_qr_picture_page(lv_obj_t* obj) qr_info_msgbox = lv_btn_create(obj, button_msg_bg_scr_uiflowwrnmsg); 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_obj_add_style(labelInit, 0, &gStyleLabel0); + //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);