[feature]

[xiaozhi]
[delete mogoVoicesdk]
This commit is contained in:
yangyakun
2023-11-01 19:18:25 +08:00
parent e4632fc800
commit 0568ad2662
3 changed files with 3 additions and 57 deletions

View File

@@ -51,7 +51,6 @@ dependencies {
kapt rootProject.ext.dependencies.aroutercompiler
api rootProject.ext.dependencies.aiassist
api rootProject.ext.dependencies.aiassistReplace
if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
implementation rootProject.ext.dependencies.ttsbase

View File

@@ -51,7 +51,6 @@ dependencies {
kapt rootProject.ext.dependencies.aroutercompiler
api rootProject.ext.dependencies.aiassist
api rootProject.ext.dependencies.aiassistReplace
if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
implementation rootProject.ext.dependencies.ttsbase

View File

@@ -35,10 +35,6 @@ import com.mogo.tts.base.LanguageType;
import com.mogo.tts.base.MultiLangTtsEntity;
import com.mogo.tts.base.PreemptType;
import com.zhidao.auto.platform.voice.VoiceClient;
import com.zhidao.voicesdk.MogoVoiceManager;
import com.zhidao.voicesdk.MogoVoiceManagerImpl;
import com.zhidao.voicesdk.callback.OnConnStatusListener;
import com.zhidao.voicesdk.callback.OnTtsListener;
import java.util.ArrayList;
import java.util.HashMap;
@@ -55,7 +51,7 @@ import java.util.concurrent.ConcurrentHashMap;
* 被依赖 {@link com.mogo.commons.voice.AIAssist}
*/
//@Route(path = MogoTTSConstants.API_PATH)
public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsListener {
public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack {
private static final String TAG = "PadTTS";
private String mLastQAndASpeakText;
@@ -99,7 +95,6 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
}
private VoiceClient mVoiceClient;
private MogoVoiceManager mogoVoiceManager;
// 免唤醒指令
private final Map<String, List<IMogoTTSCallback>> mCmdMap = new HashMap<>();
// 问答指令
@@ -261,18 +256,6 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
*/
private void initSpeech(Context context) {
CallerLogger.d(TAG, "initSpeech");
mogoVoiceManager = MogoVoiceManagerImpl.getInstance();
mogoVoiceManager.init(context, new OnConnStatusListener() {
@Override
public void onSuccess() {
mInitReady = true;
}
@Override
public void onFailed() {
}
});
}
/**
@@ -677,23 +660,11 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
}
public void speakTTSAndDuck(String text, IMogoTTSCallback callBack) {
try {
if (mInitReady) {
mSpeakVoiceMap.put(text, callBack);
mogoVoiceManager.toSpeak(text, -3, this);
}
} catch (Exception e) {
e.printStackTrace();
}
}
public void shutUp(String ttsId, String text) {
try {
mSpeakVoiceMap.remove(text);
mogoVoiceManager.shutUp(ttsId);
} catch (Exception e) {
e.printStackTrace();
}
}
/**
@@ -712,29 +683,6 @@ public class PadTTS implements IMogoTTS, VoiceClient.VoiceCmdCallBack, OnTtsList
}
}
@Override
public void onTtsStart(String ttsId, String text) {
IMogoTTSCallback callBack = mSpeakVoiceMap.get(text);
if (callBack != null) {
callBack.onTTSStart(ttsId, text);
}
}
@Override
public void onTtsFinish(String ttsId, String text) {
IMogoTTSCallback callBack = mSpeakVoiceMap.remove(text);
if (callBack != null) {
callBack.onTTSEnd(ttsId, text);
}
}
@Override
public void onTtsError(String ttsId, String text) {
IMogoTTSCallback callBack = mSpeakVoiceMap.remove(text);
if (callBack != null) {
callBack.onTTSError(ttsId, text);
}
}
@Override
public void init(Context context) {