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-12-12 18:46:22 +08:00
commit 788eace2ba
25 changed files with 402 additions and 211 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_MCU_UART ENABLE
#define HUNTING_IR_LED_940 ENABLE #define HUNTING_IR_LED_940 ENABLE
#define SF_EXIF_MN_BUF_SIZE 256 #define SF_EXIF_MN_BUF_SIZE 256
#define SF_BASE_VERSION "7MR5RCwDC01" #define SF_BASE_VERSION "7MR5RCwDC02"
#define HW_S530 DISABLE #define HW_S530 DISABLE
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */ #define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */

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

@ -1820,58 +1820,6 @@
"text": "", "text": "",
"widget": "Label" "widget": "Label"
}, },
{
"auto size": true,
"class": "lv_img",
"click": false,
"drag": false,
"event callback": "",
"geometry": {
"height": 3,
"width": 320,
"x": 0,
"y": 119
},
"hidden": false,
"locked": false,
"name": "image_line",
"offset": {
"X": 0,
"Y": 0
},
"source": "sy_redline2",
"styles": [
{
"part": 0,
"state": 0
},
{
"part": 0,
"state": 1
},
{
"part": 0,
"state": 2
},
{
"part": 0,
"state": 3
},
{
"part": 0,
"state": 4
},
{
"part": 0,
"state": 5
},
{
"part": 0,
"state": 6
}
],
"widget": "Image"
},
{ {
"align": "Center", "align": "Center",
"class": "lv_label", "class": "lv_label",
@ -1929,6 +1877,70 @@
], ],
"text": "Searching...", "text": "Searching...",
"widget": "Label" "widget": "Label"
},
{
"align": "Center",
"class": "lv_label",
"click": false,
"drag": false,
"event callback": "",
"font type": "Font_Type0",
"geometry": {
"height": 3,
"width": 320,
"x": 0,
"y": 119
},
"hidden": false,
"locked": false,
"long mode": "Roll",
"name": "label_line",
"recolor": false,
"string id": "None",
"styles": [
{
"Background": {
"bg_color": "0xff0000",
"bg_grad_color": "0xff0000",
"bg_opa": 255
},
"Text": {
"text_color": "0xff0000",
"text_font": "montserrat 16 4bpp",
"text_opa": 0,
"text_sel_bg_color": "0x00b495",
"text_sel_color": "0x3c3c3c"
},
"part": 0,
"state": 0
},
{
"part": 0,
"state": 1
},
{
"part": 0,
"state": 2
},
{
"part": 0,
"state": 3
},
{
"part": 0,
"state": 4
},
{
"part": 0,
"state": 5
},
{
"part": 0,
"state": 6
}
],
"text": "",
"widget": "Label"
} }
] ]
} }

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

@ -2395,11 +2395,12 @@
"widget": "Label" "widget": "Label"
}, },
{ {
"auto size": true, "align": "Center",
"class": "lv_img", "class": "lv_label",
"click": false, "click": false,
"drag": false, "drag": false,
"event callback": "", "event callback": "",
"font type": "Font_Type0",
"geometry": { "geometry": {
"height": 3, "height": 3,
"width": 320, "width": 320,
@ -2408,14 +2409,24 @@
}, },
"hidden": false, "hidden": false,
"locked": false, "locked": false,
"name": "image_line", "long mode": "Roll",
"offset": { "name": "label_line",
"X": 0, "recolor": false,
"Y": 0 "string id": "None",
},
"source": "sy_redline2",
"styles": [ "styles": [
{ {
"Background": {
"bg_color": "0xff0000",
"bg_grad_color": "0xff0000",
"bg_opa": 255
},
"Text": {
"text_color": "0xff0000",
"text_font": "SF-UI-Text-Medium 16 1bpp",
"text_opa": 0,
"text_sel_bg_color": "0x00b495",
"text_sel_color": "0x3c3c3c"
},
"part": 0, "part": 0,
"state": 0 "state": 0
}, },
@ -2444,7 +2455,8 @@
"state": 6 "state": 6
} }
], ],
"widget": "Image" "text": "",
"widget": "Label"
} }
] ]
} }

46
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c
View File

