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

Merge branch 'branch_s550_gui' into branch_s550_fast

Browse Source
This commit is contained in:
xiaojiazhu 2023-11-27 18:42:21 +08:00
commit 58edb09d0b
9 changed files with 1943 additions and 1743 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h
View File

@ -922,7 +922,7 @@
#define HUNTING_MCU_UART ENABLE
#define HUNTING_IR_LED_940 ENABLE
#define SF_EXIF_MN_BUF_SIZE 256
#define SF_BASE_VERSION "7MR5RCwDB06"
#define SF_BASE_VERSION "7MR5RCwDB07"
#define HW_S530 DISABLE
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */

1824
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr
View File

File diff suppressed because it is too large Load Diff

6
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr
View File

@ -933,6 +933,9 @@
"state": 1
},
{
"Text": {
"text_color": "0xe71111"
},
"part": 0,
"state": 2
},
@ -1045,6 +1048,9 @@
"state": 1
},
{
"Text": {
"text_color": "0xe71111"
},
"part": 0,
"state": 2
},

1736
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c
View File

File diff suppressed because it is too large Load Diff

33
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.h
View File

@ -17,6 +17,23 @@ extern "C" {
void UIFlowMovieEventCallback(lv_obj_t* obj, lv_event_t event);
extern lv_obj_t* container_movie_scr_uiflowmovie;
extern lv_obj_t* image_mode_photo_scr_uiflowmovie;
extern lv_obj_t* image_5_scr_uiflowmovie;
extern lv_obj_t* label_4_scr_uiflowmovie;
extern lv_obj_t* image_6_scr_uiflowmovie;
extern lv_obj_t* label_5_scr_uiflowmovie;
extern lv_obj_t* image_7_scr_uiflowmovie;
extern lv_obj_t* label_6_scr_uiflowmovie;
extern lv_obj_t* image_battery_0_scr_uiflowmovie;
extern lv_obj_t* image_wifi_connected_scr_uiflowmovie;
extern lv_obj_t* image_bluetooth_connected_scr_uiflowmovie;
extern lv_obj_t* image_signal_0_scr_uiflowmovie;
extern lv_obj_t* image_signal_1_scr_uiflowmovie;
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* image_storage_scr_uiflowmovie;
extern lv_obj_t* image_mode_video_scr_uiflowmovie;
extern lv_obj_t* image_battery_scr_uiflowmovie;
@ -33,24 +50,8 @@ extern lv_obj_t* image_wifi_scr_uiflowmovie;
extern lv_obj_t* image_motiondetect_scr_uiflowmovie;
extern lv_obj_t* label_zoom_scr_uiflowmovie;
extern lv_obj_t* label_maxtime_scr_uiflowmovie;
extern lv_obj_t* image_mode_photo_scr_uiflowmovie;
extern lv_obj_t* image_5_scr_uiflowmovie;
extern lv_obj_t* label_4_scr_uiflowmovie;
extern lv_obj_t* image_6_scr_uiflowmovie;
extern lv_obj_t* label_5_scr_uiflowmovie;
extern lv_obj_t* image_7_scr_uiflowmovie;
extern lv_obj_t* label_6_scr_uiflowmovie;
extern lv_obj_t* image_line_scr_uiflowmovie;
extern lv_obj_t* label_sim_scr_uiflowmovie;
extern lv_obj_t* image_battery_0_scr_uiflowmovie;
extern lv_obj_t* image_wifi_connected_scr_uiflowmovie;
extern lv_obj_t* image_bluetooth_connected_scr_uiflowmovie;
extern lv_obj_t* image_signal_0_scr_uiflowmovie;
extern lv_obj_t* image_signal_1_scr_uiflowmovie;
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;
/**********************
* GLOBAL PROTOTYPES

15
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c
View File

@ -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))

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

@ -977,7 +977,7 @@ lv_obj_t* UIFlowPhoto_create(){
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_6_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_6_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_6_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_6_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x26, 0xe7, 0x11, 0x11) ; lv_style_set_text_color(&label_6_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_6_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_6_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_6_s0, LV_STATE_EDITED, color);
@ -1039,7 +1039,7 @@ lv_obj_t* UIFlowPhoto_create(){
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_tips_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x26, 0xe7, 0x11, 0x11) ; lv_style_set_text_color(&label_tips_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips_s0, LV_STATE_EDITED, color);

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

@ -432,8 +432,10 @@ static void signal_icon_show(const short signal)
break;
}
}
void set_warning_label_text(lv_obj_t* obj)
static void set_warning_label_text(lv_obj_t* obj)
{
lv_obj_set_state(obj, LV_STATE_FOCUSED);
return;
lv_color_t color = {0};
static lv_style_t label_tips_s0;
lv_style_init(&label_tips_s0);
@ -482,6 +484,58 @@ void set_warning_label_text(lv_obj_t* obj)
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips_s0, LV_STATE_DISABLED, color);
lv_obj_add_style(obj, 0, &label_tips_s0);
}
static void set_normal_label_text(lv_obj_t* obj)
{
lv_obj_set_state(obj, LV_STATE_DEFAULT);
return;
lv_color_t color = {0};
static lv_style_t label_tips_s0;
lv_style_init(&label_tips_s0);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_tips_s0, LV_STATE_DEFAULT, color);
lv_style_set_text_font(&label_tips_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x26, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_tips_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_tips_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_tips_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_tips_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_tips_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_tips_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips_s0, LV_STATE_DISABLED, color);
lv_obj_add_style(obj, 0, &label_tips_s0);
}
static void update_4g_module_icon(void)
{
#define NO_SIM_CARD 0
@ -631,6 +685,7 @@ static void update_camera_message(void)
// lv_label_set_text(label_6_scr_uiflowphoto, "SD CARD ERROR");
} else if (UIStorageCheck(STORAGE_CHECK_FULL, NULL) == TRUE)
{
set_warning_label_text(label_6_scr_uiflowphoto);
lv_label_set_text(label_6_scr_uiflowphoto, "SD FULL");
}
else
@ -647,18 +702,21 @@ static void update_camera_message(void)
// }
// }else{
//#NT#2023/11/21#Eric - end
set_normal_label_text(label_6_scr_uiflowphoto);
UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum);
lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum));
}/////#NT#2023/11/21#Eric - continue
}
else
{
lv_label_set_text(label_6_scr_uiflowphoto, "NO SD CARD");
set_warning_label_text(label_6_scr_uiflowphoto);
lv_label_set_text(label_6_scr_uiflowphoto, "No SD Card");
}
}
else
{
lv_label_set_text(label_6_scr_uiflowphoto, "NO SD CARD");
set_warning_label_text(label_6_scr_uiflowphoto);
lv_label_set_text(label_6_scr_uiflowphoto, "No SD Card");
}
}

2
rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h
View File

@ -945,7 +945,7 @@
#define HUNTING_MCU_UART ENABLE
#define HUNTING_IR_LED_940 ENABLE
#define SF_EXIF_MN_BUF_SIZE 256
#define SF_BASE_VERSION "7MR5RCwDB06"
#define SF_BASE_VERSION "7MR5RCwDB07"
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */
#define PHOTO_THUMB_PATH "A:\\THUMB\\"