diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPlay.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPlay.lvglscr index 7887b6429..ce3cfdb80 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPlay.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPlay.lvglscr @@ -2332,21 +2332,22 @@ "event callback": "", "geometry": { "height": 40, - "width": 48, - "x": 272, + "width": 27, + "x": 288, "y": 0 }, - "hidden": true, + "hidden": false, "locked": false, "name": "image_option1", "offset": { "X": 0, "Y": 0 }, - "source": "sf_list_Selected", + "source": "sf_next1", "styles": [ { "Image": { + "image_opa": 254, "image_recolor": "0x3c3c3c" }, "part": 0, @@ -2403,7 +2404,16 @@ "state": "Released", "styles": [ { + "Background": { + "bg_color": "0x666666", + "bg_grad_color": "0x666666", + "bg_opa": 255 + }, + "Border": { + "border_color": "0x666666" + }, "Image": { + "image_opa": 0, "image_recolor": "0x3c3c3c" }, "part": 0, @@ -2414,6 +2424,9 @@ "state": 1 }, { + "Background": { + "bg_color": "0xffffff" + }, "part": 0, "state": 2 }, @@ -2511,21 +2524,22 @@ "event callback": "", "geometry": { "height": 40, - "width": 48, - "x": 272, + "width": 27, + "x": 288, "y": 0 }, - "hidden": true, + "hidden": false, "locked": false, "name": "image_option2", "offset": { "X": 0, "Y": 0 }, - "source": "sf_list_Selected", + "source": "sf_next1", "styles": [ { "Image": { + "image_opa": 254, "image_recolor": "0x3c3c3c" }, "part": 0, @@ -2582,7 +2596,12 @@ "state": "Released", "styles": [ { + "Background": { + "bg_color": "0x666666", + "bg_opa": 255 + }, "Image": { + "image_opa": 0, "image_recolor": "0x3c3c3c" }, "part": 0, @@ -2593,6 +2612,12 @@ "state": 1 }, { + "Background": { + "bg_color": "0xffffff" + }, + "Image": { + "image_opa": 255 + }, "part": 0, "state": 2 }, @@ -2705,6 +2730,7 @@ "styles": [ { "Image": { + "image_opa": 0, "image_recolor": "0x3c3c3c" }, "part": 0, @@ -2762,6 +2788,7 @@ "styles": [ { "Image": { + "image_opa": 0, "image_recolor": "0x3c3c3c" }, "part": 0, @@ -2884,6 +2911,7 @@ "styles": [ { "Image": { + "image_opa": 0, "image_recolor": "0x3c3c3c" }, "part": 0, @@ -2941,6 +2969,7 @@ "styles": [ { "Image": { + "image_opa": 0, "image_recolor": "0x3c3c3c" }, "part": 0, @@ -3063,6 +3092,7 @@ "styles": [ { "Image": { + "image_opa": 0, "image_recolor": "0x3c3c3c" }, "part": 0, @@ -3120,6 +3150,7 @@ "styles": [ { "Image": { + "image_opa": 0, "image_recolor": "0x3c3c3c" }, "part": 0, @@ -3170,12 +3201,11 @@ "styles": [ { "Background": { - "bg_color": "0x505050", - "bg_opa": 0 + "bg_color": "0x666666" }, "Border": { "border_color": "0xdddddd", - "border_opa": 0 + "border_width": 0 }, "Mix": { "radius": 0 diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlay.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlay.c index 61025f6a7..b4c19e671 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlay.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlay.c @@ -1978,45 +1978,44 @@ lv_obj_t* UIFlowPlay_create(){ lv_style_set_pad_left(&container_main_menu_s0,LV_STATE_DEFAULT,30); lv_style_set_pad_right(&container_main_menu_s0,LV_STATE_DEFAULT,30); lv_style_set_pad_inner(&container_main_menu_s0,LV_STATE_DEFAULT,5); - STYLE_COLOR_PROP(0x80, 0x50, 0x50, 0x50) ; lv_style_set_bg_color(&container_main_menu_s0, LV_STATE_DEFAULT, color); - lv_style_set_bg_opa(&container_main_menu_s0,LV_STATE_DEFAULT,0); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&container_main_menu_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_main_menu_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_main_menu_s0, LV_STATE_DEFAULT, color); - lv_style_set_border_opa(&container_main_menu_s0,LV_STATE_DEFAULT,0); + lv_style_set_border_width(&container_main_menu_s0,LV_STATE_DEFAULT,0); lv_style_set_pad_top(&container_main_menu_s0,LV_STATE_CHECKED,0); lv_style_set_pad_bottom(&container_main_menu_s0,LV_STATE_CHECKED,0); lv_style_set_pad_inner(&container_main_menu_s0,LV_STATE_CHECKED,0); - STYLE_COLOR_PROP(0x80, 0x50, 0x50, 0x50) ; lv_style_set_bg_color(&container_main_menu_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&container_main_menu_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_main_menu_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_main_menu_s0, LV_STATE_CHECKED, color); lv_style_set_pad_top(&container_main_menu_s0,LV_STATE_FOCUSED,0); lv_style_set_pad_bottom(&container_main_menu_s0,LV_STATE_FOCUSED,0); lv_style_set_pad_inner(&container_main_menu_s0,LV_STATE_FOCUSED,0); - STYLE_COLOR_PROP(0x80, 0x50, 0x50, 0x50) ; lv_style_set_bg_color(&container_main_menu_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&container_main_menu_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_main_menu_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_main_menu_s0, LV_STATE_FOCUSED, color); lv_style_set_pad_top(&container_main_menu_s0,LV_STATE_EDITED,0); lv_style_set_pad_bottom(&container_main_menu_s0,LV_STATE_EDITED,0); lv_style_set_pad_inner(&container_main_menu_s0,LV_STATE_EDITED,0); - STYLE_COLOR_PROP(0x80, 0x50, 0x50, 0x50) ; lv_style_set_bg_color(&container_main_menu_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&container_main_menu_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_main_menu_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_main_menu_s0, LV_STATE_EDITED, color); lv_style_set_pad_top(&container_main_menu_s0,LV_STATE_HOVERED,0); lv_style_set_pad_bottom(&container_main_menu_s0,LV_STATE_HOVERED,0); lv_style_set_pad_inner(&container_main_menu_s0,LV_STATE_HOVERED,0); - STYLE_COLOR_PROP(0x80, 0x50, 0x50, 0x50) ; lv_style_set_bg_color(&container_main_menu_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&container_main_menu_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_main_menu_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_main_menu_s0, LV_STATE_HOVERED, color); lv_style_set_pad_top(&container_main_menu_s0,LV_STATE_PRESSED,0); lv_style_set_pad_bottom(&container_main_menu_s0,LV_STATE_PRESSED,0); lv_style_set_pad_inner(&container_main_menu_s0,LV_STATE_PRESSED,0); - STYLE_COLOR_PROP(0x80, 0x50, 0x50, 0x50) ; lv_style_set_bg_color(&container_main_menu_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&container_main_menu_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_main_menu_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_main_menu_s0, LV_STATE_PRESSED, color); lv_style_set_pad_top(&container_main_menu_s0,LV_STATE_DISABLED,0); lv_style_set_pad_bottom(&container_main_menu_s0,LV_STATE_DISABLED,0); lv_style_set_pad_inner(&container_main_menu_s0,LV_STATE_DISABLED,0); - STYLE_COLOR_PROP(0x80, 0x50, 0x50, 0x50) ; lv_style_set_bg_color(&container_main_menu_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&container_main_menu_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_main_menu_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_main_menu_s0, LV_STATE_DISABLED, color); lv_obj_t *container_main_menu = lv_cont_create(parent, NULL); @@ -2032,39 +2031,41 @@ lv_obj_t* UIFlowPlay_create(){ static lv_style_t image_button_option_1_s0; lv_style_init(&image_button_option_1_s0); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_1_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_1_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_1_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&image_button_option_1_s0, LV_STATE_DEFAULT, color); + lv_style_set_bg_opa(&image_button_option_1_s0,LV_STATE_DEFAULT,255); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_grad_color(&image_button_option_1_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_border_color(&image_button_option_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_1_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_1_s0, LV_STATE_CHECKED, color); + lv_style_set_image_opa(&image_button_option_1_s0,LV_STATE_DEFAULT,0); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&image_button_option_1_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_grad_color(&image_button_option_1_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_border_color(&image_button_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_1_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_grad_color(&image_button_option_1_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_border_color(&image_button_option_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_1_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&image_button_option_1_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_grad_color(&image_button_option_1_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_border_color(&image_button_option_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_1_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&image_button_option_1_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_grad_color(&image_button_option_1_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_border_color(&image_button_option_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_1_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&image_button_option_1_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_grad_color(&image_button_option_1_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_border_color(&image_button_option_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_1_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&image_button_option_1_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_grad_color(&image_button_option_1_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_border_color(&image_button_option_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_1_s0, LV_STATE_DISABLED, color); lv_obj_t *image_button_option_1 = lv_imgbtn_create(container_main_menu, NULL); @@ -2151,6 +2152,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option1_s0, LV_STATE_DEFAULT, color); + lv_style_set_image_opa(&image_option1_s0,LV_STATE_DEFAULT,254); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option1_s0, LV_STATE_CHECKED, color); @@ -2182,12 +2184,12 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option1_s0, LV_STATE_DISABLED, color); lv_obj_t *image_option1 = lv_img_create(image_button_option_1, NULL); - lv_obj_set_hidden(image_option1, true); + lv_obj_set_hidden(image_option1, false); lv_obj_set_click(image_option1, false); lv_obj_set_drag(image_option1, false); - lv_obj_set_pos(image_option1, 272, 0); - lv_obj_set_size(image_option1, 48, 40); - lv_img_set_src(image_option1, &sf_list_selected); + lv_obj_set_pos(image_option1, 288, 0); + lv_obj_set_size(image_option1, 27, 40); + lv_img_set_src(image_option1, &sf_next1); lv_obj_add_style(image_option1, 0, &image_option1_s0); image_option1_scr_uiflowplay = image_option1; @@ -2195,12 +2197,14 @@ lv_obj_t* UIFlowPlay_create(){ static lv_style_t image_button_option_2_s0; lv_style_init(&image_button_option_2_s0); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_2_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&image_button_option_2_s0, LV_STATE_DEFAULT, color); + lv_style_set_bg_opa(&image_button_option_2_s0,LV_STATE_DEFAULT,255); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_2_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_2_s0, LV_STATE_CHECKED, color); + lv_style_set_image_opa(&image_button_option_2_s0,LV_STATE_DEFAULT,0); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&image_button_option_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_2_s0, LV_STATE_CHECKED, color); @@ -2210,22 +2214,23 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_2_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_2_s0, LV_STATE_EDITED, color); + lv_style_set_image_opa(&image_button_option_2_s0,LV_STATE_FOCUSED,255); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&image_button_option_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_2_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_2_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&image_button_option_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_2_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_2_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&image_button_option_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_2_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_2_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x8b, 0x66, 0x66, 0x66) ; lv_style_set_bg_color(&image_button_option_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_2_s0, LV_STATE_DISABLED, color); @@ -2314,6 +2319,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option2_s0, LV_STATE_DEFAULT, color); + lv_style_set_image_opa(&image_option2_s0,LV_STATE_DEFAULT,254); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option2_s0, LV_STATE_CHECKED, color); @@ -2345,12 +2351,12 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option2_s0, LV_STATE_DISABLED, color); lv_obj_t *image_option2 = lv_img_create(image_button_option_2, NULL); - lv_obj_set_hidden(image_option2, true); + lv_obj_set_hidden(image_option2, false); lv_obj_set_click(image_option2, false); lv_obj_set_drag(image_option2, false); - lv_obj_set_pos(image_option2, 272, 0); - lv_obj_set_size(image_option2, 48, 40); - lv_img_set_src(image_option2, &sf_list_selected); + lv_obj_set_pos(image_option2, 288, 0); + lv_obj_set_size(image_option2, 27, 40); + lv_img_set_src(image_option2, &sf_next1); lv_obj_add_style(image_option2, 0, &image_option2_s0); image_option2_scr_uiflowplay = image_option2; @@ -2363,6 +2369,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_3_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_3_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_3_s0, LV_STATE_DEFAULT, color); + lv_style_set_image_opa(&image_button_option_3_s0,LV_STATE_DEFAULT,0); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_3_s0, LV_STATE_CHECKED, color); @@ -2477,6 +2484,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option3_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option3_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option3_s0, LV_STATE_DEFAULT, color); + lv_style_set_image_opa(&image_option3_s0,LV_STATE_DEFAULT,0); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option3_s0, LV_STATE_CHECKED, color); @@ -2526,6 +2534,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_4_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_4_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_4_s0, LV_STATE_DEFAULT, color); + lv_style_set_image_opa(&image_button_option_4_s0,LV_STATE_DEFAULT,0); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_4_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_4_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_4_s0, LV_STATE_CHECKED, color); @@ -2640,6 +2649,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option4_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option4_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option4_s0, LV_STATE_DEFAULT, color); + lv_style_set_image_opa(&image_option4_s0,LV_STATE_DEFAULT,0); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option4_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option4_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option4_s0, LV_STATE_CHECKED, color); @@ -2689,6 +2699,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_button_option_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_button_option_5_s0, LV_STATE_DEFAULT, color); + lv_style_set_image_opa(&image_button_option_5_s0,LV_STATE_DEFAULT,0); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_button_option_5_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_button_option_5_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_button_option_5_s0, LV_STATE_CHECKED, color); @@ -2803,6 +2814,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option5_s0, LV_STATE_DEFAULT, color); + lv_style_set_image_opa(&image_option5_s0,LV_STATE_DEFAULT,0); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option5_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option5_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option5_s0, LV_STATE_CHECKED, color); 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 d1b0a01c1..56cb1415b 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 @@ -3,6 +3,7 @@ #include "GxStrg.h" #include "UIFlowLVGL/UIFlowLVGL.h" #include +#include #include "GxVideoFile.h" #include "FileDB.h" #include "UIFlowLVGL_SPORTCAM.h" @@ -27,6 +28,25 @@ //#define PLAY_KEY_RELEASE_MASK FLGKEY_KEY_MASK_NULL//(FLGKEY_UP | FLGKEY_DOWN | FLGKEY_LEFT | FLGKEY_RIGHT) //#define PLAY_KEY_CONTINUE_MASK FLGKEY_KEY_CONT_MASK_DEFAULT +static lv_obj_t* pMenu = NULL; +enum SELECTION_SHOW +{ + SELECTION_SHOW_TURE = 0, + SELECTION_SHOW_FALSE, + SELECTION_SHOW_END +}; +enum OPTION_PAGE +{ + OPTION_PAGE_SELECT_FUNCTION = 0, + OPTION_PAGE_FORMAT, + OPTION_PAGE_END +}; +#define PROFILE_MAX 3 +static int gSeletionShow = SELECTION_SHOW_FALSE; +static int gOptionPage = OPTION_PAGE_SELECT_FUNCTION; +static int ProfileFocused = 0; +static int ProfileTotal = 2; +static int ProfileSelected = 0; UINT32 g_uiUIFlowWndPlayCurrenSpeed = SMEDIAPLAY_SPEED_NORMAL; UINT32 g_uiUIFlowWndPlayCurrenDirection = SMEDIAPLAY_DIR_FORWARD; @@ -53,6 +73,174 @@ extern uint16_t warn_msgbox_auto_close_ms; //static UINT16 user_tmp_btn = 0; //static lv_obj_t* curr_pressbtn; +#define ITEMS_PER_PAGE 5 +static void update_play_Selection_msg(lv_obj_t* obj) +{ + for(int i = 0; i < ITEMS_PER_PAGE; i++) + { + if(i == 0){ + if (ProfileFocused == i) { + lv_obj_set_state(image_button_option_1_scr_uiflowplay, LV_STATE_FOCUSED); + lv_obj_set_state(label_option1_scr_uiflowplay, LV_STATE_FOCUSED); + // lv_obj_set_hidden(image_option1_scr_uiflowplay, false); + lv_plugin_img_set_src(image_option1_scr_uiflowplay, LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2); + lv_obj_set_pos(image_option1_scr_uiflowplay, 259, 0); + } else { + lv_obj_set_state(image_button_option_1_scr_uiflowplay, LV_STATE_DEFAULT); + lv_obj_set_state(label_option1_scr_uiflowplay, LV_STATE_DEFAULT); + // lv_obj_set_hidden(image_option1_scr_uiflowplay, false); + lv_plugin_img_set_src(image_option1_scr_uiflowplay, LV_PLUGIN_IMG_ID_SF_NEXT1); + lv_obj_set_pos(image_option1_scr_uiflowplay, 288, 0); + } + } else if(i == 1){ + if (ProfileFocused == i) { + lv_obj_set_state(image_button_option_2_scr_uiflowplay, LV_STATE_FOCUSED); + lv_obj_set_state(label_option2_scr_uiflowplay, LV_STATE_FOCUSED); + // lv_obj_set_hidden(image_option2_scr_uiflowplay, false); + lv_plugin_img_set_src(image_option2_scr_uiflowplay, LV_PLUGIN_IMG_ID_SF_LIST_SELECTED_NEXT2); + lv_obj_set_pos(image_option2_scr_uiflowplay, 259, 0); + } else { + lv_obj_set_state(image_button_option_2_scr_uiflowplay, LV_STATE_DEFAULT); + lv_obj_set_state(label_option2_scr_uiflowplay, LV_STATE_DEFAULT); + // lv_obj_set_hidden(image_option2_scr_uiflowplay, false); + lv_plugin_img_set_src(image_option2_scr_uiflowplay, LV_PLUGIN_IMG_ID_SF_NEXT1); + lv_obj_set_pos(image_option2_scr_uiflowplay, 288, 0); + } + }else if(i == 2){ + if (ProfileFocused == i) { + lv_obj_set_state(image_button_option_3_scr_uiflowplay, LV_STATE_FOCUSED); + } else { + lv_obj_set_state(image_button_option_3_scr_uiflowplay, LV_STATE_DEFAULT); + } + }else if(i == 3){ + if (ProfileFocused == i) { + lv_obj_set_state(image_button_option_4_scr_uiflowplay, LV_STATE_FOCUSED); + } else { + lv_obj_set_state(image_button_option_4_scr_uiflowplay, LV_STATE_DEFAULT); + } + }else if(i == 4){ + if (ProfileFocused == i) { + lv_obj_set_state(image_button_option_5_scr_uiflowplay, LV_STATE_FOCUSED); + } else { + lv_obj_set_state(image_button_option_5_scr_uiflowplay, LV_STATE_DEFAULT); + } + } + } + return; + if(pMenu == NULL) + { + printf("[error]Network Selection abnormal operation\n"); + return; + } + + if(ProfileFocused > PROFILE_MAX) + { + printf("[error]ProfileFocused exceed the limit\n"); + ProfileFocused = 0; + } + + int selectedPage = ProfileFocused / ITEMS_PER_PAGE; + int ishidden = 0; + + for(int i = 0; i < ITEMS_PER_PAGE; i++) + { + // printf("i:%d data:%d\n", i, (IDS_NETWORK_SELECTION_1 + (ITEMS_PER_PAGE * selectedPage) + i)); + lv_plugin_menu_set_item_string_id(pMenu, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, + (IDS_NETWORK_SELECTION_1 + (ITEMS_PER_PAGE * selectedPage) + i)); + lv_plugin_menu_set_item_img_id(pMenu, i, LV_PLUGIN_MENU_ITEM_STATE_DISABLED, LV_PLUGIN_IMG_ID_ICON_OK); + + ishidden = true; + if((ITEMS_PER_PAGE * selectedPage) + i < ProfileTotal) + { + lv_plugin_menu_set_item_hidden(pMenu, i, false);//整项 + if((ITEMS_PER_PAGE * selectedPage) + i == ProfileFocused) + { + lv_plugin_menu_select_item(pMenu, i);//白条 + } + if((ITEMS_PER_PAGE * selectedPage) + i == ProfileSelected) + { + ishidden = false; + } + } + else + { + lv_plugin_menu_set_item_hidden(pMenu, i, true);//整项 + } + + if(i==0){ + lv_obj_set_hidden(image_option1_scr_uiflowplay, ishidden);//打钩 + }else if(i == 1){ + lv_obj_set_hidden(image_option2_scr_uiflowplay, ishidden); + }else if(i == 2){ + lv_obj_set_hidden(image_option3_scr_uiflowplay, ishidden); + }else if(i == 3){ + lv_obj_set_hidden(image_option4_scr_uiflowplay, ishidden); + }else if(i == 4){ + lv_obj_set_hidden(image_option5_scr_uiflowplay, ishidden); + } + } +} +void show_select_function(lv_obj_t* obj) +{ + lv_label_set_text(label_option1_scr_uiflowplay, "Storage Options"); + lv_label_set_text(label_option2_scr_uiflowplay, "Delete"); +} +void show_Selection_page(lv_obj_t* obj, lv_obj_t* menu_obj) +{ + pMenu = menu_obj; + gSeletionShow = SELECTION_SHOW_TURE; + lv_obj_set_hidden(container_main_menu_scr_uiflowplay,false); + if (OPTION_PAGE_SELECT_FUNCTION == gOptionPage) + { + show_select_function(obj); + } + update_play_Selection_msg(obj); +} +void hide_Selection_page(void) +{ + gSeletionShow = SELECTION_SHOW_FALSE; + lv_obj_set_hidden(container_main_menu_scr_uiflowplay,true); +} +void Option_play_Selection_Key(lv_obj_t* obj, uint32_t key) +{ + printf("key:%d\n",key); + + switch(key) + { + case LV_USER_KEY_NEXT: + if(ProfileFocused >= 0 && ProfileFocused < (ProfileTotal - 1)) + { + ProfileFocused++; + } + else + { + ProfileFocused = 0; + } + update_play_Selection_msg(obj); + break; + case LV_USER_KEY_PREV: + if(ProfileFocused > 0 && ProfileFocused < ProfileTotal) + { + ProfileFocused--; + } + else + { + ProfileFocused = ProfileTotal - 1; + } + update_play_Selection_msg(obj); + break; + case LV_USER_KEY_LEFT: + // lv_plugin_scr_close(obj, gen_nvtmsg_data(NVTRET_ENTER_MENU, 0)); + // hidde_Network_Selection_page(); + break; + case LV_USER_KEY_RIGHT: + break; + case LV_KEY_ENTER: + break; + default: + break; + } +} static void UIFlowPlay_UpdataFileName(BOOL bShow); //static void UIFlowPlay_UserBtnCheck(lv_obj_t * obj, int direct); @@ -1146,7 +1334,7 @@ static void UIFlowPlay_ChildScrClose(lv_obj_t* obj, const void * data) static void UIFlowPlay_ScrClose(lv_obj_t* obj) { DBG_DUMP("%s\r\n", __func__); - + hide_Selection_page(); /* do nothing if current system mode is not matched */ if (System_GetState(SYS_STATE_CURRMODE) != PRIMARY_MODE_PLAYBACK){ DBG_WRN("system current mode is not playback\r\n"); @@ -2048,6 +2236,12 @@ static void UIFlowPlay_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_UP: case LV_USER_KEY_PREV: { + if (SELECTION_SHOW_FALSE == gSeletionShow) { + show_Selection_page(obj, container_main_menu_scr_uiflowplay); + } else { + + } + break; UIFlowPlay_Exit(obj); break; UIFlowPlay_OnKeyPrev(obj); @@ -2055,6 +2249,8 @@ static void UIFlowPlay_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_DOWN: case LV_USER_KEY_NEXT: { + UIFlowPlay_Exit(obj); + break; UINT32 uiFileSeq; PB_GetParam(PBPRMID_CURR_FILESEQ, &uiFileSeq); if (0 != uiFileSeq) @@ -2203,9 +2399,12 @@ static void UIFlowPlayBtnEventCallback(lv_obj_t* obj, lv_event_t event) case LV_USER_EVENT_KEY_RELEASE: { uint32_t* key = (uint32_t*)lv_event_get_data(); - - /* handle key event */ - UIFlowPlay_Key(obj, *key); + if (SELECTION_SHOW_TURE == gSeletionShow) { + Option_play_Selection_Key(obj, *key); + } else { + /* handle key event */ + UIFlowPlay_Key(obj, *key); + } /*********************************************************************************** * IMPORTANT!!