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

BUG:10539,10683 进度条播放弹跳/确认框默认为no

Browse Source
This commit is contained in:
xiehongyan 2023-12-28 15:42:27 +08:00
parent e7eb26c266
commit 64dfd15bbe
7 changed files with 22 additions and 18 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
#用于gitlab-ci.yml编译使用
make app_clean
#make app_clean
echo "Start compile."
export ROOT_PATH=$PWD
@ -9,7 +9,7 @@ export ROOT_PATH=$PWD
cd rtos
source build/envsetup.sh
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
cp output/application.bin ../
cp output/rtos-main.bin ../
@ -18,7 +18,7 @@ cp output/rtos-main.bin ../
cd $ROOT_PATH
source build/envsetup.sh
lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01
make clean
#make clean
make all > /dev/null
cd $ROOT_PATH

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

Binary file not shown.

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonConfirm.lvglscr
View File

@ -7,7 +7,7 @@
"add buttons": [
],
"animation time": 0,
"button's text": "NO,YES,",
"button's text": "YES,NO,",
"class": "lv_msgbox",
"click": true,
"content": "",

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirm.c
View File

@ -222,7 +222,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){
lv_obj_set_drag(message_box_1, false);
lv_obj_set_pos(message_box_1, 55, 53);
lv_obj_set_size(message_box_1, 210, 157);
static const char* message_box_1_LVGLPropertyMsgBoxBtnmatrixButtonsText[] = {"NO","YES","",""};
static const char* message_box_1_LVGLPropertyMsgBoxBtnmatrixButtonsText[] = {"YES","NO","",""};
lv_msgbox_add_btns(message_box_1, message_box_1_LVGLPropertyMsgBoxBtnmatrixButtonsText);
lv_plugin_msgbox_allocate_ext_attr(message_box_1);
lv_plugin_msgbox_set_font_type(message_box_1, LV_PLUGIN_LANGUAGE_FONT_TYPE_0, LV_MSGBOX_PART_BG);

3
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c
View File

@ -390,6 +390,7 @@ void UIFlowMenuCommonConfirm_OnOpen(lv_obj_t* obj)
set_indev_keypad_group(msgbox);
lv_group_send_data(gp, LV_KEY_RIGHT);
}
@ -473,7 +474,7 @@ static void UIFlowMenuCommonConfirm_MessageBox_ValueChanged(lv_obj_t* obj, uint3
{
if(NULL == value)
return;
if (*value == 1) {
if (*value == 0) {
// const char* msgbox_text = lv_msgbox_get_text(obj);
const char* msgbox_text = lv_label_get_text(Confirm_label);

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

@ -724,16 +724,17 @@ static void update_camera_message(void)
UINT32 cardStatus = System_GetState(SYS_STATE_CARD);
if (cardStatus != CARD_REMOVED)
{
if (g_SysStrg_Chg)
{
static int cnt = 0;
if(cnt++<3){
//if (g_SysStrg_Chg)
//{
//static int cnt = 0;
//if(cnt++<3){
// lv_label_set_text(label_6_scr_uiflowphoto, "wait");
}else{
g_SysStrg_Chg = false;
cnt = 0;
}
} else if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE)
//}else{
//g_SysStrg_Chg = false;
//cnt = 0;
//}
//} else
if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE)
{
// lv_label_set_text(label_6_scr_uiflowphoto, "SD CARD ERROR");
} else if (UIStorageCheck(STORAGE_CHECK_FULL, NULL) == TRUE)

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

@ -542,7 +542,7 @@ static void UIFlowPlay_UpdatePlaytime(BOOL bShow)
{
UINT32 rec_sec = FlowPB_GetMovPlayTime();
lv_slider_set_value(slider_1_scr_uiflowplay, (rec_sec % 3600) % 60 + 1, LV_ANIM_OFF);
lv_label_set_text_fmt(label_playtime_scr_uiflowplay, "%02d:%02d", (rec_sec % 3600) / 60, (rec_sec % 3600) % 60);
lv_label_set_text_fmt(label_playtime_scr_uiflowplay, "%02d:%02d", (rec_sec % 3600) / 60, (rec_sec % 3600) % 60 + 1);
}
}
static void UIFlowPlay_UpdataBtnContainer(BOOL bShow)
@ -1223,7 +1223,7 @@ static void play_video(lv_obj_t *obj)
printf("now play the video.\n");
lv_plugin_img_set_src(image_play_scr_uiflowplay, LV_PLUGIN_IMG_ID_SF_PLAY);
UINT32 u32CurrPbStatus = 0;
FlowPB_SetMovPlayTime(0);
PB_GetParam(PBPRMID_PLAYBACK_STATUS, &u32CurrPbStatus);
if (u32CurrPbStatus != PB_STA_DONE)
{
@ -1270,7 +1270,7 @@ static void play_video(lv_obj_t *obj)
}
if(PLB_ST_PLAY_MOV == g_PlbData.State)
{
printf("now stop play the video.\n");
printf("now move play\n");
// g_PlbData.State = PLB_ST_FULL;
// lv_plugin_img_set_src(image_play_scr_uiflowplay, LV_PLUGIN_IMG_ID_SF_STOP);
// lv_label_set_text_fmt(label_playtime_scr_uiflowplay, "%02d:%02d", 0, 0);
@ -2026,6 +2026,7 @@ static void UIFlowPlay_Key(lv_obj_t* obj, uint32_t key)
{
UINT32 uiFileSeq;
PB_GetParam(PBPRMID_CURR_FILESEQ, &uiFileSeq);
//FlowPB_SetMovPlayTime(0);
if (0 != uiFileSeq)
{
stop_play();
@ -2037,6 +2038,7 @@ static void UIFlowPlay_Key(lv_obj_t* obj, uint32_t key)
{
UINT32 uiFileSeq;
PB_GetParam(PBPRMID_CURR_FILESEQ, &uiFileSeq);
//FlowPB_SetMovPlayTime(0);
if (0 != uiFileSeq)
{
stop_play();