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 8bebbfc90..282a7dd5e 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.UIFlowMovie.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr index 9aae795c2..180acfda7 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr @@ -1833,7 +1833,7 @@ "x": 0, "y": 98 }, - "hidden": false, + "hidden": true, "locked": false, "long mode": "Roll", "name": "label_sim", @@ -1891,7 +1891,7 @@ "x": 0, "y": 119 }, - "hidden": false, + "hidden": true, "locked": false, "long mode": "Roll", "name": "label_line", diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c index 6420fd164..0ed342f9f 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c @@ -1816,7 +1816,7 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_sim_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_sim_s0, LV_STATE_DISABLED, color); lv_obj_t *label_sim = lv_label_create(parent, NULL); - lv_obj_set_hidden(label_sim, false); + lv_obj_set_hidden(label_sim, true); lv_obj_set_click(label_sim, false); lv_obj_set_drag(label_sim, false); lv_plugin_label_allocate_ext_attr(label_sim); @@ -1880,7 +1880,7 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_DISABLED, color); lv_obj_t *label_line = lv_label_create(parent, NULL); - lv_obj_set_hidden(label_line, false); + lv_obj_set_hidden(label_line, true); lv_obj_set_click(label_line, false); lv_obj_set_drag(label_line, false); lv_plugin_label_allocate_ext_attr(label_line); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c index 82ddeb6f4..283da5046 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c @@ -1851,6 +1851,16 @@ static void UIFlowPhoto_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* m sf_show_send_text(obj, msg->paramArray[0]); break; } + case NVTEVT_STRG_ATTACH: + { + g_SysStrg_Chg = false; + UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum); + printf("[*x]===================================================================================\n"); + DBG_DUMP("UI_StorageCheck: g_uiFreePicNum = 0x%ld\r\n", g_uiFreePicNum); + lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum)); + break; + } + default: break; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c index 3658f7e9c..ab157e9bc 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c @@ -327,15 +327,16 @@ void message_box_wrnmsg_OnKey(lv_obj_t* msgbox, uint32_t key) { case LV_USER_KEY_MENU: // message_box_wrnmsg_OnKeyMenu(msgbox); + break; + //#NT#2023/11/14#Eric - begin + //#NT#Support IVOT_N12144_CO-148_A + case LV_KEY_ENTER: + // UIFlowWrnMsg_CloseScr(NVTEVT_NULL); if(evt != NVTEVT_NULL){ UIFlowWrnMsg_CloseScr(evt); }else{ UIFlowWrnMsg_CloseScr(NVTEVT_NULL); } - //#NT#2023/11/14#Eric - begin - //#NT#Support IVOT_N12144_CO-148_A - case LV_KEY_ENTER: - // UIFlowWrnMsg_CloseScr(NVTEVT_NULL); break; //#NT#2023/11/14#Eric - end default: