From f7bdc261f0438307f2807146b802dc5be0001fd8 Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 12 Jul 2023 09:45:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h | 8 ++++++-- .../SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c | 8 ++++++++ .../SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h | 14 ++++++++++++++ .../SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h | 14 ++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h index 9f0a092da..58f058539 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h @@ -206,7 +206,8 @@ #define DEFAULT_NEED_TIME_SYNC SF_NEED_TIME_SYNC_OFF #define DEFAULT_VIDEO_LENTH VIDEO_LENTH_10 -#define DEFAULT_TIMELAPSE_SWITCH SF_ON +#define DEFAULT_SEND_TYPE SF_SEND_TIMELY +#define DEFAULT_TIMELAPSE_SWITCH SF_OFF #define DEFAULT_PIR_DELAY_SWITCH SF_OFF #define DEFAULT_GPRS_MODE SF_REMOTE_CONTROL_OFF #define DEFAULT_DAILY_REPORT_SWITCH SF_ON @@ -231,10 +232,12 @@ #define DEFAULT_STAMP_SWITCH SF_ON #define DEFAULT_SD_LOOP_SWITCH SF_ON #define DEFAULT_PWD_SWITCH SF_OFF +#define DEFAULT_MULTISHOT SF_MULTISHOT_1P #define DEFAULT_SEND_MULTISHOT_INDEX1 SF_ON #define DEFAULT_SEND_MULTISHOT_INDEX2 SF_OFF #define DEFAULT_SEND_MULTISHOT_INDEX3 SF_OFF #define DEFAULT_SEND_MULTISHOT_INDEX4 SF_OFF +#define DEFAULT_SEND_MULTISHOT SF_OFF #define DEFAULT_DATE_AUTO SF_DATE_AUTO #define DEFAULT_CAM_ARM_DIABLE SF_OFF #define DEFAULT_DEBUG_MODE SF_OFF @@ -251,8 +254,9 @@ #define DEFAULT_TIMESEND2_SWITCH SF_OFF #define DEFAULT_TIMESEND3_SWITCH SF_OFF #define DEFAULT_TIMESEND4_SWITCH SF_OFF -#define DEFAULT_FTP_SWITCH SF_FTP_ON +#define DEFAULT_FTP_SWITCH SF_FTPS_ON #define DEFAULT_MULTISHOT_INTEVEL SF_MULTISHOT_INTEVEL_1S +#define DEFAULT_PIC_UP_DAILY_REPORT SF_OFF #define SIFAR_FTP_IP "119.23.174.139" #define SIFAR_FTP_PORT "21" diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c index 21852eb17..ffb281ce4 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c @@ -1717,10 +1717,13 @@ void SysResetFlag(void) puiPara->SendPhotoSwitch = DEFAULT_SEND_PHOTO_SWITCH; puiPara->SendVideoSwitch = DEFAULT_SEND_VIDEO_SWITCH; puiPara->SendPicSize = DEFAULT_SEND_PIC_SIZE; + puiPara->Multishot = DEFAULT_MULTISHOT; puiPara->SendMultishotIndex1 = DEFAULT_SEND_MULTISHOT_INDEX1; puiPara->SendMultishotIndex2 = DEFAULT_SEND_MULTISHOT_INDEX2; puiPara->SendMultishotIndex3 = DEFAULT_SEND_MULTISHOT_INDEX3; puiPara->SendMultishotIndex4 = DEFAULT_SEND_MULTISHOT_INDEX4; + puiPara->SendMulti = DEFAULT_SEND_MULTISHOT; + puiPara->SendType = DEFAULT_SEND_TYPE; puiPara->DateAuto = DEFAULT_DATE_AUTO; //NTPZoneS, //NTPZoneH, @@ -1741,6 +1744,7 @@ void SysResetFlag(void) puiPara->BatteryLogSwitch = DEFAULT_BATTRERY_LOG_SWITCH; puiPara->FtpSwitch = DEFAULT_FTP_SWITCH; puiPara->MultiShotIntevel = DEFAULT_MULTISHOT_INTEVEL; + puiPara->PicUpDailyReport = DEFAULT_PIC_UP_DAILY_REPORT; if(puiPara->ModuleImei[0] != '\0') { @@ -1777,6 +1781,10 @@ void SysResetFlag(void) snprintf((char *)puiPara->FtpPort, sizeof(puiPara->FtpPort), USER_FTP_PORT); snprintf((char *)puiPara->FtpUsr, sizeof(puiPara->FtpUsr), USER_FTP_USERNAME); snprintf((char *)puiPara->FtpPwd, sizeof(puiPara->FtpPwd), USER_FTP_PASSWORD); + snprintf((char *)puiPara->FtpsIp, sizeof(puiPara->FtpsIp), USER_FTP_IP); + snprintf((char *)puiPara->FtpsPort, sizeof(puiPara->FtpsPort), USER_FTP_PORT); + snprintf((char *)puiPara->FtpsUsr, sizeof(puiPara->FtpsUsr), USER_FTP_USERNAME); + snprintf((char *)puiPara->FtpsPwd, sizeof(puiPara->FtpsPwd), USER_FTP_PASSWORD); //SF_STRCPY(puiPara ->APNGPRS, "3gnet"); #else sf_base64_decode(USER_FTP_IP, (char *)tmpStr); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h index b15dd1068..25423f3a9 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h @@ -1992,6 +1992,20 @@ typedef enum { SF_MULTISHOT_INTEVEL_MAX, } SF_MULTISHOT_INTEVEL_e; +typedef enum { + SF_MULTISHOT_1P = 0, + SF_MULTISHOT_2P, + SF_MULTISHOT_3P, + SF_MULTISHOT_MAX, +} SF_MULTISHOT_e; + +typedef enum { + SF_SEND_TIMELY = 0, + SF_SEND_TIMELY1, + SF_SEND_TIMELY2, + SF_SEND_TIMELY_MAX, +} SF_SEND_TYPE_e; + extern void Load_SysInfo(void); extern void Save_SysInfo(void); extern void Init_SysInfo(void); diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h index e5fdb479a..48445772b 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h @@ -1992,6 +1992,20 @@ typedef enum { SF_MULTISHOT_INTEVEL_MAX, } SF_MULTISHOT_INTEVEL_e; +typedef enum { + SF_MULTISHOT_1P = 0, + SF_MULTISHOT_2P, + SF_MULTISHOT_3P, + SF_MULTISHOT_MAX, +} SF_MULTISHOT_e; + +typedef enum { + SF_SEND_TIMELY = 0, + SF_SEND_TIMELY1, + SF_SEND_TIMELY2, + SF_SEND_TIMELY_MAX, +} SF_SEND_TYPE_e; + extern void Load_SysInfo(void); extern void Save_SysInfo(void); extern void Init_SysInfo(void);