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

BUG10607,10610 录像模式下去掉红线和Searching

Browse Source
This commit is contained in:
xiehongyan 2023-12-27 18:56:47 +08:00
parent b08b85b0c6
commit e7eb26c266
6 changed files with 22 additions and 11 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

BIN
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM.rar
View File

Binary file not shown.

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr
View File

@ -1833,7 +1833,7 @@
"x": 0, "x": 0,
"y": 98 "y": 98
}, },
"hidden": false, "hidden": true,
"locked": false, "locked": false,
"long mode": "Roll", "long mode": "Roll",
"name": "label_sim", "name": "label_sim",
@ -1891,7 +1891,7 @@
"x": 0, "x": 0,
"y": 119 "y": 119
}, },
"hidden": false, "hidden": true,
"locked": false, "locked": false,
"long mode": "Roll", "long mode": "Roll",
"name": "label_line", "name": "label_line",

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c
View File

@ -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(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); 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_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_click(label_sim, false);
lv_obj_set_drag(label_sim, false); lv_obj_set_drag(label_sim, false);
lv_plugin_label_allocate_ext_attr(label_sim); 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(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); 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_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_click(label_line, false);
lv_obj_set_drag(label_line, false); lv_obj_set_drag(label_line, false);
lv_plugin_label_allocate_ext_attr(label_line); lv_plugin_label_allocate_ext_attr(label_line);

10
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
View File

@ -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]); sf_show_send_text(obj, msg->paramArray[0]);
break; 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: default:
break; break;

9
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c
View File

@ -327,15 +327,16 @@ void message_box_wrnmsg_OnKey(lv_obj_t* msgbox, uint32_t key)
{ {
case LV_USER_KEY_MENU: case LV_USER_KEY_MENU:
// message_box_wrnmsg_OnKeyMenu(msgbox); // 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){ if(evt != NVTEVT_NULL){
UIFlowWrnMsg_CloseScr(evt); UIFlowWrnMsg_CloseScr(evt);
}else{ }else{
UIFlowWrnMsg_CloseScr(NVTEVT_NULL); 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; break;
//#NT#2023/11/14#Eric - end //#NT#2023/11/14#Eric - end
default: default: