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

修复wifi_svr获取文件命名字段死机和上电不插入SD卡UI显示异常问题

Browse Source
This commit is contained in:
sober.song 2024-01-08 18:49:45 +08:00
parent b1a479f8e1
commit 00623e27c2
6 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/application/source/cardv/SrcCode/UIApp/Background/UIBackgroundObj.c
View File

@ -973,7 +973,9 @@ UINT32 BackgroundFormatCard(void)
//DX_HANDLE pStrgDev = Dx_GetObject(DX_CLASS_STORAGE_EXT|DX_TYPE_CARD1);
//UINT32 hStrgObj = Dx_Getcaps(pStrgDev, STORAGE_CAPS_HANDLE, 0);
//ret = FileSys_FormatDisk((HNVT_STRG)hStrgObj, FALSE);
FS_HANDLE pStrgDXH = (FS_HANDLE)Dx_GetObject(DX_CLASS_STORAGE_EXT | DX_TYPE_CARD1);
//FS_HANDLE pStrgDXH = (FS_HANDLE)Dx_GetObject(DX_CLASS_STORAGE_EXT | DX_TYPE_CARD1);
FS_HANDLE pStrgDXH = 0;
FileSys_GetStrgObj(&pStrgDXH);
//FS_HANDLE pStrgDXH = (FS_HANDLE)sdio_getStorageObject(STRG_OBJ_FAT1);
DBG_FUNC("pStrgDXH=0x%08X\r\n",pStrgDXH);
//#NT#2016/05/30#Lincy Lin -begin
@ -996,6 +998,9 @@ UINT32 BackgroundFormatCard(void)
//#NT#2016/05/30#Lincy Lin -end
ret = FileSys_FormatDisk(pStrgDXH, FALSE);
DBG_FUNC("Call FileSys_FormatDisk() ret=%d\r\n", ret);
//ret = FileSys_FormatAndLabel('A', pStrgDXH, FALSE, NULL);
//DBG_FUNC("Call FileSys_FormatDisk() ret=%d\r\n", ret);
if (ret == FST_STA_OK) {
// reset file ID (for FileDB)

9
code/application/source/cardv/SrcCode/UIApp/Network/WifiAppXML.c
View File

@ -2002,10 +2002,11 @@ int XML_GetPictureEnd(char *path, char *argument, HFS_U32 bufAddr, HFS_U32 *bufS
DBG_ERR("storage full\r\n");
} else
#endif
if (System_GetState(SYS_STATE_FS) == FS_DISK_ERROR) {
result = WIFIAPP_RET_FILE_ERROR;
DBG_ERR("write file fail\r\n");
} else {
//if (System_GetState(SYS_STATE_FS) == FS_DISK_ERROR) {
//result = WIFIAPP_RET_FILE_ERROR;
//DBG_ERR("write file fail\r\n");
//} else
{
#if 0
//not support get file after capture,get from file list
result = 0;

15
code/application/source/cardv/SrcCode/UIApp/Photo/UIStorageCheck.c
View File

@ -182,10 +182,10 @@ static BOOL UIStrgCheckFolderFull(DCF_HANDLE DcfHandle)
UINT32 DCF_DirId = 0, DCF_FileId = 0;
BOOL ret;
if (System_GetState(SYS_STATE_FS) == FS_NUM_FULL) {
DBG_ERR("UI_Validate_Storage: DIR:999 is existing!\r\n");
return TRUE;
}
//if (System_GetState(SYS_STATE_FS) == FS_NUM_FULL) {
//DBG_ERR("UI_Validate_Storage: DIR:999 is existing!\r\n");
//return TRUE;
//}
bIsFileReachMax = FALSE;
#if USE_MMC_DEV_CHECK
ret = DCF_GetNextIDEx(DcfHandle, &DCF_DirId, &DCF_FileId);
@ -247,7 +247,8 @@ static BOOL UIStrgCheckErr(MMC_DEV_TYPE dev_id)
{
FileSys_WaitFinishEx('B');
}
#if 0
if (System_GetState(SYS_STATE_FS) == FS_DISK_ERROR
|| System_GetState(SYS_STATE_FS) == FS_UNKNOWN_FORMAT
|| System_GetState(SYS_STATE_FS) == FS_UNFORMATTED
@ -259,7 +260,9 @@ static BOOL UIStrgCheckErr(MMC_DEV_TYPE dev_id)
{
DBG_ERR("UIStorageCheck: %d Card Error\r\n", System_GetState(SYS_STATE_FS));
return TRUE;
} else {
} else
#endif
{
if (UIStorageCheck_DCIMWritable() == FALSE)
{
return TRUE;

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

@ -25,9 +25,9 @@ extern void UIFlowPhoto_update_selftimer_cnt(UINT32 time);
CHAR *Get_FreePicNumString(UINT32 uiValue)
{
if (System_GetState(SYS_STATE_FS) != FS_INIT_OK)
//if (System_GetState(SYS_STATE_FS) != FS_INIT_OK)
{
return 0;
//return 0;
}
unsigned long fileCount = 0;
#if USE_MMC_DEV_CHECK

11
code/application/source/sf_app/code/source/storeMng/sf_storeMng.c
View File

@ -60,12 +60,11 @@ void sf_strg_dev_register(SINT32 dev_id, SINT32 mounted)
MMC_DEV_TYPE sf_get_strg_dev(void)
{
if(sf_strg_dev == NULL)
{
MLOGI("err\n");
return MMC_DEV_EMMC;
}
return sf_strg_dev->dev_type;
if(sf_strg_dev != NULL) {
return sf_strg_dev->dev_type;
}
else
return MMC_DEV_NO;
}
static SINT32 sd_file_Isexsit(SF_CHAR *fileName)

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

@ -149,7 +149,7 @@ static PHONE_SHOT_E gPhoneShot = PHONE_SHOT_END;
extern sem_t gAppSvrSendQueue;
extern UINT8 StopSendFile;
extern UINT8 SendingFile;
extern DCF_HANDLE System_Get_DCF_Handle(void);
/**************************************************************************
* F U N C T I O N D E C L A R A T I O N S *
**************************************************************************/
@ -430,8 +430,15 @@ S8 *appThumbKeyToName(thumbSize_t imgSize, thumbType_t fileType, UINT16 dirKey,
free(strg_path);
return SF_FAILURE;
}
<<<<<<< Updated upstream
MLOGI("s1\n");
char font =sf_get_strg_dev() == MMC_DEV_EMMC ? 'B' : 'A';
=======
//char font = sf_get_strg_dev() == MMC_DEV_EMMC ? 'B' : 'E';
UINT32 dcf_handle = (UINT32)System_Get_DCF_Handle(); /* 0:emmc 1:sd */
char font = System_Get_DCF_Disk_Drive(dcf_handle) == 'B' ? 'B' : 'E';
>>>>>>> Stashed changes
if(imgSize == THUMB_320x240)
{
@ -1142,9 +1149,10 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen)
free(strg_path);
return SF_FAILURE;
}
MLOGI("s1\n");
char *dcf_file = sf_get_strg_dev() == MMC_DEV_EMMC ? "SYBX" : "SYEX";
UINT32 dcf_handle = (UINT32)System_Get_DCF_Handle(); /* 0:emmc 1:sd */
char *dcf_file = System_Get_DCF_Disk_Drive(dcf_handle) == 'B' ? "SYBX" : "SYEX";
//printf("[sf_svr_packet_proc]dataLen: %d\n",dataLen);
if(poweroff_mode == POWEROFF_COUNTDOWN)