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

1.ui参数的优化

Browse Source
This commit is contained in:
payton 2023-07-21 11:09:52 +08:00
parent 951179ab21
commit ccd611388c
3 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h
View File

@ -180,6 +180,7 @@
#define DEFAULT_BOOT_WORK_MODE SF_CAM_MODE_PHOTO #define DEFAULT_BOOT_WORK_MODE SF_CAM_MODE_PHOTO
#define DEFAULT_PIR_SWITCH SF_OFF #define DEFAULT_PIR_SWITCH SF_OFF
#define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_0 #define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_0
#define DEFAULT_TIMELAPSE_SWITCH SF_ON
#else #else
#if SF_BATTERY_TEST == ENABLE #if SF_BATTERY_TEST == ENABLE
@ -189,6 +190,7 @@
#endif #endif
#define DEFAULT_PIR_SWITCH SF_ON #define DEFAULT_PIR_SWITCH SF_ON
#define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_7 #define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_7
#define DEFAULT_TIMELAPSE_SWITCH SF_OFF
#endif #endif
#define DEFAULT_NET_WORK_NEED_SEARCH SF_OFF #define DEFAULT_NET_WORK_NEED_SEARCH SF_OFF
#define DEFAULT_AUTO_OFF_SWITCH SF_OFF #define DEFAULT_AUTO_OFF_SWITCH SF_OFF
@ -198,6 +200,7 @@
#define DEFAULT_AUTO_OFF_SWITCH SF_ON #define DEFAULT_AUTO_OFF_SWITCH SF_ON
#define DEFAULT_PIR_SWITCH SF_ON #define DEFAULT_PIR_SWITCH SF_ON
#define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_7 #define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_7
#define DEFAULT_TIMELAPSE_SWITCH SF_OFF
#endif #endif
#define DEFAULT_SF_CAMID SF_CAMID_OFF #define DEFAULT_SF_CAMID SF_CAMID_OFF
@ -207,7 +210,6 @@
#define DEFAULT_VIDEO_LENTH VIDEO_LENTH_10 #define DEFAULT_VIDEO_LENTH VIDEO_LENTH_10
#define DEFAULT_SEND_TYPE SF_SEND_TIMELY #define DEFAULT_SEND_TYPE SF_SEND_TIMELY
#define DEFAULT_TIMELAPSE_SWITCH SF_OFF
#define DEFAULT_PIR_DELAY_SWITCH SF_OFF #define DEFAULT_PIR_DELAY_SWITCH SF_OFF
#define DEFAULT_GPRS_MODE SF_REMOTE_CONTROL_OFF #define DEFAULT_GPRS_MODE SF_REMOTE_CONTROL_OFF
#define DEFAULT_DAILY_REPORT_SWITCH SF_ON #define DEFAULT_DAILY_REPORT_SWITCH SF_ON
@ -232,7 +234,6 @@
#define DEFAULT_STAMP_SWITCH SF_ON #define DEFAULT_STAMP_SWITCH SF_ON
#define DEFAULT_SD_LOOP_SWITCH SF_ON #define DEFAULT_SD_LOOP_SWITCH SF_ON
#define DEFAULT_PWD_SWITCH SF_OFF #define DEFAULT_PWD_SWITCH SF_OFF
#define DEFAULT_MULTISHOT SF_MULTISHOT_1P
#define DEFAULT_SEND_MULTISHOT_INDEX1 SF_ON #define DEFAULT_SEND_MULTISHOT_INDEX1 SF_ON
#define DEFAULT_SEND_MULTISHOT_INDEX2 SF_OFF #define DEFAULT_SEND_MULTISHOT_INDEX2 SF_OFF
#define DEFAULT_SEND_MULTISHOT_INDEX3 SF_OFF #define DEFAULT_SEND_MULTISHOT_INDEX3 SF_OFF

77
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c
View File

