From b7989f72b005bfd803a094bdd2f9de1c1ef7e5aa Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Mon, 27 Nov 2023 13:41:49 +0800 Subject: [PATCH] Fixed bug number 9730. --- .../UIFlowLVGL.UIFlowMovie.lvglscr | 77 +++-------------- .../UIFlowLVGL/UIFlowMovie/UIFlowMovie.c | 85 +++---------------- .../UIFlowLVGL/UIFlowMovie/UIFlowMovie.h | 1 - .../UIFlowMovie/UIFlowMovieEventCallback.c | 15 ++-- 4 files changed, 31 insertions(+), 147 deletions(-) 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 8e3e416d5..3e938c2da 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 @@ -899,64 +899,6 @@ } ], "widget": "Image" - }, - { - "align": "Left", - "class": "lv_label", - "click": false, - "drag": false, - "event callback": "", - "font type": "Font_Type0", - "geometry": { - "height": 20, - "width": 34, - "x": 57, - "y": 89 - }, - "hidden": false, - "locked": false, - "long mode": "Expand", - "name": "label_1", - "recolor": false, - "string id": "None", - "styles": [ - { - "Text": { - "text_color": "0x3c3c3c", - "text_font": "SF-UI-Text-Medium 16 1bpp", - "text_sel_bg_color": "0x00b495", - "text_sel_color": "0x3c3c3c" - }, - "part": 0, - "state": 0 - }, - { - "part": 0, - "state": 1 - }, - { - "part": 0, - "state": 2 - }, - { - "part": 0, - "state": 3 - }, - { - "part": 0, - "state": 4 - }, - { - "part": 0, - "state": 5 - }, - { - "part": 0, - "state": 6 - } - ], - "text": "Text", - "widget": "Label" } ], "class": "lv_cont", @@ -969,7 +911,7 @@ "x": 0, "y": 0 }, - "hidden": false, + "hidden": true, "layout": "Off", "locked": false, "name": "container_movie", @@ -1346,8 +1288,8 @@ "geometry": { "height": 30, "width": 90, - "x": 227, - "y": 40 + "x": 38, + "y": 10 }, "hidden": false, "locked": false, @@ -1360,7 +1302,8 @@ "Text": { "text_color": "0xffffff", "text_font": "SF-UI-Text-Medium 16 1bpp", - "text_sel_bg_color": "0x00b495" + "text_sel_bg_color": "0x00b495", + "text_sel_color": "0x3c3c3c" }, "part": 0, "state": 0 @@ -1400,10 +1343,10 @@ "drag": false, "event callback": "", "geometry": { - "height": 18, - "width": 18, - "x": 52, - "y": 40 + "height": 40, + "width": 38, + "x": 0, + "y": 0 }, "hidden": true, "locked": false, @@ -1412,7 +1355,7 @@ "X": 0, "Y": 0 }, - "source": "ICON_REC_ELLIPSE", + "source": "sy_luzhi", "styles": [ { "part": 0, 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 5f452d7fe..bcaee8c90 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 @@ -26,7 +26,6 @@ lv_obj_t* image_signal_2_scr_uiflowmovie; lv_obj_t* image_signal_3_scr_uiflowmovie; lv_obj_t* image_signal_4_scr_uiflowmovie; lv_obj_t* image_4g_scr_uiflowmovie; -lv_obj_t* label_1_scr_uiflowmovie; lv_obj_t* image_storage_scr_uiflowmovie; lv_obj_t* image_mode_video_scr_uiflowmovie; lv_obj_t* image_battery_scr_uiflowmovie; @@ -84,7 +83,7 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_movie_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_movie_s0, LV_STATE_DISABLED, color); lv_obj_t *container_movie = lv_cont_create(parent, NULL); - lv_obj_set_hidden(container_movie, false); + lv_obj_set_hidden(container_movie, true); lv_obj_set_click(container_movie, true); lv_obj_set_drag(container_movie, false); lv_obj_set_pos(container_movie, 0, 0); @@ -917,66 +916,6 @@ lv_obj_t* UIFlowMovie_create(){ image_4g_scr_uiflowmovie = image_4g; - static lv_style_t label_1_s0; - lv_style_init(&label_1_s0); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&label_1_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_1_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&label_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&label_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&label_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&label_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&label_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&label_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_DISABLED, color); - lv_obj_t *label_1 = lv_label_create(container_movie, NULL); - lv_obj_set_hidden(label_1, false); - lv_obj_set_click(label_1, false); - lv_obj_set_drag(label_1, false); - lv_plugin_label_allocate_ext_attr(label_1); - lv_label_set_text(label_1,"Text"); - lv_plugin_label_allocate_ext_attr(label_1); - lv_plugin_label_set_font_type(label_1, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); - lv_obj_set_pos(label_1, 57, 89); - lv_obj_set_size(label_1, 34, 20); - lv_obj_add_style(label_1, 0, &label_1_s0); - - label_1_scr_uiflowmovie = label_1; - - static lv_style_t image_storage_s0; lv_style_init(&image_storage_s0); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_storage_s0, LV_STATE_DEFAULT, color); @@ -1300,43 +1239,43 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_rec_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_rec_time_s0, LV_STATE_DEFAULT, color); lv_style_set_text_font(&label_rec_time_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_rec_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_rec_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_rec_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_rec_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_rec_time_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_rec_time_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_rec_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_rec_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_rec_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_rec_time_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_rec_time_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_rec_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_rec_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_rec_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_rec_time_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_rec_time_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_rec_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_rec_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_rec_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_rec_time_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_rec_time_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_rec_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_rec_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_rec_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_rec_time_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_rec_time_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_rec_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_rec_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_rec_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_rec_time_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_rec_time_s0, LV_STATE_DISABLED, color); lv_obj_t *label_rec_time = lv_label_create(parent, NULL); lv_obj_set_hidden(label_rec_time, false); @@ -1347,7 +1286,7 @@ lv_obj_t* UIFlowMovie_create(){ lv_plugin_label_set_font_type(label_rec_time, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_label_set_align(label_rec_time, LV_LABEL_ALIGN_RIGHT); lv_label_set_long_mode(label_rec_time, LV_LABEL_LONG_CROP); - lv_obj_set_pos(label_rec_time, 227, 40); + lv_obj_set_pos(label_rec_time, 38, 10); lv_obj_set_size(label_rec_time, 90, 30); lv_obj_add_style(label_rec_time, 0, &label_rec_time_s0); @@ -1395,9 +1334,9 @@ lv_obj_t* UIFlowMovie_create(){ lv_obj_set_hidden(image_rec_ellipse, true); lv_obj_set_click(image_rec_ellipse, false); lv_obj_set_drag(image_rec_ellipse, false); - lv_obj_set_pos(image_rec_ellipse, 52, 40); - lv_obj_set_size(image_rec_ellipse, 18, 18); - lv_img_set_src(image_rec_ellipse, &icon_rec_ellipse); + lv_obj_set_pos(image_rec_ellipse, 0, 0); + lv_obj_set_size(image_rec_ellipse, 38, 40); + lv_img_set_src(image_rec_ellipse, &sy_luzhi); lv_obj_add_style(image_rec_ellipse, 0, &image_rec_ellipse_s0); image_rec_ellipse_scr_uiflowmovie = image_rec_ellipse; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.h index 4223f9f76..5411e5245 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.h @@ -34,7 +34,6 @@ extern lv_obj_t* image_signal_2_scr_uiflowmovie; extern lv_obj_t* image_signal_3_scr_uiflowmovie; extern lv_obj_t* image_signal_4_scr_uiflowmovie; extern lv_obj_t* image_4g_scr_uiflowmovie; -extern lv_obj_t* label_1_scr_uiflowmovie; extern lv_obj_t* image_storage_scr_uiflowmovie; extern lv_obj_t* image_mode_video_scr_uiflowmovie; extern lv_obj_t* image_battery_scr_uiflowmovie; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c index f2b277772..582e142bf 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c @@ -103,11 +103,14 @@ static void set_rec_status(bool status) if(status){ lv_obj_set_hidden(image_rec_ellipse_scr_uiflowmovie, false); + // lv_obj_set_hidden(container_movie_scr_uiflowmovie, true); FlowMovie_StartRec(); gMovData.State = MOV_ST_REC; } else{ gMovData.State = MOV_ST_VIEW; + // lv_obj_set_hidden(container_movie_scr_uiflowmovie, false); + lv_obj_set_hidden(label_rec_time_scr_uiflowmovie, true); FlowMovie_StopRec(); update_icons(); } @@ -171,7 +174,7 @@ static void update_pim(void) static void update_max_rec_time(void) { - lv_obj_set_hidden(label_rec_time_scr_uiflowmovie,true); + // lv_obj_set_hidden(label_rec_time_scr_uiflowmovie,true); lv_obj_set_hidden(label_maxtime_scr_uiflowmovie,false); if (System_GetState(SYS_STATE_CARD) == CARD_REMOVED) { @@ -1497,15 +1500,15 @@ static void UIFlowMovie_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* m void UIFlowMovieEventCallback(lv_obj_t* obj, lv_event_t event) { #define PASSWORD_SWITCH_ON 1 - UIMenuStoreInfo *puiPara = sf_ui_para_get(); + // UIMenuStoreInfo *puiPara = sf_ui_para_get(); switch(event) { case LV_PLUGIN_EVENT_SCR_OPEN: UIFlowMovie_ScrOpen(obj); - if(PASSWORD_SWITCH_ON == puiPara->PwdSwitch) - { - OpenPasswordScreen(); - } + // if(PASSWORD_SWITCH_ON == puiPara->PwdSwitch) + // { + // OpenPasswordScreen(); + // } // #if HUNTING_CAMERA_MCU == ENABLE // UIMenuStoreInfo *puiPara = sf_ui_para_get(); // if((SF_CAM_MODE_VIDEO == puiPara->CamMode))