@ -1045,7 +1045,36 @@ void Option_Operating_Time_Key(lv_obj_t* obj, uint32_t key)
break; break;
} }
} }
UINT16 sf_get_month_days(UINT16 year, UINT16 month)
{
UINT16 maxday = 0;
printf("sf_get_month_days year=%d, month=%d\n", year, month);
switch(month)
{
case 4:
case 6:
case 9:
case 11:
maxday = 30;
break;
case 2:
if ((year % 400 == 0) || ((year % 4 == 0) && (year % 100 != 0)))
maxday = 29;
else
maxday = 28;
break;
default:
maxday = 31;
break;
}
printf("maxday=%d\n", maxday);
return maxday;
}
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// DateTime // DateTime
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@ -1084,7 +1113,10 @@ static void update_DateTime_Time_msg(lv_obj_t* obj)
DBG_ERR("DateTime component is not initialized"); DBG_ERR("DateTime component is not initialized");
return; return;
} }
if (gDateTime.Day > sf_get_month_days(gDateTime.Year, gDateTime.Mon))
{
gDateTime.Day = sf_get_month_days(gDateTime.Year, gDateTime.Mon);
}
// UIMenuStoreInfo *puiPara = sf_ui_para_get(); // UIMenuStoreInfo *puiPara = sf_ui_para_get();
snprintf(DateTimeMOBuf, 3, "%02d", gDateTime.Mon); snprintf(DateTimeMOBuf, 3, "%02d", gDateTime.Mon);
snprintf(DateTimeDDBuf, 3, "%02d", gDateTime.Day); snprintf(DateTimeDDBuf, 3, "%02d", gDateTime.Day);
@ -1242,10 +1274,10 @@ void Option_DateTime_Key(lv_obj_t* obj, uint32_t key)
} }
else if(DateTimeIndex == 2) else if(DateTimeIndex == 2)
{ {
if(gDateTime.Day > 1 && gDateTime.Day <= 31) if(gDateTime.Day > 1 && gDateTime.Day <= sf_get_month_days(gDateTime.Year, gDateTime.Mon))
gDateTime.Day--; gDateTime.Day--;
else else
gDateTime.Day = 31; gDateTime.Day = sf_get_month_days(gDateTime.Year, gDateTime.Mon);
} }
else if(DateTimeIndex == 4) else if(DateTimeIndex == 4)
{ {
@ -1287,7 +1319,7 @@ void Option_DateTime_Key(lv_obj_t* obj, uint32_t key)
} }
else if(DateTimeIndex == 2) else if(DateTimeIndex == 2)
{ {
if(gDateTime.Day >= 31) if(gDateTime.Day >= sf_get_month_days(gDateTime.Year, gDateTime.Mon))
gDateTime.Day = 1; gDateTime.Day = 1;
else else
gDateTime.Day++; gDateTime.Day++;
@ -1360,10 +1392,10 @@ void Option_DateTime_Key_Long_Press(lv_obj_t* obj, uint32_t key)
} }
else if(DateTimeIndex == 2) else if(DateTimeIndex == 2)
{ {
if(gDateTime.Day > 0 && gDateTime.Day <= 31) if(gDateTime.Day > 0 && gDateTime.Day <= sf_get_month_days(gDateTime.Year, gDateTime.Mon))
gDateTime.Day--; gDateTime.Day--;
else else
gDateTime.Day = 31; gDateTime.Day = sf_get_month_days(gDateTime.Year, gDateTime.Mon);
} }
else if(DateTimeIndex == 4) else if(DateTimeIndex == 4)
{ {
@ -1405,7 +1437,7 @@ void Option_DateTime_Key_Long_Press(lv_obj_t* obj, uint32_t key)
} }
else if(DateTimeIndex == 2) else if(DateTimeIndex == 2)
{ {
if(gDateTime.Day >= 31) if(gDateTime.Day >= sf_get_month_days(gDateTime.Year, gDateTime.Mon))
gDateTime.Day = 0; gDateTime.Day = 0;
else else
gDateTime.Day++; gDateTime.Day++;

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

@ -1019,7 +1019,7 @@ void show_Camera_Info_page(lv_obj_t* obj)
init_Matrix_style(); init_Matrix_style();
btnm = lv_btnmatrix_create(lv_scr_act(), NULL); btnm = lv_btnmatrix_create(obj, NULL);
lv_btnmatrix_set_map(btnm, map); lv_btnmatrix_set_map(btnm, map);
lv_obj_add_style(btnm, 0, &gMatrixStylebg); lv_obj_add_style(btnm, 0, &gMatrixStylebg);
lv_obj_add_style(btnm, 1, &gMatrixStylebtn); lv_obj_add_style(btnm, 1, &gMatrixStylebtn);
@ -1028,7 +1028,7 @@ void show_Camera_Info_page(lv_obj_t* obj)
lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE); lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE);
lv_btnmatrix_set_focused_btn(btnm, 0); lv_btnmatrix_set_focused_btn(btnm, 0);
CameraInfoImage = lv_img_create(lv_scr_act(), NULL); CameraInfoImage = lv_img_create(obj, NULL);
lv_obj_set_hidden(CameraInfoImage, false); lv_obj_set_hidden(CameraInfoImage, false);
lv_obj_set_click(CameraInfoImage, false); lv_obj_set_click(CameraInfoImage, false);
lv_obj_set_drag(CameraInfoImage, false); lv_obj_set_drag(CameraInfoImage, false);

28
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c
View File

