diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c
index 0470dc728..5583ece76 100755
--- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c
+++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c
@@ -6781,11 +6781,14 @@ INT32 PhotoExe_Preview_SliceEncode_CB3(void* user_data)
 			UIMenuStoreInfo *puiPara = sf_ui_para_get();
             memset(tmp, '\0', sizeof(tmp));
 			SF_FILE_TYPE_E enFileType = 0;
-			if(SF_CAM_MODE_PHOTO == puiPara->CamMode){
-				enFileType = SF_FILE_TYPE_PIC_SMALL;
-			}else if(SF_CAM_MODE_PHOTO_VIDEO == puiPara->CamMode){
-				enFileType = SF_FILE_TYPE_PIC_VIDEO;
-			}
+            if(SF_CAM_MODE_PHOTO == puiPara->CamMode){
+                enFileType = SF_FILE_TYPE_PIC_SMALL;
+            }else if(SF_CAM_MODE_PHOTO_VIDEO == puiPara->CamMode){
+                enFileType = SF_FILE_TYPE_PIC_VIDEO;
+            }
+            else if(SF_CAM_MODE_VIDEO2 == puiPara->CamMode){
+                enFileType = SF_FILE_TYPE_PIC_VIDEO;
+            }
 			snprintf(tmp, sizeof(tmp), "%sW%s%s.JPG", SF_SEND_LIST_DIR, folder, number); /* DCF 8.3 naming rule */
 			snprintf(tmp2, sizeof(tmp2), "W%s%s.JPG", folder, number); /* DCF 8.3 naming rule */
 			DBG_DUMP("PHOTO THUMB %s \n %s\n", tmp, tmp2);
diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c
index 6f97d7386..101d51eda 100755
--- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c
+++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c
@@ -729,7 +729,7 @@ static void UIFlowMovie_ScrOpen(lv_obj_t* obj)
 	}
 	//#NT#2018/08/10#KCHong -end
 	#if HUNTING_CAMERA_MCU == ENABLE
-	if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)
+	if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2)
 	#else
 	if(SysGetFlag(CamMode) == SF_CAM_MODE_PHOTO_VIDEO)
 	#endif 
@@ -1378,7 +1378,7 @@ static void UIFlowMovie_NVTMSG(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* m
 		UIFlowMovie_REC_FINISH(obj,msg);
 		
 #if HUNTING_CAMERA_MCU == ENABLE		
-        if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO){
+        if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2){
 #else
 		if(SysGetFlag(CamMode) == SF_CAM_MODE_PHOTO_VIDEO){	
 #endif
diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
index 54114d1ea..43b60aff1 100755
--- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
+++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
@@ -1357,7 +1357,7 @@ void UIFlowPhoto_UpdateInfo(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg)
 
 		UIFlowPhoto_BackPreviewHandle();
 #if HUNTING_CAMERA_MCU == ENABLE
-        if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO){
+        if(puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2){
 #else
 		if(SysGetFlag(CamMode) == SF_CAM_MODE_PHOTO_VIDEO){
 #endif
@@ -1567,7 +1567,7 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
 		}
         #if HUNTING_CAMERA_MCU == ENABLE
         UIMenuStoreInfo *puiPara = sf_ui_para_get();
-        if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO))
+        if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2))
         {
             sf_rtsp_restart();
         }
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 ea7bfdc68..31c7d4543 100755
--- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
+++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
@@ -1866,6 +1866,7 @@ typedef enum {
 	SF_CAM_MODE_PHOTO		= 0x00,
 	SF_CAM_MODE_VIDEO,
 	SF_CAM_MODE_PHOTO_VIDEO,
+    SF_CAM_MODE_VIDEO2,
 	SF_CAM_MODE_MAX,
 }SF_BOOT_WORK_MODE;
 
diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c
index 402f09c16..854643654 100644
--- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c
+++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c
@@ -30,7 +30,7 @@ typedef struct {
 
 static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = {
 #if PHOTO_PREVIEW_SLICE_ENC_FUNC || POWERON_FAST_SLICE_ENC
-	{7296,  5472,   IMAGERATIO_4_3,     "40M"}, /* 40M */
+	{7296,  5760,   IMAGERATIO_4_3,     "40M"}, /* 40M */
 #endif
 	{6528,  4896,   IMAGERATIO_4_3,     "32M"}, /* 32M */
 	{5664,  4248,   IMAGERATIO_4_3,     "24M"}, //16M
diff --git a/code/application/source/sf_app/code/source/4gMng/sf_ftp.c b/code/application/source/sf_app/code/source/4gMng/sf_ftp.c
index 88d2ad13c..008fbac39 100755
--- a/code/application/source/sf_app/code/source/4gMng/sf_ftp.c
+++ b/code/application/source/sf_app/code/source/4gMng/sf_ftp.c
@@ -1148,7 +1148,7 @@ SINT32 sf_check_ftp_send(UINT8 mode)
 			else
 			{
 				if(((puiPara->CamMode == SF_CAM_MODE_PHOTO) && (puiPara->SendPhotoSwitch == 1)) || ((puiPara->CamMode == SF_CAM_MODE_VIDEO) && (puiPara->SendVideoSwitch == 1))
-				   || ((puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) && ((puiPara->SendPhotoSwitch == 1) || (puiPara->SendVideoSwitch == 1))))
+				   || (((puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && ((puiPara->SendPhotoSwitch == 1) || (puiPara->SendVideoSwitch == 1))))
 				{
 					if((puiPara->FtpSwitch != 1) && (puiPara->Sim4gApn[0] != '\0'))
 					{
@@ -1206,11 +1206,11 @@ SINT32 sf_send_file_to_ftp(UINT8 mode)
 
 	if(mode == 1 )                                                                                                                                                                  //send Original+video
 	{
-		if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) && (puiPara->SendVideoSwitch == 1) && (puiPara->NetGeneration == 4))  //video
+		if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendVideoSwitch == 1) && (puiPara->NetGeneration == 4))  //video
 		{
 			timeout = 120000;
 		}
-		else if((2 == puiPara->SendPicSize) && (((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) && (puiPara->SendPhotoSwitch == 1))) //pic(+video)
+		else if((2 == puiPara->SendPicSize) && (((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendPhotoSwitch == 1))) //pic(+video)
 		{
 			timeout = 120000;
 		}
@@ -1222,7 +1222,7 @@ SINT32 sf_send_file_to_ftp(UINT8 mode)
 	{
         if(mode == 1)
         {
-            if(((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) && (puiPara->SendPhotoSwitch == 1)) //pic(+video)
+            if(((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendPhotoSwitch == 1)) //pic(+video)
             {
                 if(smtpUploadPicFlag == 0)
                 {
@@ -1248,7 +1248,7 @@ SINT32 sf_send_file_to_ftp(UINT8 mode)
 
             printf("[%s:%d]puiPara->NetGeneration=%d\n", __FUNCTION__, __LINE__, puiPara->NetGeneration);
 
-            if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) && (puiPara->SendVideoSwitch == 1) && (puiPara->NetGeneration == 4)) //video
+            if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendVideoSwitch == 1) && (puiPara->NetGeneration == 4)) //video
             {
                 if(smtpUploadVideoFlag == 0)
                 {
@@ -1388,11 +1388,11 @@ SINT32 sf_connect_ftps_server(void)
 	gprsMode = 0;//puiPara->GprsMode;
 	printf("[%s:%d] ssl:%d,GprsMode:%d\n", __FUNCTION__, __LINE__, ssl, gprsMode);
 
-    if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) && (puiPara->SendVideoSwitch == 1) && (puiPara->NetGeneration == 4))  //video
+    if(((puiPara->CamMode == SF_CAM_MODE_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendVideoSwitch == 1) && (puiPara->NetGeneration == 4))  //video
     {
         timeout = 120000;
     }
-    else if((2 == puiPara->SendPicSize) && (((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) && (puiPara->SendPhotoSwitch == 1))) //pic(+video)
+    else if((2 == puiPara->SendPicSize) && (((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2)) && (puiPara->SendPhotoSwitch == 1))) //pic(+video)
     {
         timeout = 120000;
     }
diff --git a/code/application/source/sf_app/code/source/4gMng/sf_sms.c b/code/application/source/sf_app/code/source/4gMng/sf_sms.c
index d79598305..34bc0eae2 100755
--- a/code/application/source/sf_app/code/source/4gMng/sf_sms.c
+++ b/code/application/source/sf_app/code/source/4gMng/sf_sms.c
@@ -204,7 +204,7 @@ UINT8 sf_message_data_processing(UINT8 strValue[30][32], UINT16 mm, UINT8 *sms_s
 					}
 					else if(strValue[i][4] == '2')
 					{
-						pPara_sms_saved->CamMode = SF_CAM_MODE_PHOTO_VIDEO;
+						pPara_sms_saved->CamMode = SF_CAM_MODE_VIDEO2;
 					}
 					else
 					{
diff --git a/code/application/source/sf_app/code/source/fileMng/sf_file.c b/code/application/source/sf_app/code/source/fileMng/sf_file.c
index 846dea335..edb243e30 100755
--- a/code/application/source/sf_app/code/source/fileMng/sf_file.c
+++ b/code/application/source/sf_app/code/source/fileMng/sf_file.c
@@ -1538,7 +1538,7 @@ BOOL sf_check_auto_thumb_file(VOID)
             fileCfg->filecnt = SendFileTotal;
 			for(fileIndex = 0; fileIndex < SendFileTotal; fileIndex++)
 			{
-				if(SF_CAM_MODE_PHOTO_VIDEO == (SendFileList[fileIndex][0] - '0')){
+				if((SF_CAM_MODE_PHOTO_VIDEO == (SendFileList[fileIndex][0] - '0')) || (SF_CAM_MODE_VIDEO2 == (SendFileList[fileIndex][0] - '0'))){
 					fileCfg->stfileattr[fileIndex].enFileTye = SF_FILE_TYPE_PIC_VIDEO;
 				}else if(SF_CAM_MODE_PHOTO == (SendFileList[fileIndex][0] - '0')){
 					fileCfg->stfileattr[fileIndex].enFileTye = SF_FILE_TYPE_PIC_SMALL;
diff --git a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
index 9d8c5bb10..b6834396e 100755
--- a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
+++ b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
@@ -1348,7 +1348,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8  *pAppData, UINT16 dataLen)
 							}
 							else if (tmpMode == 1)
 							{
-								puiPara->CamMode = SF_CAM_MODE_PHOTO_VIDEO;
+								puiPara->CamMode = SF_CAM_MODE_VIDEO2;
 							}
 							else if (tmpMode == 2)
 							{
@@ -1362,7 +1362,7 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8  *pAppData, UINT16 dataLen)
                             int iCurrMode = System_GetState(SYS_STATE_CURRMODE);
                             int iNextMode = PRIMARY_MODE_PHOTO;
 
-                            if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO))
+                            if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_VIDEO2))
                             {
                                 iNextMode = PRIMARY_MODE_PHOTO;
                             }
@@ -2652,7 +2652,7 @@ void sf_wifi_hw_init(void)
 	    sprintf(sSSID,"REVEAL_%02X%02X%02X",smac[3],smac[4],smac[5]);
 
 		strcpy(SSID_STR, sSSID);
-		
+		snprintf((char *)puiPara->strSSID, sizeof(puiPara->strSSID), "%s", (char *)SSID_STR);
 	    ret = system("ifconfig wlan0 192.168.1.1 netmask 255.255.255.0 up");
 	    //ret = system("hostapd -ddd /appfs/etc/hostapd/hostapd-8189.conf &");
 	    //ret = system("udhcpd /appfs/etc/udhcpd-8189.conf");
@@ -2685,6 +2685,7 @@ void sf_wifi_hw_init(void)
 	    sprintf(sSSID,"REVEAL_%02X%02X%02X",smac[3],smac[4],smac[5]);
 
 		strcpy(SSID_STR, sSSID);
+		snprintf((char *)puiPara->strSSID, sizeof(puiPara->strSSID), "%s", (char *)SSID_STR);
 		sprintf(scmd,"echo \"ap0 alg_cfg tpc_mode 0\" >/sys/hisys/hipriv ");
 		ret =system(scmd);
 		sprintf(scmd,"echo \"ap0 intrf_mode 0 0 0 0 0\" >/sys/hisys/hipriv ");