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

Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc

Browse Source
This commit is contained in:
payton 2023-12-29 22:16:26 +08:00
commit 0ca0cbaa30
5 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1707,7 +1707,7 @@
"X": 0, "X": 0,
"Y": 0 "Y": 0
}, },
"source": "sf_delete", "source": "sf_Exit",
"styles": [ "styles": [
{ {
"part": 0, "part": 0,
@ -1759,7 +1759,7 @@
"X": 0, "X": 0,
"Y": 0 "Y": 0
}, },
"source": "sf_Exit", "source": "sf_delete",
"styles": [ "styles": [
{ {
"part": 0, "part": 0,

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

@ -1498,7 +1498,7 @@ lv_obj_t* UIFlowPlay_create(){
lv_obj_set_drag(image_exit, false); lv_obj_set_drag(image_exit, false);
lv_obj_set_pos(image_exit, 135, 0); lv_obj_set_pos(image_exit, 135, 0);
lv_obj_set_size(image_exit, 32, 40); 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); lv_obj_add_style(image_exit, 0, &image_exit_s0);
image_exit_scr_uiflowplay = image_exit; 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_drag(image_delete, false);
lv_obj_set_pos(image_delete, 214, 0); lv_obj_set_pos(image_delete, 214, 0);
lv_obj_set_size(image_delete, 32, 40); 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); lv_obj_add_style(image_delete, 0, &image_delete_s0);
image_delete_scr_uiflowplay = image_delete; image_delete_scr_uiflowplay = image_delete;

9
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c
View File

@ -2269,9 +2269,8 @@ static void UIFlowPlay_Key(lv_obj_t* obj, uint32_t key)
} }
break; break;
} }
case LV_USER_KEY_DOWN:
case LV_USER_KEY_UP: case LV_USER_KEY_NEXT:
case LV_USER_KEY_PREV:
{ {
if (SELECTION_SHOW_FALSE == gSeletionShow) { if (SELECTION_SHOW_FALSE == gSeletionShow) {
show_Selection_page(obj); show_Selection_page(obj);
@ -2283,8 +2282,8 @@ static void UIFlowPlay_Key(lv_obj_t* obj, uint32_t key)
break; break;
UIFlowPlay_OnKeyPrev(obj); UIFlowPlay_OnKeyPrev(obj);
} }
case LV_USER_KEY_DOWN: case LV_USER_KEY_UP:
case LV_USER_KEY_NEXT: case LV_USER_KEY_PREV:
{ {
UIFlowPlay_Exit(obj); UIFlowPlay_Exit(obj);
break; break;

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

@ -42,10 +42,6 @@ static void task_msgbox_timer_cb(lv_task_t* task)
UINT16 autoOffTime = sf_get_auto_off_time(); UINT16 autoOffTime = sf_get_auto_off_time();
const lv_plugin_string_t* string = lv_plugin_get_string(msgID); 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) if (0 == autoClose || autoOffTime <= 10)
{ {

2
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -289,7 +289,7 @@ void sf_mode_detect(void)
} }
else if(pwroffcnt == 6) 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); printf("[power off] %s(%d) AutoOfftime:%d\n", __FUNCTION__, __LINE__, AutoOfftime);
#define DO_NOT_SHOW_POWER_OFF 0 #define DO_NOT_SHOW_POWER_OFF 0