@ -75,6 +75,7 @@ int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam)
{ {
puiPara->GprsMode = uwOption; puiPara->GprsMode = uwOption;
#define INSTANT_OPTION 1 #define INSTANT_OPTION 1
#define HYBIRD_OPTION 2
if (INSTANT_OPTION == puiPara->GprsMode && SF_OFF == puiPara->PirDelaySwitch) if (INSTANT_OPTION == puiPara->GprsMode && SF_OFF == puiPara->PirDelaySwitch)
{ {
puiPara->PirDelaySwitch = SF_ON; puiPara->PirDelaySwitch = SF_ON;
@ -83,28 +84,41 @@ int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam)
puiPara->PirDelayTime.Sec = 15; puiPara->PirDelayTime.Sec = 15;
} }
printf("\033[33m[Send_MenuCallback]GprsMode:%d\033[0m\n", puiPara->GprsMode); printf("\033[33m[Send_MenuCallback]GprsMode:%d\033[0m\n", puiPara->GprsMode);
break; if (INSTANT_OPTION == puiPara->GprsMode || HYBIRD_OPTION == puiPara->GprsMode)
{
#define SYNC_SEND_TYPE_SETTING 0
uwOption = SYNC_SEND_TYPE_SETTING;
printf("Sync send type settings.\n");
memset(&(puiPara->TimeSend1), 0, sizeof(SF_PARA_TIME_S));
memset(&(puiPara->TimeSend2), 0, sizeof(SF_PARA_TIME_S));
memset(&(puiPara->TimeSend3), 0, sizeof(SF_PARA_TIME_S));
memset(&(puiPara->TimeSend4), 0, sizeof(SF_PARA_TIME_S));
}
else
{
break;
}
} }
case IDM_SEND_TYPE: case IDM_SEND_TYPE:
{ {
puiPara->SendType = uwOption; puiPara->SendType = (uwOption == 3 ? 4 : uwOption);
puiPara->TimeSend4Switch = 0; puiPara->TimeSend4Switch = 0;
puiPara->TimeSend3Switch = 0; puiPara->TimeSend3Switch = 0;
puiPara->TimeSend2Switch = 0; puiPara->TimeSend2Switch = 0;
puiPara->TimeSend1Switch = 0; puiPara->TimeSend1Switch = 0;
switch (uwOption) switch (puiPara->SendType)
{ {
case FOUR_TIME_DAY: case FOUR_TIME_DAY:
puiPara->TimeSend4Switch = 1; puiPara->TimeSend4Switch = 1;
// break;
case TWICE_DAY:
puiPara->TimeSend3Switch = 1; puiPara->TimeSend3Switch = 1;
// break; // break;
case ONCE_DAY: case TWICE_DAY:
puiPara->TimeSend2Switch = 1; puiPara->TimeSend2Switch = 1;
// break; // break;
default: case ONCE_DAY:
puiPara->TimeSend1Switch = 1; puiPara->TimeSend1Switch = 1;
// break;
default:
break; break;
} }
printf("\033[33m[Send_MenuCallback]SendType:%d\033[0m\n", puiPara->SendType); printf("\033[33m[Send_MenuCallback]SendType:%d\033[0m\n", puiPara->SendType);

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.h
View File

@ -7,8 +7,8 @@ extern TM_ITEM gTM_ITEMS_SEND[];
enum SendType enum SendType
{ {
ONCE_DAY = 1, ONCE_DAY = 1,
TWICE_DAY, TWICE_DAY = 2,
FOUR_TIME_DAY, FOUR_TIME_DAY = 4,
END END
}; };

3
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c
View File

@ -174,7 +174,7 @@ static void load_info_from_sf(void)
SysSetFlag(IDF_DATE_AND_TIME, puiPara->DateAuto == SF_DATE_AUTO ? OPTION_0 : OPTION_1); SysSetFlag(IDF_DATE_AND_TIME, puiPara->DateAuto == SF_DATE_AUTO ? OPTION_0 : OPTION_1);
SysSetFlag(IDF_MAX_NUM_DAY, puiPara->SendMaxNum == 0 ? OPTION_0 : OPTION_1); SysSetFlag(IDF_MAX_NUM_DAY, puiPara->SendMaxNum == 0 ? OPTION_0 : OPTION_1);
SysSetFlag(IDF_SETTINGS_CHECK, puiPara->GprsMode); SysSetFlag(IDF_SETTINGS_CHECK, puiPara->GprsMode);
SysSetFlag(IDF_SEND_TYPE, puiPara->SendType); SysSetFlag(IDF_SEND_TYPE, (puiPara->SendType == 4 ? 3 : puiPara->SendType));
SysSetFlag(IDF_CHECK_IN_PHOTO, puiPara->PicUpDailyReport); SysSetFlag(IDF_CHECK_IN_PHOTO, puiPara->PicUpDailyReport);
SysSetFlag(IDF_GPS, puiPara->GpsSwitch); SysSetFlag(IDF_GPS, puiPara->GpsSwitch);
SysSetFlag(IDF_BATTERY_TYPE, puiPara->BatteryType); SysSetFlag(IDF_BATTERY_TYPE, puiPara->BatteryType);
@ -1044,6 +1044,7 @@ static void UIFlowMenuCommonItem_ChildScrClose(lv_obj_t* obj,const LV_USER_EVENT
set_indev_keypad_group(obj); set_indev_keypad_group(obj);
if(msg){ if(msg){
if(msg->event == NVTRET_ENTER_MENU){ if(msg->event == NVTRET_ENTER_MENU){
load_info_from_sf();
TM_MENU* pMenu = TM_GetMenu(); TM_MENU* pMenu = TM_GetMenu();
TM_PAGE *pPage; TM_PAGE *pPage;
// TM_ITEM *pItem; // TM_ITEM *pItem;

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

@ -42,8 +42,8 @@ lv_obj_t* image_wifi_scr_uiflowmovie;
lv_obj_t* image_motiondetect_scr_uiflowmovie; lv_obj_t* image_motiondetect_scr_uiflowmovie;
lv_obj_t* label_zoom_scr_uiflowmovie; lv_obj_t* label_zoom_scr_uiflowmovie;
lv_obj_t* label_maxtime_scr_uiflowmovie; lv_obj_t* label_maxtime_scr_uiflowmovie;
lv_obj_t* image_line_scr_uiflowmovie;
lv_obj_t* label_sim_scr_uiflowmovie; lv_obj_t* label_sim_scr_uiflowmovie;
lv_obj_t* label_line_scr_uiflowmovie;
lv_obj_t* UIFlowMovie_create(){ lv_obj_t* UIFlowMovie_create(){
lv_obj_t *parent = lv_plugin_scr_create(); lv_obj_t *parent = lv_plugin_scr_create();
@ -1770,55 +1770,6 @@ lv_obj_t* UIFlowMovie_create(){
label_maxtime_scr_uiflowmovie = label_maxtime; label_maxtime_scr_uiflowmovie = label_maxtime;
static lv_style_t image_line_s0;
lv_style_init(&image_line_s0);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_line_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_line_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_line_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_line_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_line_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_line_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_line_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_line_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_line_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_line_s0, LV_STATE_DISABLED, color);
lv_obj_t *image_line = lv_img_create(parent, NULL);
lv_obj_set_hidden(image_line, false);
lv_obj_set_click(image_line, false);
lv_obj_set_drag(image_line, false);
lv_obj_set_pos(image_line, 0, 119);
lv_obj_set_size(image_line, 320, 3);
lv_img_set_src(image_line, &sy_redline2);
lv_obj_add_style(image_line, 0, &image_line_s0);
image_line_scr_uiflowmovie = image_line;
static lv_style_t label_sim_s0; static lv_style_t label_sim_s0;
lv_style_init(&label_sim_s0); lv_style_init(&label_sim_s0);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_sim_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_sim_s0, LV_STATE_DEFAULT, color);
@ -1881,5 +1832,68 @@ lv_obj_t* UIFlowMovie_create(){
label_sim_scr_uiflowmovie = label_sim; label_sim_scr_uiflowmovie = label_sim;
static lv_style_t label_line_s0;
lv_style_init(&label_line_s0);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_DEFAULT, color);
lv_style_set_bg_opa(&label_line_s0,LV_STATE_DEFAULT,255);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_grad_color(&label_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_DEFAULT, color);
lv_style_set_text_opa(&label_line_s0,LV_STATE_DEFAULT,0);
lv_style_set_text_font(&label_line_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_grad_color(&label_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_grad_color(&label_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_grad_color(&label_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_grad_color(&label_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_grad_color(&label_line_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_grad_color(&label_line_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_DISABLED, color);
lv_obj_t *label_line = lv_label_create(parent, NULL);
lv_obj_set_hidden(label_line, false);
lv_obj_set_click(label_line, false);
lv_obj_set_drag(label_line, false);
lv_plugin_label_allocate_ext_attr(label_line);
lv_plugin_label_allocate_ext_attr(label_line);
lv_plugin_label_set_font_type(label_line, LV_PLUGIN_LANGUAGE_FONT_TYPE_0);
lv_label_set_align(label_line, LV_LABEL_ALIGN_CENTER);
lv_label_set_long_mode(label_line, LV_LABEL_LONG_SROLL);
lv_obj_set_pos(label_line, 0, 119);
lv_obj_set_size(label_line, 320, 3);
lv_obj_add_style(label_line, 0, &label_line_s0);
label_line_scr_uiflowmovie = label_line;
return parent; return parent;
} }

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

@ -50,8 +50,8 @@ extern lv_obj_t* image_wifi_scr_uiflowmovie;
extern lv_obj_t* image_motiondetect_scr_uiflowmovie; extern lv_obj_t* image_motiondetect_scr_uiflowmovie;
extern lv_obj_t* label_zoom_scr_uiflowmovie; extern lv_obj_t* label_zoom_scr_uiflowmovie;
extern lv_obj_t* label_maxtime_scr_uiflowmovie; extern lv_obj_t* label_maxtime_scr_uiflowmovie;
extern lv_obj_t* image_line_scr_uiflowmovie;
extern lv_obj_t* label_sim_scr_uiflowmovie; extern lv_obj_t* label_sim_scr_uiflowmovie;
extern lv_obj_t* label_line_scr_uiflowmovie;
/********************** /**********************
* GLOBAL PROTOTYPES * GLOBAL PROTOTYPES

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

@ -1415,22 +1415,23 @@ static void UIFlowMovie_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* m
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2){ if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2){
sf_set_phone_shot_status(PHONE_SHOT_STOP);
if(sf_get_mode_flag()) if(sf_get_mode_flag())
{ {
sf_wifi_server_stop_shoot_respond(0); sf_wifi_server_stop_shoot_respond(0);
} }
#else #else
if(SysGetFlag(CamMode) == SF_CAM_MODE_PHOTO_VIDEO){ if(SysGetFlag(CamMode) == SF_CAM_MODE_PHOTO_VIDEO){
#endif #endif
int iCurrMode = System_GetState(SYS_STATE_CURRMODE); int iCurrMode = System_GetState(SYS_STATE_CURRMODE);
int iNextMode = PRIMARY_MODE_PHOTO; int iNextMode = PRIMARY_MODE_PHOTO;
UI_SetData(FL_PreMode, iCurrMode); UI_SetData(FL_PreMode, iCurrMode);
UI_SetData(FL_NextMode, iNextMode); UI_SetData(FL_NextMode, iNextMode);
Ux_PostEvent(NVTEVT_SYSTEM_MODE, 1, iNextMode); Ux_PostEvent(NVTEVT_SYSTEM_MODE, 1, iNextMode);
} }
break; break;
} }
case NVTEVT_CB_MOVIE_WR_ERROR: case NVTEVT_CB_MOVIE_WR_ERROR:
{ {
@ -1539,7 +1540,7 @@ void UIFlowMovieEventCallback(lv_obj_t* obj, lv_event_t event)
case LV_USER_EVENT_KEY_RELEASE: case LV_USER_EVENT_KEY_RELEASE:
{ {
uint32_t* key = (uint32_t*)lv_event_get_data(); uint32_t* key = (uint32_t*)lv_event_get_data();
if (LV_KEY_ENTER != *key) if (LV_KEY_ENTER != *key || PHONE_SHOT_START == sf_get_phone_shot_status())
{ {
lv_indev_wait_release(lv_indev_get_act()); lv_indev_wait_release(lv_indev_get_act());
break; break;

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

@ -51,7 +51,7 @@ lv_obj_t* label_2_scr_uiflowphoto;
lv_obj_t* button_3_scr_uiflowphoto; lv_obj_t* button_3_scr_uiflowphoto;
lv_obj_t* label_3_scr_uiflowphoto; lv_obj_t* label_3_scr_uiflowphoto;
lv_obj_t* label_sim_scr_uiflowphoto; lv_obj_t* label_sim_scr_uiflowphoto;
lv_obj_t* image_line_scr_uiflowphoto; lv_obj_t* label_line_scr_uiflowphoto;
lv_obj_t* UIFlowPhoto_create(){ lv_obj_t* UIFlowPhoto_create(){
lv_obj_t *parent = lv_plugin_scr_create(); lv_obj_t *parent = lv_plugin_scr_create();
@ -2317,53 +2317,67 @@ lv_obj_t* UIFlowPhoto_create(){
label_sim_scr_uiflowphoto = label_sim; label_sim_scr_uiflowphoto = label_sim;
static lv_style_t image_line_s0; static lv_style_t label_line_s0;
lv_style_init(&image_line_s0); lv_style_init(&label_line_s0);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_line_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_line_s0, LV_STATE_DEFAULT, color); lv_style_set_bg_opa(&label_line_s0,LV_STATE_DEFAULT,255);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_line_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_grad_color(&label_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_line_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_line_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_line_s0, LV_STATE_CHECKED, color); lv_style_set_text_opa(&label_line_s0,LV_STATE_DEFAULT,0);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_line_s0, LV_STATE_CHECKED, color); lv_style_set_text_font(&label_line_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_line_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_line_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_line_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_line_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_grad_color(&label_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_line_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_line_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_line_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_line_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_line_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_line_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_grad_color(&label_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_line_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_line_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_line_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_line_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_line_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_line_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_grad_color(&label_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_line_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_line_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_line_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_line_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_line_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_line_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_grad_color(&label_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_line_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_line_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_line_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_line_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_line_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_image_recolor(&image_line_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_grad_color(&label_line_s0, LV_STATE_PRESSED, color);
lv_obj_t *image_line = lv_img_create(parent, NULL); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_PRESSED, color);
lv_obj_set_hidden(image_line, false); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_PRESSED, color);
lv_obj_set_click(image_line, false); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_PRESSED, color);
lv_obj_set_drag(image_line, false); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_PRESSED, color);
lv_obj_set_pos(image_line, 0, 119); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_color(&label_line_s0, LV_STATE_DISABLED, color);
lv_obj_set_size(image_line, 320, 3); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_bg_grad_color(&label_line_s0, LV_STATE_DISABLED, color);
lv_img_set_src(image_line, &sy_redline2); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_line_s0, LV_STATE_DISABLED, color);
lv_obj_add_style(image_line, 0, &image_line_s0); STYLE_COLOR_PROP(0x03, 0xff, 0x00, 0x00) ; lv_style_set_text_color(&label_line_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_line_s0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_line_s0, LV_STATE_DISABLED, color);
lv_obj_t *label_line = lv_label_create(parent, NULL);
lv_obj_set_hidden(label_line, false);
lv_obj_set_click(label_line, false);
lv_obj_set_drag(label_line, false);
lv_plugin_label_allocate_ext_attr(label_line);
lv_plugin_label_allocate_ext_attr(label_line);
lv_plugin_label_set_font_type(label_line, LV_PLUGIN_LANGUAGE_FONT_TYPE_0);
lv_label_set_align(label_line, LV_LABEL_ALIGN_CENTER);
lv_label_set_long_mode(label_line, LV_LABEL_LONG_SROLL);
lv_obj_set_pos(label_line, 0, 119);
lv_obj_set_size(label_line, 320, 3);
lv_obj_add_style(label_line, 0, &label_line_s0);
image_line_scr_uiflowphoto = image_line; label_line_scr_uiflowphoto = label_line;
return parent; return parent;

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.h
View File

@ -59,7 +59,7 @@ extern lv_obj_t* label_2_scr_uiflowphoto;
extern lv_obj_t* button_3_scr_uiflowphoto; extern lv_obj_t* button_3_scr_uiflowphoto;
extern lv_obj_t* label_3_scr_uiflowphoto; extern lv_obj_t* label_3_scr_uiflowphoto;
extern lv_obj_t* label_sim_scr_uiflowphoto; extern lv_obj_t* label_sim_scr_uiflowphoto;
extern lv_obj_t* image_line_scr_uiflowphoto; extern lv_obj_t* label_line_scr_uiflowphoto;
/********************** /**********************
* GLOBAL PROTOTYPES * GLOBAL PROTOTYPES

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

@ -71,6 +71,7 @@ static BOOL g_PhotoBgInitFileSys = FALSE;
static BOOL g_SysStrg_Chg = FALSE; static BOOL g_SysStrg_Chg = FALSE;
//#NT#2023/11/21#Eric - end //#NT#2023/11/21#Eric - end
static void sf_show_send_text(lv_obj_t* obj, const unsigned short status);
static lv_obj_t *g_preview_info_msgbox = NULL; static lv_obj_t *g_preview_info_msgbox = NULL;
static lv_obj_t *g_preview_info_label = NULL; static lv_obj_t *g_preview_info_label = NULL;
static int g_preview_info_ishidden = true; static int g_preview_info_ishidden = true;
@ -600,14 +601,6 @@ static void update_4g_module_icon(void)
// Nothing changed. // Nothing changed.
// printf(" nothing changed.\n"); // printf(" nothing changed.\n");
} }
if (SENDING_NOT_SHOW < SendMsgShow)
{
SendMsgShow--;
if (SENDING_NOT_SHOW == SendMsgShow)
{
lv_obj_set_hidden(label_sim_scr_uiflowphoto, true);
}
}
// if(sf_cardv_4G_status_get() == SF_4G_SENDING) // if(sf_cardv_4G_status_get() == SF_4G_SENDING)
// { // {
@ -633,7 +626,40 @@ const int EMPTY_IMAGE = 0;
lv_obj_set_hidden(image_4g_scr_uiflowphoto, false); lv_obj_set_hidden(image_4g_scr_uiflowphoto, false);
lv_plugin_img_set_src(image_4g_scr_uiflowphoto, res[index]); lv_plugin_img_set_src(image_4g_scr_uiflowphoto, res[index]);
} }
static void update_gps_status(void)
{
if (SENDING_NOT_SHOW < SendMsgShow)
{
SendMsgShow--;
if (SENDING_NOT_SHOW == SendMsgShow)
{
lv_obj_set_hidden(label_sim_scr_uiflowphoto, true);
}
return;
}
if (TRUE == sf_get_send_statu())
{
sf_show_send_text(UIFlowPhoto, FILE_SENDING_GUI_START_SENDING);
return;
}
SF_GPS_STATUS_E status = sf_cardv_get_gps_status();
switch (status)
{
case SF_GPS_SEARCHING_START:
{
lv_obj_set_hidden(label_sim_scr_uiflowphoto, false);
lv_label_set_text(label_sim_scr_uiflowphoto, "GPS searching...");
break;
}
case SF_GPS_SEARCHING_STOP:
{
lv_obj_set_hidden(label_sim_scr_uiflowphoto, true);
break;
}
default:
break;
}
}
static void update_camera_message(void) static void update_camera_message(void)
{ {
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
@ -854,6 +880,7 @@ static void update_icons(void)
update_wifi(); update_wifi();
update_bluetooth(); update_bluetooth();
update_camera_mode(); update_camera_mode();
update_gps_status();
} }
static void FlowPhoto_InitStartupFuncs(void) static void FlowPhoto_InitStartupFuncs(void)
@ -1663,6 +1690,7 @@ void UIFlowPhoto_UpdateInfo(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg)
Ux_PostEvent(NVTEVT_SYSTEM_MODE, 1, iNextMode); Ux_PostEvent(NVTEVT_SYSTEM_MODE, 1, iNextMode);
} }
else { else {
sf_set_phone_shot_status(PHONE_SHOT_STOP);
if(sf_get_mode_flag()) if(sf_get_mode_flag())
{ {
sf_wifi_server_stop_shoot_respond(0); sf_wifi_server_stop_shoot_respond(0);
@ -1873,7 +1901,7 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
printf("\r\n[%s] line:%d %d running\n", __FUNCTION__, __LINE__,key); printf("\r\n[%s] line:%d %d running\n", __FUNCTION__, __LINE__,key);
break; break;
} }
if (0 > appSvrResponseSocketGet() && SF_BLE_CON != sf_get_ble_status()) // if (0 > appSvrResponseSocketGet() && SF_BLE_CON != sf_get_ble_status())
{ {
// UIFlowPhoto_OnExeZoomOutStart(obj); // UIFlowPhoto_OnExeZoomOutStart(obj);
UIFlowPhoto_OnExeOpenPlayScreen(obj); UIFlowPhoto_OnExeOpenPlayScreen(obj);
@ -2035,7 +2063,8 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
case LV_EVENT_KEY: case LV_EVENT_KEY:
{ {
if (PHOTO_ST_CAPTURE == gPhotoData.State || FILE_SENDING_GUI_START_SENDING == gSendingStatus) if (PHOTO_ST_CAPTURE == gPhotoData.State || FILE_SENDING_GUI_START_SENDING == gSendingStatus ||
PHONE_SHOT_START == sf_get_phone_shot_status())
{ {
printf("PHOTO_ST_CAPTURE not handl key event.\n"); printf("PHOTO_ST_CAPTURE not handl key event.\n");
break; break;
@ -2048,7 +2077,8 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
} }
case LV_USER_EVENT_KEY_RELEASE: case LV_USER_EVENT_KEY_RELEASE:
{ {
if (PHOTO_ST_CAPTURE == gPhotoData.State || FILE_SENDING_GUI_START_SENDING == gSendingStatus) if (PHOTO_ST_CAPTURE == gPhotoData.State || FILE_SENDING_GUI_START_SENDING == gSendingStatus ||
PHONE_SHOT_START == sf_get_phone_shot_status())
{ {
printf("PHOTO_ST_CAPTURE not handl key event.\n"); printf("PHOTO_ST_CAPTURE not handl key event.\n");
break; break;

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

@ -127,22 +127,22 @@ BOOL FlowPhoto_IsStorageErr(void)
#if (FS_FUNC == ENABLE) #if (FS_FUNC == ENABLE)
if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) { if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) {
// Ux_OpenWindow(&UIFlowWndWrnMsgCtrl, 2, FLOWWRNMSG_ISSUE_MEM_ERR, FLOWWRNMSG_TIMER_KEEP); // Ux_OpenWindow(&UIFlowWndWrnMsgCtrl, 2, FLOWWRNMSG_ISSUE_MEM_ERR, FLOWWRNMSG_TIMER_KEEP);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_NO_SD, 1000 * 2); /* keep msgbox */ // UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_NO_SD, 1000 * 2); /* keep msgbox */
return TRUE; return TRUE;
} }
if (UIStorageCheck(STORAGE_CHECK_FULL, &(g_uiFreePicNum)) == TRUE) { if (UIStorageCheck(STORAGE_CHECK_FULL, &(g_uiFreePicNum)) == TRUE) {
if (System_GetState(SYS_STATE_CARD) == CARD_REMOVED) { if (System_GetState(SYS_STATE_CARD) == CARD_REMOVED) {
//Ux_OpenWindow(&UIFlowWndWrnMsgCtrl, 2, UIFlowWndWrnMsg_StatusTXT_Msg_STRID_PLEASE_INSERT_SD, FLOWWRNMSG_TIMER_2SEC); //Ux_OpenWindow(&UIFlowWndWrnMsgCtrl, 2, UIFlowWndWrnMsg_StatusTXT_Msg_STRID_PLEASE_INSERT_SD, FLOWWRNMSG_TIMER_2SEC);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, 2000); // UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, 2000);
} else { } else {
//Ux_OpenWindow(&UIFlowWndWrnMsgCtrl, 2, UIFlowWndWrnMsg_StatusTXT_Msg_STRID_CARD_FULL, FLOWWRNMSG_TIMER_2SEC); //Ux_OpenWindow(&UIFlowWndWrnMsgCtrl, 2, UIFlowWndWrnMsg_StatusTXT_Msg_STRID_CARD_FULL, FLOWWRNMSG_TIMER_2SEC);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_CARD_FULL, 2000); // UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_CARD_FULL, 2000);
} }
return TRUE; return TRUE;
} }
if (UIStorageCheck(STORAGE_CHECK_LOCKED, NULL) == TRUE) { if (UIStorageCheck(STORAGE_CHECK_LOCKED, NULL) == TRUE) {
//Ux_OpenWindow(&UIFlowWndWrnMsgCtrl, 2, UIFlowWndWrnMsg_StatusTXT_Msg_STRID_CARD_LOCKED, FLOWWRNMSG_TIMER_2SEC); //Ux_OpenWindow(&UIFlowWndWrnMsgCtrl, 2, UIFlowWndWrnMsg_StatusTXT_Msg_STRID_CARD_LOCKED, FLOWWRNMSG_TIMER_2SEC);
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_CARD_LOCKED, 2000); // UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_CARD_LOCKED, 2000);
return TRUE; return TRUE;
} }
#endif #endif

5
code/application/source/sf_app/code/include/sf_commu_mcu_reg.h
View File

@ -357,6 +357,11 @@ void sf_set_module_sleep_flag(UINT8 flag);
UINT8 sf_get_module_sleep_flag(void); UINT8 sf_get_module_sleep_flag(void);
int sf_app_while_flag(void); int sf_app_while_flag(void);
void sf_set_sim_insert(INT32 sim); void sf_set_sim_insert(INT32 sim);
#define GPS_SEARCHING_START 0
#define GPS_SEARCHING_STOP 1
#define GPS_SEARCHING_SUCCESSFUL 2
#define GPS_SEARCHING_FAILED 3
void sf_set_gps_status(const short status);
void sf_set_usb_init(int flag); void sf_set_usb_init(int flag);
UINT32 sf_get_sim_insert(void); UINT32 sf_get_sim_insert(void);
int sf_get_signal_ready(void); int sf_get_signal_ready(void);

1
code/application/source/sf_app/code/include/sf_param_enum.h
View File

@ -486,6 +486,7 @@ typedef enum sf_PARA_MESSAGE_TYPE_E
SF_PARA_CMD_SIMISINSERT = 0x1F06, SF_PARA_CMD_SIMISINSERT = 0x1F06,
SF_PARA_CMD_ISESIM = 0x1F07, SF_PARA_CMD_ISESIM = 0x1F07,
SF_PARA_CMD_USB_INIT = 0x1F08, SF_PARA_CMD_USB_INIT = 0x1F08,
SF_PARA_CMD_GPS_STATUS = 0X1F09,
}SF_PARA_MESSAGE_TYPE_E; }SF_PARA_MESSAGE_TYPE_E;
typedef enum sf_WIFI_MESSAGE_TYPE_E typedef enum sf_WIFI_MESSAGE_TYPE_E

8
code/application/source/sf_app/code/include/sf_wifi_svr.h
View File

@ -916,7 +916,11 @@ typedef enum thumbSize{
THUMB_1280x960, THUMB_1280x960,
THUMB_1920x1440, THUMB_1920x1440,
}thumbSize_t; }thumbSize_t;
typedef enum phoneShot{
PHONE_SHOT_START,
PHONE_SHOT_STOP,
PHONE_SHOT_END,
}PHONE_SHOT_E;
/* /*
UINT8 forbuild[32]; UINT8 forbuild[32];
@ -947,4 +951,6 @@ void sf_apinfo_thread_init(void);
void sf_wifi_set_cam_mode(void); void sf_wifi_set_cam_mode(void);
void appSvrResponseSocketSet(SINT32 socket); void appSvrResponseSocketSet(SINT32 socket);
SINT32 appSvrResponseSocketGet(void); SINT32 appSvrResponseSocketGet(void);
void sf_set_phone_shot_status(const PHONE_SHOT_E status);
const PHONE_SHOT_E sf_get_phone_shot_status(void);
#endif /*__SF_WIFI_SERVER__*/ #endif /*__SF_WIFI_SERVER__*/

4
code/application/source/sf_app/code/source/app/sf_service.c
View File

@ -2165,6 +2165,7 @@ SINT32 open_gps(const SINT32 utc)
{ {
//UIMenuStoreInfo *pCustomerParam = sf_app_ui_para_get(); //UIMenuStoreInfo *pCustomerParam = sf_app_ui_para_get();
//SINT32 s32ret = 0; //SINT32 s32ret = 0;
sf_set_gps_status(GPS_SEARCHING_START);
SF_PARA_TIME_S current_time = { 0, 0, 0, 0, 0, 0}; SF_PARA_TIME_S current_time = { 0, 0, 0, 0, 0, 0};
sf_get_ntp(utc, &current_time); sf_get_ntp(utc, &current_time);
#define NTP_TIME_LENGTH 32 #define NTP_TIME_LENGTH 32
@ -2187,6 +2188,7 @@ int get_gps_location(void)
GpsLocation location; GpsLocation location;
memset(&location, 0, sizeof(GpsLocation)); memset(&location, 0, sizeof(GpsLocation));
location = gps_get_location(); location = gps_get_location();
sf_set_gps_status(GPS_SEARCHING_STOP);
if (strlen(location.latitude) > 0 && strlen(location.longitude) > 0) if (strlen(location.latitude) > 0 && strlen(location.longitude) > 0)
{ {
LogInfo("Get gps location!\n"); LogInfo("Get gps location!\n");
@ -2196,8 +2198,10 @@ int get_gps_location(void)
strcpy(pCustomerParam->Latitude, location.latitude); strcpy(pCustomerParam->Latitude, location.latitude);
LogInfo("location.Longitude = %s\n", pCustomerParam->Longitude); LogInfo("location.Longitude = %s\n", pCustomerParam->Longitude);
LogInfo("location.Latitude = %s\n", pCustomerParam->Latitude); LogInfo("location.Latitude = %s\n", pCustomerParam->Latitude);
// sf_set_gps_status(GPS_SEARCHING_SUCCESSFUL);
return GPS_GET_SUCCEED; return GPS_GET_SUCCEED;
} }
// sf_set_gps_status(GPS_SEARCHING_FAILED);
return GPS_GET_FAILED; return GPS_GET_FAILED;
} }
void keep_get_gps_location(const SF_GPS_PARAM param) void keep_get_gps_location(const SF_GPS_PARAM param)

2
code/application/source/sf_app/code/source/qrcodeMng/sf_qrcode.c
View File

@ -110,7 +110,7 @@ SINT16 sf_qrcode_create(SF_CHAR *pIMEI,SF_CHAR *pSimID ,SF_CHAR* pVersion)
UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); UIMenuStoreInfo *puiPara = sf_app_ui_para_get();
sprintf(qrsrc_Str, "{\"imei\":\"%s\",\"verizonICCID\":\"%s\",\"attICCID\":\"%s\",\"isEsim\":%s}", sprintf(qrsrc_Str, "{\"imei\":\"%s\",\"verizonICCID\":\"%s\",\"attICCID\":\"%s\",\"isEsim\":%s}",
puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, sf_is_esim_card() ? "true" : "false"); puiPara->ModuleImei, puiPara->SimIccidV, puiPara->SimIccidA, sf_is_esim_card() == 1 ? "true" : "false");
MLOGI("qrStr = %s\n",qrsrc_Str); MLOGI("qrStr = %s\n",qrsrc_Str);
sf_qrcode_encode(qrsrc_Str, strlen(qrsrc_Str), "/mnt/sd/QR.BMP"); sf_qrcode_encode(qrsrc_Str, strlen(qrsrc_Str), "/mnt/sd/QR.BMP");
MLOGI("QR.BMP have existed \n"); MLOGI("QR.BMP have existed \n");

8
code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c
View File

@ -1241,6 +1241,14 @@ void sf_set_sim_insert(INT32 sim)
simCardInsert = sim; simCardInsert = sim;
} }
void sf_set_gps_status(const short status)
{
SF_MESSAGE_BUF_S stMessageBuf = {0};
stMessageBuf.arg2 = status;
stMessageBuf.arg1 = SF_PARA_CMD_GPS_STATUS;
stMessageBuf.cmdId = CMD_PARA;
sf_com_message_send_to_cardv(&stMessageBuf);
}
void sf_set_usb_init(int flag) void sf_set_usb_init(int flag)
{ {
SF_MESSAGE_BUF_S stMessageBuf = {0}; SF_MESSAGE_BUF_S stMessageBuf = {0};

12
code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
View File

@ -141,6 +141,8 @@ INT32 DigitalZoom = 0;
sysMsg_t sendMsg; sysMsg_t sendMsg;
static SF_WIFI_STATUS_E WifiStatus = SF_WIFI_BUTT; static SF_WIFI_STATUS_E WifiStatus = SF_WIFI_BUTT;
static PHONE_SHOT_E gPhoneShot = PHONE_SHOT_END;
/************************************************************************** /**************************************************************************
* E X T E R N A L R E F E R E N C E S * * E X T E R N A L R E F E R E N C E S *
**************************************************************************/ **************************************************************************/
@ -1997,6 +1999,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen)
//Ux_PostEvent(NVTEVT_KEY_SHUTTER2, 1, NVTEVT_KEY_PRESS); //Ux_PostEvent(NVTEVT_KEY_SHUTTER2, 1, NVTEVT_KEY_PRESS);
//Ux_PostEvent(NVTEVT_KEY_SHUTTER2, 1, NVTEVT_KEY_RELEASE); //Ux_PostEvent(NVTEVT_KEY_SHUTTER2, 1, NVTEVT_KEY_RELEASE);
sf_set_phone_shot_status(PHONE_SHOT_START);
FlowPhoto_DoCapture(); FlowPhoto_DoCapture();
respFlag = 1; respFlag = 1;
ret = 0; ret = 0;
@ -2213,6 +2216,15 @@ SINT32 appSvrResponseSocketGet(void)
//printf("appSvrResponseSocketSet socket=%d\n", socket); //printf("appSvrResponseSocketSet socket=%d\n", socket);
return gSendSocket; return gSendSocket;
} }
void sf_set_phone_shot_status(const PHONE_SHOT_E status)
{
printf("sf_set_phone_shot_status = %d\n", status);
gPhoneShot = status;
}
const PHONE_SHOT_E sf_get_phone_shot_status(void)
{
return gPhoneShot;
}
UINT8 sf_wifi_server_stop_shoot_respond(UINT8 errCode) UINT8 sf_wifi_server_stop_shoot_respond(UINT8 errCode)
{ {

12
code/lib/source/sifar/code/include/sf_common.h
View File

@ -23,6 +23,16 @@ typedef enum sfBLE_STATUS_E
SF_BLE_BUTT, SF_BLE_BUTT,
} SF_BLE_STATUS_E; } SF_BLE_STATUS_E;
typedef enum sfGPS_STATUS_E
{
SF_GPS_SEARCHING_UNKNOW = -1,
SF_GPS_SEARCHING_START,
SF_GPS_SEARCHING_STOP,
SF_GPS_SEARCHING_SUCCESSFUL,
SF_GPS_SEARCHING_FAILED,
SF_GPS_SEARCHING_END,
} SF_GPS_STATUS_E;
typedef enum{ typedef enum{
FILE_SENDING_GUI_START_SENDING = 0, FILE_SENDING_GUI_START_SENDING = 0,
FILE_SENDING_GUI_STOP_SENDING, FILE_SENDING_GUI_STOP_SENDING,
@ -114,6 +124,8 @@ BOOL sf_is_movie_preview(void);
BOOL sf_is_cap_preview(void); BOOL sf_is_cap_preview(void);
BOOL sf_is_preview(void); BOOL sf_is_preview(void);
short sf_cardv_get_cq_signal(void); short sf_cardv_get_cq_signal(void);
void sf_cardv_set_gps_status(const SF_GPS_STATUS_E status);
const SF_GPS_STATUS_E sf_cardv_get_gps_status(void);
void sf_cardv_4G_status_set(UINT8 status); void sf_cardv_4G_status_set(UINT8 status);
UINT8 sf_cardv_4G_status_get(void); UINT8 sf_cardv_4G_status_get(void);
void sf_cardv_set_sim_insert(INT8 sim); void sf_cardv_set_sim_insert(INT8 sim);

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

@ -99,6 +99,7 @@ static SINT32 WifiSocket = 0;
static UINT8 UiparaFlag = 0; static UINT8 UiparaFlag = 0;
static SF_BLE_STATUS_E BleStatus = SF_BLE_OK; static SF_BLE_STATUS_E BleStatus = SF_BLE_OK;
static UINT8 McuUpdateFlag = 0; static UINT8 McuUpdateFlag = 0;
static SF_GPS_STATUS_E gGpsSearching = SF_GPS_SEARCHING_UNKNOW;
static SF_THREAD_S UpgradeTskParam = static SF_THREAD_S UpgradeTskParam =
{ {
@ -1526,6 +1527,15 @@ short sf_cardv_get_cq_signal(void)
{ {
return cq_Signal; return cq_Signal;
} }
void sf_cardv_set_gps_status(const SF_GPS_STATUS_E status)
{
printf("sf_cardv_set_gps_status = %d\n", status);
gGpsSearching = status;
}
const SF_GPS_STATUS_E sf_cardv_get_gps_status(void)
{
return gGpsSearching;
}
/************************************************* /*************************************************
Function: sf_cardv_adc_value_get Function: sf_cardv_adc_value_get
@ -1765,6 +1775,9 @@ static SINT32 sf_cardv_proccess_cmd_para_update(SF_MESSAGE_BUF_S *pMessageBuf)
break; break;
case SF_PARA_CMD_USB_INIT: case SF_PARA_CMD_USB_INIT:
sf_cardv_set_usb_init(pMessageBuf->arg2); sf_cardv_set_usb_init(pMessageBuf->arg2);
break;
case SF_PARA_CMD_GPS_STATUS:
sf_cardv_set_gps_status(pMessageBuf->arg2);
break; break;
default: default:
break; break;
@ -2084,7 +2097,7 @@ void sf_ui_sending_show(unsigned short status)
BOOL sf_get_send_statu(void) BOOL sf_get_send_statu(void)
{ {
printf("[%s]:%d IsSend:%d\n", __FUNCTION__, __LINE__,IsSend); // printf("[%s]:%d IsSend:%d\n", __FUNCTION__, __LINE__,IsSend);
return IsSend; return IsSend;
} }

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

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