王帅

voice/magic-api/res/msc/ivw_local.logcache

@@ -1 +0,0 @@
-civw1P1HHBH44QITJOIm6aauLXkGLBr91VZ.log

voice/magic-api/src/main/java/com/magicapi/MagicApiApplication.java

@@ -2,6 +2,7 @@ package com.magicapi;
 
 import javax.sound.sampled.DataLine;
 import javax.sound.sampled.LineUnavailableException;
+import javax.sound.sampled.SourceDataLine;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.TargetDataLine;
 
@@ -17,15 +18,18 @@ public class MagicApiApplication {
 
 	public static void main(String[] args) throws LineUnavailableException {
 		SpringApplicationBuilder builder = new SpringApplicationBuilder(MagicApiApplication.class);
-        builder.headless(false).run(args);
-        
+		builder.headless(false).run(args);
+
 		Constant.audioFormat = Step4_audioFormat.getAudioFormat(Constant.audioFormat);
 		DataLine.Info dataLineInfo = new DataLine.Info(TargetDataLine.class, Constant.audioFormat);
 		Constant.targetDataLine = (TargetDataLine) AudioSystem.getLine(dataLineInfo);
 		Constant.myThread = new Step3_ivw_thread();
 		Constant.myThread.start();
 		Constant.voiceStatus = true;
-		
+
+		DataLine.Info line = new DataLine.Info(SourceDataLine.class, Constant.audioFormat, AudioSystem.NOT_SPECIFIED);
+		Constant.sourceDataLine = (SourceDataLine) AudioSystem.getLine(line);
+
 	}
 
 }

voice/magic-api/src/main/java/com/magicapi/util/ConfigUtil.java

@@ -3,7 +3,7 @@ package com.magicapi.util;
 public class ConfigUtil {
 	
 	// 语音appid
-	public static final String XF_APPID = "5c20ae83";
+	public static final String XF_APPID = "e5bb677f";
 	// 静态资源目录
 	public static final String STATIC_FILE_PATH = "D:/cgj/";
 	

voice/magic-api/src/main/java/com/magicapi/util/Constant.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.SourceDataLine;
 import javax.sound.sampled.TargetDataLine;
 
 import org.openqa.selenium.WebDriver;
@@ -25,6 +26,8 @@ public class Constant {
 	public static AudioFormat audioFormat;
 	public static TargetDataLine targetDataLine;
 	
+	public static SourceDataLine sourceDataLine;
+	
 	public static Step3_ivw_thread myThread;
 	
 	public static String sessionId;

voice/magic-api/src/main/java/com/magicapi/util/FrameUtil.java

@@ -10,6 +10,7 @@ import com.magicapi.frame.VoiceFrame2;
 import com.magicapi.frame.WebFrame;
 import com.magicapi.frame.WebFrame2;
 import com.magicapi.voice.Step3_ivw_thread;
+import com.magicapi.voice.Step3_tts_thread;
 import com.magicapi.voice.synthesis.MSTTSSpeech;
 
 import cn.hutool.core.lang.UUID;
@@ -53,9 +54,11 @@ public class FrameUtil {
 			voiceFrame2.setLabelTxt(txt);
 			voiceFrame2.setVisible(true);
 		}
-		MSTTSSpeech speech = new MSTTSSpeech();
-		speech.setFormatType(6);
-		speech.speak(txt);
+		Step3_tts_thread speech = new Step3_tts_thread(txt);
+		speech.start();
+//		MSTTSSpeech speech = new MSTTSSpeech();
+//		speech.setFormatType(6);
+//		speech.speak(txt);
 	}
 	
 	public static void closeVoiceFrame2() {

xfyun-api/msc/08074aa6887ab9652c80933dc2b843ff/u.data

@@ -1 +1 @@
-d17438455018
+d17541304895