From 9c462df6bb01edb3163895b923ddf8fa1af45ecd Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Fri, 29 Dec 2023 19:33:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=9E=E6=94=BE=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=8C=89=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPlay.lvglscr | 4 ++-- .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlay.c | 4 ++-- .../UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c | 9 ++++----- .../UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c | 4 ---- code/lib/source/sifar/code/source/common/sf_common.c | 2 +- 5 files changed, 9 insertions(+), 14 deletions(-) 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 ef36c8282..38a60bfd6 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 @@ -1707,7 +1707,7 @@ "X": 0, "Y": 0 }, - "source": "sf_delete", + "source": "sf_Exit", "styles": [ { "part": 0, @@ -1759,7 +1759,7 @@ "X": 0, "Y": 0 }, - "source": "sf_Exit", + "source": "sf_delete", "styles": [ { "part": 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 b1c4e4158..5252d4359 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 @@ -1498,7 +1498,7 @@ lv_obj_t* UIFlowPlay_create(){ lv_obj_set_drag(image_exit, false); lv_obj_set_pos(image_exit, 135, 0); lv_obj_set_size(image_exit, 32, 40); - lv_img_set_src(image_exit, &sf_delete); + lv_img_set_src(image_exit, &sf_exit); lv_obj_add_style(image_exit, 0, &image_exit_s0); image_exit_scr_uiflowplay = image_exit; @@ -1547,7 +1547,7 @@ lv_obj_t* UIFlowPlay_create(){ lv_obj_set_drag(image_delete, false); lv_obj_set_pos(image_delete, 214, 0); lv_obj_set_size(image_delete, 32, 40); - lv_img_set_src(image_delete, &sf_exit); + lv_img_set_src(image_delete, &sf_delete); lv_obj_add_style(image_delete, 0, &image_delete_s0); image_delete_scr_uiflowplay = image_delete; 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 53951e0c7..883929d7b 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 @@ -2269,9 +2269,8 @@ static void UIFlowPlay_Key(lv_obj_t* obj, uint32_t key) } break; } - - case LV_USER_KEY_UP: - case LV_USER_KEY_PREV: + case LV_USER_KEY_DOWN: + case LV_USER_KEY_NEXT: { if (SELECTION_SHOW_FALSE == gSeletionShow) { show_Selection_page(obj); @@ -2283,8 +2282,8 @@ static void UIFlowPlay_Key(lv_obj_t* obj, uint32_t key) break; UIFlowPlay_OnKeyPrev(obj); } - case LV_USER_KEY_DOWN: - case LV_USER_KEY_NEXT: + case LV_USER_KEY_UP: + case LV_USER_KEY_PREV: { UIFlowPlay_Exit(obj); 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 0b7f6ca9b..d6a99ccd8 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 @@ -42,10 +42,6 @@ static void task_msgbox_timer_cb(lv_task_t* task) UINT16 autoOffTime = sf_get_auto_off_time(); const lv_plugin_string_t* string = lv_plugin_get_string(msgID); - if (6000 == autoClose) - { - sf_set_pir_statu_flag(1); - } if (0 == autoClose || autoOffTime <= 10) { diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c index 8623c3b60..f442bad07 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -289,7 +289,7 @@ void sf_mode_detect(void) } else if(pwroffcnt == 6) { - sf_sys_status_led_set(SF_LED_SYS_STATE_EXIT_GO_TO_PIR); + sf_sys_status_led_set(SF_LED_SYS_STATE_POWER_OFF); /* printf("[power off] %s(%d) AutoOfftime:%d\n", __FUNCTION__, __LINE__, AutoOfftime); #define DO_NOT_SHOW_POWER_OFF 0