1.修复dp带图无法发送关机问题
This commit is contained in:
		
							parent
							
								
									2b2914a529
								
							
						
					
					
						commit
						4f11c19e55
					
				| 
						 | 
				
			
			@ -1454,8 +1454,7 @@ static void MovieExe_UserEventCb(UINT32 id, MOVIE_USER_CB_EVENT event_id, UINT32
 | 
			
		|||
//		DBG_DUMP("%s added to DCF\r\n", info->path);
 | 
			
		||||
#if HUNTING_CAMERA_MCU == ENABLE
 | 
			
		||||
        DBG_IND(" ===== MOVIE_USER_CB_EVENT_CLOSE_FILE_COMPLETED ===== id:%d \r\n", id);
 | 
			
		||||
		UIMenuStoreInfo *puiPara = sf_ui_para_get();
 | 
			
		||||
        if(((SF_CAM_MODE_VIDEO2 == puiPara->CamMode) || (SF_CAM_MODE_PHOTO_VIDEO == puiPara->CamMode)) && (id == _CFG_REC_ID_1) && (FALSE == sf_check_net_work_flag()) && (0 < sf_cardv_get_cq_signal()))
 | 
			
		||||
        if((id == _CFG_REC_ID_1) && (FALSE == sf_check_net_work_flag()) && (0 < sf_cardv_get_cq_signal()))
 | 
			
		||||
        {
 | 
			
		||||
			if(SUCCESS == sf_share_mem_file_down(0, 0)){
 | 
			
		||||
					sf_set_send_statu(TRUE);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -6825,7 +6825,7 @@ INT32 PhotoExe_Preview_SliceEncode_CB3(void* user_data)
 | 
			
		|||
			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);
 | 
			
		||||
            sf_file_thumb_cfg_fill(tmp, tmp2, queue_ele_in->jpg_thumb_size, enFileType);
 | 
			
		||||
            if((FALSE == sf_check_net_work_flag()) && (0 < sf_cardv_get_cq_signal()) && ((SF_CAM_MODE_PHOTO == puiPara->CamMode) || ((!sf_get_mode_flag()) && (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO || puiPara->CamMode == SF_CAM_MODE_VIDEO2))))
 | 
			
		||||
            if((!sf_get_mode_flag()) || ((FALSE == sf_check_net_work_flag()) && (0 < sf_cardv_get_cq_signal()) && (SF_CAM_MODE_PHOTO == puiPara->CamMode)))
 | 
			
		||||
            {
 | 
			
		||||
                if(SUCCESS == sf_share_mem_file_down(0, 0)){
 | 
			
		||||
					sf_set_send_statu(TRUE);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user