| 
				
				
					
				
				
				 | 
			
			 | 
			@@ -221,10 +221,10 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			
  | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            Integer voiceFrom = photoSpeakVideo.getVoiceFrom(); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            String voiceMaterialUrl = photoSpeakVideo.getVoiceMaterialUrl(); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            if (photoSpeakVideo.getSubtitleEnabled()==1){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                //开启字幕 查询字幕列表 | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            //    param.setSubtitle_params(photoSpeakVideo.getSubtitleParams()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			//            if (photoSpeakVideo.getSubtitleEnabled()==1){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			//                //开启字幕 查询字幕列表 | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			//            //    param.setSubtitle_params(photoSpeakVideo.getSubtitleParams()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			//            } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			
  | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            if (EnumVoiceFrom.FROM_MOULD.getCode().equals(voiceFrom)) { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                param.setGen_txt(photoSpeakVideo.getPaperwork().replaceAll(str, "[*]")); | 
		
		
	
	
		
			
				| 
				
					
				
				
				
				 | 
			
			 | 
			
  |