@ -504,6 +504,7 @@ void Load_MenuInfo(void)
SysResetFlag(); SysResetFlag();
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
sf_power_on_para_check_init();
if(sf_is_usb_flag()) if(sf_is_usb_flag())
{ {
Save_MenuInfo(); Save_MenuInfo();
@ -725,6 +726,9 @@ EXIT:
} }
SysCheckFlag(); SysCheckFlag();
#if HUNTING_CAMERA_MCU == ENABLE
sf_power_on_para_check_init();
#endif
origInfo = currentInfo; origInfo = currentInfo;
origInfo_check = currentInfo; origInfo_check = currentInfo;
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
@ -1431,31 +1435,6 @@ void SysCheckFlag(void)
SysLimitFlag(TimeSend4Switch, 0, SF_ON_OFF_MAX, DEFAULT_GPS_NUMBER); SysLimitFlag(TimeSend4Switch, 0, SF_ON_OFF_MAX, DEFAULT_GPS_NUMBER);
#endif #endif
#endif #endif
#if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get();
UINT8 PowerOnMode = sf_cardv_convert_power_on_mode();
if(((PowerOnMode == PWR_ON_AUTO) || (PowerOnMode == PWR_OFF) || (PowerOnMode == PWR_ON_SETUP)))
{
if(1 == puiPara->NeedTimeSyncStartUp){
puiPara->NeedTimeSyncStartUp = 0;
}
if(0 == puiPara->NetWorkNeedSearch){
puiPara->NetWorkNeedSearch = 1;
}
}
printf("PowerOnMode=%d NeedTimeSyncStartUp=%d NetWorkNeedSearch:%d\n", PowerOnMode, puiPara->NeedTimeSyncStartUp, puiPara->NetWorkNeedSearch);
if(puiPara->Multishot != SysGetFlag(FL_CONTINUE_SHOT))
{
SysSetFlag(FL_CONTINUE_SHOT, puiPara->Multishot);
}
if(puiPara->VideoSize != SysGetFlag(FL_MOVIE_SIZE))
{
SysSetFlag(FL_MOVIE_SIZE, puiPara->VideoSize);
}
sf_set_pir_sensitivity(puiPara->PirSensitivity);
#endif
//printf("%s:%d sifar para e\n", __FUNCTION__, __LINE__); //printf("%s:%d sifar para e\n", __FUNCTION__, __LINE__);
@ -1664,7 +1643,7 @@ void SysResetFlag(void)
puiPara->FlashLed = DEFAULT_FLASH_LED; puiPara->FlashLed = DEFAULT_FLASH_LED;
puiPara->ImgSize = DEFAULT_PHOTO_SIZE; puiPara->ImgSize = DEFAULT_PHOTO_SIZE;
puiPara->NightMode = DEFAULT_NIGHT_MODE; puiPara->NightMode = DEFAULT_NIGHT_MODE;
//Multishot puiPara->Multishot = DEFAULT_CONTINUE_SHOT;
puiPara->VideoSize = DEFAULT_MOVIE_SIZE; puiPara->VideoSize = DEFAULT_MOVIE_SIZE;
//VideoTimeMenu //VideoTimeMenu
puiPara->VideoLenth = DEFAULT_VIDEO_LENTH; puiPara->VideoLenth = DEFAULT_VIDEO_LENTH;
@ -1722,7 +1701,6 @@ void SysResetFlag(void)
puiPara->SendPhotoSwitch = DEFAULT_SEND_PHOTO_SWITCH; puiPara->SendPhotoSwitch = DEFAULT_SEND_PHOTO_SWITCH;
puiPara->SendVideoSwitch = DEFAULT_SEND_VIDEO_SWITCH; puiPara->SendVideoSwitch = DEFAULT_SEND_VIDEO_SWITCH;
puiPara->SendPicSize = DEFAULT_SEND_PIC_SIZE; puiPara->SendPicSize = DEFAULT_SEND_PIC_SIZE;
puiPara->Multishot = DEFAULT_MULTISHOT;
puiPara->SendMultishotIndex1 = DEFAULT_SEND_MULTISHOT_INDEX1; puiPara->SendMultishotIndex1 = DEFAULT_SEND_MULTISHOT_INDEX1;
puiPara->SendMultishotIndex2 = DEFAULT_SEND_MULTISHOT_INDEX2; puiPara->SendMultishotIndex2 = DEFAULT_SEND_MULTISHOT_INDEX2;
puiPara->SendMultishotIndex3 = DEFAULT_SEND_MULTISHOT_INDEX3; puiPara->SendMultishotIndex3 = DEFAULT_SEND_MULTISHOT_INDEX3;
@ -1905,9 +1883,7 @@ void SysResetFlag(void)
//#2023/02/10#Payton - end //#2023/02/10#Payton - end
SysSetFixedFlag(); SysSetFixedFlag();
#if HUNTING_CAMERA_MCU == ENABLE
SysCheckFlag();
#endif
} }
void SysExeMenuSettingFuncs(void) void SysExeMenuSettingFuncs(void)
@ -2283,10 +2259,49 @@ UIMenuStoreInfo* sf_ui_para_get(void)
*************************************************/ *************************************************/
BOOL sf_get_cardv_para_check_flag(void) BOOL sf_get_cardv_para_check_flag(void)
{ {
if(memcmp(&currentInfo, &origInfo_check, sizeof(currentInfo)) == 0){ if(memcmp(&currentInfo, &origInfo_check, sizeof(UIMenuStoreInfo)) == 0){
return FALSE; return FALSE;
} }
origInfo_check = currentInfo; origInfo_check = currentInfo;
return TRUE; return TRUE;
} }
/*************************************************
Function: sf_power_on_para_check_init
Description: power on reset para
Input: N/A
Output: N/A
Return: N/A
Others: N/A
*************************************************/
void sf_power_on_para_check_init(void)
{
#if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get();
UINT8 PowerOnMode = sf_cardv_convert_power_on_mode();
if(((PowerOnMode == PWR_ON_AUTO) || (PowerOnMode == PWR_OFF) || (PowerOnMode == PWR_ON_SETUP)))
{
if(1 == puiPara->NeedTimeSyncStartUp){
puiPara->NeedTimeSyncStartUp = 0;
}
if(0 == puiPara->NetWorkNeedSearch){
puiPara->NetWorkNeedSearch = 1;
}
memset(puiPara->SimIccid,'\0',sizeof(puiPara->SimIccid));
}
printf("PowerOnMode=%d NeedTimeSyncStartUp=%d NetWorkNeedSearch:%d\n", PowerOnMode, puiPara->NeedTimeSyncStartUp, puiPara->NetWorkNeedSearch);
if(puiPara->Multishot != SysGetFlag(FL_CONTINUE_SHOT))
{
SysSetFlag(FL_CONTINUE_SHOT, puiPara->Multishot);
}
if(puiPara->VideoSize != SysGetFlag(FL_MOVIE_SIZE))
{
SysSetFlag(FL_MOVIE_SIZE, puiPara->VideoSize);
}
#if SF_HW_TEST != ENABLE
sf_set_pir_sensitivity(puiPara->PirSensitivity);
#endif
#endif
}

8
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
View File

@ -1992,13 +1992,6 @@ typedef enum {
SF_MULTISHOT_INTEVEL_MAX, SF_MULTISHOT_INTEVEL_MAX,
} SF_MULTISHOT_INTEVEL_e; } SF_MULTISHOT_INTEVEL_e;
typedef enum {
SF_MULTISHOT_1P = 0,
SF_MULTISHOT_2P,
SF_MULTISHOT_3P,
SF_MULTISHOT_MAX,
} SF_MULTISHOT_e;
typedef enum { typedef enum {
SF_SEND_TIMELY = 0, SF_SEND_TIMELY = 0,
SF_SEND_TIMELY1, SF_SEND_TIMELY1,
@ -2053,4 +2046,5 @@ extern void UI_SaveRTCDate(void);
extern void UI_SetFileDBFileID(void); extern void UI_SetFileDBFileID(void);
extern UIMenuStoreInfo* sf_ui_para_get(void); extern UIMenuStoreInfo* sf_ui_para_get(void);
extern BOOL sf_get_cardv_para_check_flag(void); extern BOOL sf_get_cardv_para_check_flag(void);
void sf_power_on_para_check_init(void);
#endif //_UIINFO_H_ #endif //_UIINFO_H_