From 350d9bd3f24a273f657ccbe77de47d739f232138 Mon Sep 17 00:00:00 2001
From: payton <shenhzdl@gmail.com>
Date: Wed, 30 Aug 2023 18:37:46 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../source/cardv/SrcCode/System/SysStrg_CB.c  | 21 +----------
 .../source/cardv/SrcCode/System/SysStrg_Exe.c | 37 ++++++++++++++++++-
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/code/application/source/cardv/SrcCode/System/SysStrg_CB.c b/code/application/source/cardv/SrcCode/System/SysStrg_CB.c
index 0149ffbd2..d9f9976ef 100755
--- a/code/application/source/cardv/SrcCode/System/SysStrg_CB.c
+++ b/code/application/source/cardv/SrcCode/System/SysStrg_CB.c
@@ -155,24 +155,7 @@ void Strg_CB(UINT32 event, UINT32 param1, UINT32 param2)
 		INIT_SETFLAG(FLGINIT_MOUNTFS);
 #endif
 		Ux_PostEvent(NVTEVT_STRG_ATTACH, 2, param1, status);
-        #if HUNTING_CAMERA_MCU == ENABLE	
-        INT32 uiStatus = 0;
-        UINT8  ucAttrib = 0;
-        uiStatus = FileSys_GetAttrib(PHOTO_THUMB_PATH, &ucAttrib);
-        if (uiStatus == FST_STA_OK) {
-            if(!(ucAttrib&FST_ATTRIB_HIDDEN)){
-                #if SF_IQ_TEST != ENABLE
-                FileSys_SetAttrib(PHOTO_THUMB_PATH, FST_ATTRIB_HIDDEN/* | FST_ATTRIB_SYSTEM*/, TRUE);
-                #endif
-            }
-        }
-        else {
-            FileSys_MakeDir(PHOTO_THUMB_PATH);
-            #if SF_IQ_TEST != ENABLE
-            FileSys_SetAttrib(PHOTO_THUMB_PATH, FST_ATTRIB_HIDDEN/* | FST_ATTRIB_SYSTEM*/, TRUE);
-            #endif
-        }
-        #endif
+
 		break;
 
 	default:
@@ -181,7 +164,7 @@ void Strg_CB(UINT32 event, UINT32 param1, UINT32 param2)
 	}
 	
 #if HUNTING_CAMERA_MCU == ENABLE
-    if((CMD_FORMAT_SD_STA != sf_get_card_statu())){
+    if((FST_STA_OK != param2) && (CMD_FORMAT_SD_STA != sf_get_card_statu())){
         stMessageBuf.arg1 = event;
         stMessageBuf.arg2 = param1;
         stMessageBuf.arg3 = param2;
diff --git a/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c b/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c
index cda03dbe5..e0a43dd52 100644
--- a/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c
+++ b/code/application/source/cardv/SrcCode/System/SysStrg_Exe.c
@@ -71,7 +71,11 @@
 #include <mntent.h>
 #include <string.h>
 #include "emmc.h"
-
+#if HUNTING_CAMERA_MCU == ENABLE
+#include <sf_message_queue.h>
+#include <sf_param_struct.h>
+#include "sf_sd_common.h"
+#endif
 #if (LOGFILE_FUNC==ENABLE)
 #include "LogFile.h"
 #endif
@@ -793,7 +797,10 @@ INT32 System_OnStrgAttach(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
 	unsigned int *p_data;
     #endif
 	UINT32 result = paramArray[1];
+    #if HUNTING_CAMERA_MCU == ENABLE
+    SF_MESSAGE_BUF_S stMessageBuf = {0};
 
+    #endif
 #if defined(__FREERTOS)
 	if (p_fdt== NULL) {
 		DBG_ERR("p_fdt is NULL.\n");
@@ -855,6 +862,34 @@ INT32 System_OnStrgAttach(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray)
 		//FileSys_GetDiskInfo(FST_INFO_DISK_SIZE);
 		System_SetState(SYS_STATE_FS, FS_INIT_OK);
 
+        #if HUNTING_CAMERA_MCU == ENABLE	
+        INT32 uiStatus = 0;
+        UINT8  ucAttrib = 0;
+        uiStatus = FileSys_GetAttrib(PHOTO_THUMB_PATH, &ucAttrib);
+        if (uiStatus == FST_STA_OK) {
+            if(!(ucAttrib&FST_ATTRIB_HIDDEN)){
+                #if SF_IQ_TEST != ENABLE
+                FileSys_SetAttrib(PHOTO_THUMB_PATH, FST_ATTRIB_HIDDEN/* | FST_ATTRIB_SYSTEM*/, TRUE);
+                #endif
+            }
+        }
+        else {
+            FileSys_MakeDir(PHOTO_THUMB_PATH);
+            #if SF_IQ_TEST != ENABLE
+            FileSys_SetAttrib(PHOTO_THUMB_PATH, FST_ATTRIB_HIDDEN/* | FST_ATTRIB_SYSTEM*/, TRUE);
+            #endif
+        }
+        #if HUNTING_CAMERA_MCU == ENABLE
+
+    if((CMD_FORMAT_SD_STA != sf_get_card_statu())){
+        stMessageBuf.arg1 = STRG_CB_MOUNT_FINISH;
+        stMessageBuf.arg2 = result;
+        stMessageBuf.arg3 = FST_STA_OK;
+        stMessageBuf.cmdId = CMD_SD;
+        sf_com_message_send_to_app(&stMessageBuf);
+    }
+#endif
+        #endif
 #if defined(__FREERTOS)
 		if (p_shm && p_shm->boot.LdCtrl2 & LDCF_UPDATE_FW) {
 			FST_FILE hFile = FileSys_OpenFile(FW_DEL_INDIACTION_PATH, FST_OPEN_READ | FST_OPEN_EXISTING);