From: xiewei <892331662@qq.com> Date: Tue, 25 Feb 2025 06:00:22 +0000 (+0800) Subject: 250225 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=6f834355038f89d8b04a0326df5ab29e10a86dd4;p=mirrors%2Fpoly-sdk.git 250225 --- diff --git a/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/ChatActivity.java b/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/ChatActivity.java index 4dbe0b4..b64238d 100644 --- a/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/ChatActivity.java +++ b/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/ChatActivity.java @@ -59,7 +59,7 @@ public class ChatActivity extends AppCompatActivity { PolymerizeAgent.getInstance().getAiAPI().startTrans(); - PolymerizeAgent.getInstance().getAiAPI().setOnChatMsgListener(new OnChatMsgListener() { + /*PolymerizeAgent.getInstance().getAiAPI().setOnChatMsgListener(new OnChatMsgListener() { @Override public void onChange(String type, String text) { @@ -112,7 +112,7 @@ public class ChatActivity extends AppCompatActivity { } } - }); + });*/ btn_transcrip.setOnLongClickListener(new View.OnLongClickListener() { @Override diff --git a/polysdk/build.gradle b/polysdk/build.gradle index 60a19a7..a39869a 100644 --- a/polysdk/build.gradle +++ b/polysdk/build.gradle @@ -10,7 +10,7 @@ android { minSdk 24 targetSdk 33 versionCode 1 - versionName "1.6" + versionName "2.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { diff --git a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/ai/TranscriptionManager.java b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/ai/TranscriptionManager.java index ff35581..e8600a8 100644 --- a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/ai/TranscriptionManager.java +++ b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/ai/TranscriptionManager.java @@ -169,7 +169,7 @@ public class TranscriptionManager { return; } handler.removeMessages(MSG_RECONNECT); - url = MyConfig.URL_AI_TRAN + "?platform=aliyun" + "&is_auth=1" + "&dt=" + MyConfig.TOKEN; + url = MyConfig.URL_AI_TRAN + "?platform=aliyun" + "&is_auth=0" + "&dt=" + MyConfig.TOKEN; SobLog.d(TAG, "url--" + url); URI arsRri = URI.create(url); tranClient = new JWebSocketClient(arsRri) { diff --git a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/ai/VoiceChatManager.java b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/ai/VoiceChatManager.java index 135f93b..7602bd9 100644 --- a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/ai/VoiceChatManager.java +++ b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/ai/VoiceChatManager.java @@ -1,28 +1,22 @@ package com.zhixun.android.sdk.polysdk.ai; import android.os.Handler; -import android.os.Looper; import android.os.Message; -import android.text.TextUtils; -import android.util.Log; import androidx.annotation.NonNull; import com.google.gson.Gson; import com.zhixun.android.sdk.polysdk.bean.AsrHeader; -import com.zhixun.android.sdk.polysdk.bean.AsrPayload; import com.zhixun.android.sdk.polysdk.bean.VoiceChatPayload; +import com.zhixun.android.sdk.polysdk.callback.IAIChannelChangeCallback; import com.zhixun.android.sdk.polysdk.callback.IVoiceChatCallback; +import com.zhixun.android.sdk.polysdk.entity.VcPayload; import com.zhixun.android.sdk.polysdk.socket.JWebSocketClient; -import com.zhixun.android.sdk.polysdk.bean.voicechat.ChatBean; -import com.zhixun.android.sdk.polysdk.bean.voicechat.ChatPayload; -import com.zhixun.android.sdk.polysdk.bean.voicechat.HeaderBean; -import com.zhixun.android.sdk.polysdk.bean.VoiceChatHeader; -import com.zhixun.android.sdk.polysdk.bean.voicechat.ReqResult; -import com.zhixun.android.sdk.polysdk.callback.OnChatMsgListener; import com.zhixun.android.sdk.polysdk.util.ByteTools; import com.zhixun.android.sdk.polysdk.util.MyConfig; import com.zhixun.android.sdk.polysdk.util.SobLog; +import com.zhixun.android.sdk.polysdk.util.SpUtils; + import org.java_websocket.WebSocket; import org.java_websocket.framing.Framedata; @@ -33,12 +27,10 @@ import org.json.JSONObject; import java.net.URI; import java.nio.ByteBuffer; import java.util.HashMap; -import java.util.UUID; public class VoiceChatManager { private String TAG = "VoiceChatManager"; - private OnChatMsgListener onChatMsgListener; private static VoiceChatManager sInstance; @@ -56,14 +48,17 @@ public class VoiceChatManager { private final int MSG_RECONNECT = 101; private final int MSG_SENDPING = 102; - private Handler handler = new Handler(Looper.getMainLooper()){ + private Handler handler = new Handler(){ @Override public void handleMessage(@NonNull Message msg) { super.handleMessage(msg); switch (msg.what){ case MSG_RECONNECT: SobLog.d(TAG, "MSG_RECONNECT"); - close(); + if (chatClient != null) { + chatClient.close(); + chatClient = null; + } connectChat(); break; case MSG_SENDPING: @@ -94,8 +89,10 @@ public class VoiceChatManager { /********************* chat部分 ***********************/ private void connectChat() { - - URI chatRri = URI.create(MyConfig.URL_VOICE_CHAT+"?is_auth=0"+"&dt="+MyConfig.TOKEN+"&platform=aliyun"); + String url = MyConfig.URL_VOICE_CHAT+"?is_auth=0"+"&dt="+MyConfig.TOKEN+"&platform=raisound"; + URI chatRri = URI.create(url); + handler.removeMessages(MSG_RECONNECT); + SobLog.d(TAG, "url--" + url); chatClient = new JWebSocketClient(chatRri) { @Override public void onMessage(ByteBuffer bytes) { @@ -103,7 +100,7 @@ public class VoiceChatManager { byte[] data = new byte[bytes.remaining()]; bytes.get(data); - Log.d(TAG, "voicechatClient:" + data.length); + SobLog.d(TAG, "voicechatClient:" + data.length); if(iVoiceChatCallback!=null){ iVoiceChatCallback.OnSpeech(data); } @@ -112,52 +109,70 @@ public class VoiceChatManager { @Override public void onMessage(String message) { super.onMessage(message); - Log.d(TAG, "voicechatClient:onMessage--" + message); + SobLog.d(TAG, "voicechatClient:onMessage--" + message); try { JSONObject object = new JSONObject(message); chatEvent = object.getString("event"); - JSONObject payload = object.getJSONObject("payload"); + JSONObject payload=null; + if(object.has("payload")){ + payload = object.getJSONObject("payload"); + } + SobLog.d(TAG, "chatEvent--" + chatEvent); if(chatEvent.equals("Started")){ isStart = true; dialog_id = payload.getString("dialog_id"); - if(iVoiceChatCallback!=null){ +// startSend(); + /*if(iVoiceChatCallback!=null){ iVoiceChatCallback.OnEventChange(chatEvent); - } + }*/ }else if(chatEvent.equals("SpeechContent")){ String SpeechContent = payload.getString("text"); + boolean finished = payload.getBoolean("finished"); if(iVoiceChatCallback!=null){ iVoiceChatCallback.OnAsr(SpeechContent); } }else if(chatEvent.equals("RespondingContent")){ String RespondingContent = payload.getString("text"); + boolean finished = payload.getBoolean("finished"); if(iVoiceChatCallback!=null){ - iVoiceChatCallback.OnRespond(RespondingContent); + iVoiceChatCallback.OnRespond(finished,RespondingContent); } }else if(chatEvent.equals("DialogStateChanged")){ dialogState = payload.getString("state"); if(iVoiceChatCallback!=null){ iVoiceChatCallback.OnDialogStateChange(dialogState); } + }else if(chatEvent.equals("RespondingStarted")){ + LocalRespondingStarted(); + }else if(chatEvent.equals("RespondingEnded")){ + LocalRespondingEnded(); +// startSend(); + }else if(chatEvent.equals("TaskFailed")){ + if (chatClient != null) { + chatClient.close(); + chatClient = null; + } } if(chatEvent.equals("Started")||chatEvent.equals("SpeechEnded") ||chatEvent.equals("RespondingStarted") ||chatEvent.equals("RespondingEnded")){ - if(iVoiceChatCallback!=null){ + /*if(iVoiceChatCallback!=null){ iVoiceChatCallback.OnEventChange(chatEvent); - } + }*/ } } catch (JSONException e) { - Log.d(TAG, "voicechatClient:onMessage--" + e.getMessage()); + SobLog.d(TAG, "voicechatClient:onMessage--" + e.getMessage()); } } @Override public void onOpen(ServerHandshake handShakeData) { super.onOpen(handShakeData); - Log.e(TAG, "onOpen: voicechatClient"); - isReConnect = false; + SobLog.d(TAG, "onOpen: voicechatClient"); + isCancle = false; handler.sendEmptyMessageDelayed(MSG_SENDPING,5000); + start("pcm",16000); } @@ -165,7 +180,9 @@ public class VoiceChatManager { public void onClose(int code, String reason, boolean remote) { super.onClose(code, reason, remote); SobLog.d(TAG, "onClose:voicechatClient-"+code+"-reason-"+reason); - if(!isReConnect){ + if(!isCancle){ + isStart = false; + dialog_id = ""; handler.removeMessages(MSG_RECONNECT); handler.sendEmptyMessageDelayed(MSG_RECONNECT,2000); } @@ -182,19 +199,23 @@ public class VoiceChatManager { @Override public void onError(Exception ex) { super.onError(ex); - Log.e(TAG, "onError:" + ex.getMessage()); + SobLog.d(TAG, "onError:" + ex.getMessage()); } }; try { chatClient.connectBlocking(); } catch (InterruptedException e) { - Log.e(TAG, "InterruptedException--" + e.getMessage()); + SobLog.d(TAG, "InterruptedException--" + e.getMessage()); } } private String task_id; + private String in_format = "pcm"; + private int in_sample_rate = 16000; + private String out_format = "pcm"; + private int out_sample_rate = 16000; /** * device_id : test_device_id * user_agent : python @@ -205,10 +226,16 @@ public class VoiceChatManager { * space_time : 100 * volume : 2 */ - public void start(){ + public void start(String format,int rate){ if(chatClient==null||chatClient.isClosed()){ return; } + SobLog.d(TAG, "start:-"+isStart); + if(isStart){ + return; + } + this.in_format = format; + this.in_sample_rate = rate; HashMap param = new HashMap(); AsrHeader header = new AsrHeader(); String traId = ByteTools.encryptMD5(System.currentTimeMillis() + ""); @@ -217,10 +244,10 @@ public class VoiceChatManager { VoiceChatPayload payload = new VoiceChatPayload(); payload.setDevice_id(MyConfig.DEVICE_ID); payload.setUser_agent("python"); - payload.setIn_format("pcm"); - payload.setIn_sample_rate(16000); - payload.setOut_format("pcm"); - payload.setSample_rate(16000); + payload.setIn_format(in_format); + payload.setIn_sample_rate(in_sample_rate); + payload.setOut_format(out_format); + payload.setSample_rate(out_sample_rate); payload.setSpace_time(100); payload.setVolume("100"); param.put("header", header); @@ -230,6 +257,12 @@ public class VoiceChatManager { chatClient.send(msg); } + public void setStartConfig(String in_format,int in_sample_rate,String out_format,int out_sample_rate){ + this.in_format = in_format; + this.in_sample_rate = in_sample_rate; + this.out_format = out_format; + this.out_sample_rate = out_sample_rate; + } /** * 开始发送语音 */ @@ -237,22 +270,24 @@ public class VoiceChatManager { if(chatClient==null||chatClient.isClosed()){ return; } - + SobLog.d(TAG, "startSend:-"+isStart); + if(!isStart){ + return; + } + /*if(!dialogState.equals("Listening")){ + RequestToSpeak(); + }*/ + isStart = true; HashMap param = new HashMap(); AsrHeader header = new AsrHeader(); String traId = ByteTools.encryptMD5(System.currentTimeMillis() + ""); header.setEvent("SendSpeech"); header.setTrace_id(traId); - JSONObject object = new JSONObject(); - try { - object.put("dialog_id",dialog_id); - } catch (JSONException e) { - throw new RuntimeException(e); - } + VcPayload payload = new VcPayload(dialog_id); param.put("header", header); - param.put("payload", object); + param.put("payload", payload); String msg = new Gson().toJson(param); - + SobLog.d(TAG, "startSend-"+msg); chatClient.send(msg); } @@ -263,21 +298,97 @@ public class VoiceChatManager { if(chatClient==null||chatClient.isClosed()){ return; } + SobLog.d(TAG, "stopSend:-"+isStart); + if(!isStart){ + return; + } HashMap param = new HashMap(); AsrHeader header = new AsrHeader(); String traId = ByteTools.encryptMD5(System.currentTimeMillis() + ""); header.setEvent("StopSpeech"); header.setTrace_id(traId); - JSONObject object = new JSONObject(); - try { - object.put("dialog_id",dialog_id); - } catch (JSONException e) { - throw new RuntimeException(e); + VcPayload payload = new VcPayload(dialog_id); + + param.put("header", header); + param.put("payload", payload); + String msg = new Gson().toJson(param); + SobLog.d(TAG, "stopSend-"+msg); + chatClient.send(msg); + } + + private boolean isReConnect = false; + private boolean ischeckoutChannel = false; + private IAIChannelChangeCallback channelChangeCallback; + /** + * 设置通道 + */ + public void checkoutChannel(IAIChannelChangeCallback channelChangeCallback) { + this.channelChangeCallback = channelChangeCallback; + + if (chatClient != null && chatClient.isOpen()) { + ischeckoutChannel = true; + close(); + } else { + ischeckoutChannel = false; + isReConnect = true; + handler.removeMessages(MSG_RECONNECT); + connectChat(); } +// if (onChatMsgListener != null) { +// if (chatType.equals("start") || chatType.equals("middle")) { +// chatType = "end"; +// onChatMsgListener.onChange(chatType, ""); +// } +// } + + } + + /** + * 开始播放 + */ + public void LocalRespondingStarted(){ + if(chatClient==null||chatClient.isClosed()){ + return; + } + SobLog.d(TAG, "LocalRespondingStarted:-"+isStart); + if(!isStart){ + return; + } + HashMap param = new HashMap(); + AsrHeader header = new AsrHeader(); + String traId = ByteTools.encryptMD5(System.currentTimeMillis() + ""); + header.setEvent("LocalRespondingStarted"); + header.setTrace_id(traId); + + VcPayload payload = new VcPayload(dialog_id); param.put("header", header); - param.put("payload", object); + param.put("payload", payload); String msg = new Gson().toJson(param); + SobLog.d(TAG, "LocalRespondingStarted send-"+msg); + chatClient.send(msg); + } + /** + * 结束播放 + */ + public void LocalRespondingEnded(){ + if(chatClient==null||chatClient.isClosed()){ + return; + } + SobLog.d(TAG, "LocalRespondingEnded:-"+isStart); + if(!isStart){ + return; + } + HashMap param = new HashMap(); + AsrHeader header = new AsrHeader(); + String traId = ByteTools.encryptMD5(System.currentTimeMillis() + ""); + header.setEvent("LocalRespondingEnded"); + header.setTrace_id(traId); + VcPayload payload = new VcPayload(dialog_id); + param.put("header", header); + param.put("payload", payload); + String msg = new Gson().toJson(param); + SobLog.d(TAG, "LocalRespondingEnded send-"+msg); chatClient.send(msg); } @@ -288,56 +399,86 @@ public class VoiceChatManager { if(chatClient==null||chatClient.isClosed()){ return; } + SobLog.d(TAG, "RequestToSpeak:-"+isStart); + if(!isStart){ + return; + } HashMap param = new HashMap(); AsrHeader header = new AsrHeader(); String traId = ByteTools.encryptMD5(System.currentTimeMillis() + ""); header.setEvent("RequestToSpeak"); header.setTrace_id(traId); - JSONObject object = new JSONObject(); - try { - object.put("dialog_id",dialog_id); - } catch (JSONException e) { - throw new RuntimeException(e); + VcPayload payload = new VcPayload(dialog_id); + param.put("header", header); + param.put("payload", payload); + String msg = new Gson().toJson(param); + + chatClient.send(msg); + + } + + /** + * 打断对话 + */ + public void sendText(String text){ + if(chatClient==null||chatClient.isClosed()){ + return; + } + SobLog.d(TAG, "RequestToSpeak:-"+isStart); + if(!isStart){ + return; } + HashMap param = new HashMap(); + AsrHeader header = new AsrHeader(); + String traId = ByteTools.encryptMD5(System.currentTimeMillis() + ""); + header.setEvent("RequestToRespond"); + header.setTrace_id(traId); + VcPayload payload = new VcPayload(dialog_id); + payload.setText(text); + payload.setType("prompt"); param.put("header", header); - param.put("payload", object); + param.put("payload", payload); String msg = new Gson().toJson(param); chatClient.send(msg); + } public void sendVoice(byte[] datas){ if(chatClient==null||chatClient.isClosed()){ return; } + SobLog.d(TAG,"sendVoice--"+dialogState); + if(!dialogState.equals("Listening")){ + return; + } chatClient.send(datas); } - private String generateUniqueString() { - UUID uuid = UUID.randomUUID(); - String uniqueString = uuid.toString().replace("-",""); - return uniqueString; - } - public void setOnChatMsgListener(OnChatMsgListener onChatMsgListener) { - this.onChatMsgListener = onChatMsgListener; - } - public void close() { +// isCancle = true; if (chatClient != null) { chatClient.close(); chatClient = null; } } - private boolean isReConnect = false; - public void reConnect(){ - isReConnect = true; - close(); - handler.removeMessages(MSG_RECONNECT); - connectChat(); + public boolean getConnectState(){ + String channel = SpUtils.getInstance().getStringValue(SpUtils.KEY_CHANNEL); + if(channel.equals(MyConfig.CHANNLE_CHAT)){ + return true; + }else { + if (chatClient != null) { + return chatClient.isOpen(); + } + return false; + } } + private boolean isCancle = false; + + private IVoiceChatCallback iVoiceChatCallback; public void setiVoiceChatCallback(IVoiceChatCallback iVoiceChatCallback) { diff --git a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/authentication/AuthReceiverHandler.java b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/authentication/AuthReceiverHandler.java index 093ad58..72ca206 100644 --- a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/authentication/AuthReceiverHandler.java +++ b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/authentication/AuthReceiverHandler.java @@ -328,8 +328,9 @@ public class AuthReceiverHandler { MyConfig.TOKEN = id; MyConfig.DEVICE_ID = deviceId; ChatManager.getInstance().init(); + VoiceChatManager.getInstance().init(); TranscriptionManager.getInstance().init(); - TTsManager.getInstance().init(); +// TTsManager.getInstance().init(); // VoiceChatManager.getInstance().init(); authCallback.onSuccess(id); diff --git a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/callback/IPolyAiAPI.java b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/callback/IPolyAiAPI.java index 4e18f18..4735754 100644 --- a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/callback/IPolyAiAPI.java +++ b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/callback/IPolyAiAPI.java @@ -39,7 +39,7 @@ public interface IPolyAiAPI { void queryTaskState(AigcQuery aigcQuery, AIRequestCallback aiRequestCallback); - +// void startVoiceChat(String format,int rate); void sendChatMsg(String text); void cancleChat(); @@ -52,7 +52,7 @@ public interface IPolyAiAPI { void setOnChatMsgListener(OnChatMsgListener onChatMsgListener); - + void setOnVoiceChatListener(IVoiceChatCallback callback); void startTrans(); void stopTrans(); diff --git a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/callback/IVoiceChatCallback.java b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/callback/IVoiceChatCallback.java index fae78df..1a26fd9 100644 --- a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/callback/IVoiceChatCallback.java +++ b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/callback/IVoiceChatCallback.java @@ -5,5 +5,5 @@ public interface IVoiceChatCallback { void OnDialogStateChange(String state); void OnSpeech(byte[] data); void OnAsr(String text); - void OnRespond(String text); + void OnRespond(boolean finish,String text); } diff --git a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/data/PolyAiKit.java b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/data/PolyAiKit.java index 5767f98..aa28913 100644 --- a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/data/PolyAiKit.java +++ b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/data/PolyAiKit.java @@ -9,6 +9,7 @@ import com.google.gson.Gson; import com.zhixun.android.sdk.polysdk.ai.ChatManager; import com.zhixun.android.sdk.polysdk.ai.TTsManager; import com.zhixun.android.sdk.polysdk.ai.TranscriptionManager; +import com.zhixun.android.sdk.polysdk.ai.VoiceChatManager; import com.zhixun.android.sdk.polysdk.authentication.AuthReceiverHandler; import com.zhixun.android.sdk.polysdk.callback.AIRequestCallback; import com.zhixun.android.sdk.polysdk.callback.HttRequestCallback; @@ -16,6 +17,7 @@ import com.zhixun.android.sdk.polysdk.callback.IOnKeyCheckCallback; import com.zhixun.android.sdk.polysdk.callback.IPicCompressCallback; import com.zhixun.android.sdk.polysdk.callback.IPicDecompressCallback; import com.zhixun.android.sdk.polysdk.callback.IPolyAiAPI; +import com.zhixun.android.sdk.polysdk.callback.IVoiceChatCallback; import com.zhixun.android.sdk.polysdk.callback.OnChatMsgListener; import com.zhixun.android.sdk.polysdk.callback.OnTTSDataChange; import com.zhixun.android.sdk.polysdk.callback.OnTranscriptionDataChange; @@ -320,20 +322,29 @@ public class PolyAiKit implements IPolyAiAPI { }); } + /* @Override + public void startVoiceChat(String format, int rate) { + VoiceChatManager.getInstance().start(format,rate); + }*/ + @Override public void sendChatMsg(String text) { String cannel = SpUtils.getInstance().getStringValue(SpUtils.KEY_CHANNEL); + if(!AuthReceiverHandler.getInstance().isLogined()&&!cannel.equals(MyConfig.CHANNLE_CHAT)){ SobLog.d(TAG,NOTLOGIN_TIP); return; } - ChatManager.getInstance().sendChat(text); + SobLog.d(TAG,"sendChatMsg="+text); +// ChatManager.getInstance().sendChat(text); + VoiceChatManager.getInstance().sendText(text); } @Override public void cancleChat() { - ChatManager.getInstance().cancleChat(); - TTsManager.getInstance().cancleTTS(); +// ChatManager.getInstance().cancleChat(); + VoiceChatManager.getInstance().close(); +// TTsManager.getInstance().cancleTTS(); } @Override @@ -371,15 +382,24 @@ public class PolyAiKit implements IPolyAiAPI { SobLog.d(TAG,NOTLOGIN_TIP); return; } - ChatManager.getInstance().sendChat(system,text); +// ChatManager.getInstance().sendChat(system,text); + } + + @Override + public void setOnChatMsgListener(OnChatMsgListener callback) { + if(!AuthReceiverHandler.getInstance().isLogined()){ + SobLog.d(TAG,NOTLOGIN_TIP); + } +// ChatManager.getInstance().setOnChatMsgListener(callback); } @Override - public void setOnChatMsgListener(OnChatMsgListener onChatMsgListener) { + public void setOnVoiceChatListener(IVoiceChatCallback callback) { if(!AuthReceiverHandler.getInstance().isLogined()){ SobLog.d(TAG,NOTLOGIN_TIP); } - ChatManager.getInstance().setOnChatMsgListener(onChatMsgListener); +// ChatManager.getInstance().setOnChatMsgListener(onChatMsgListener); + VoiceChatManager.getInstance().setiVoiceChatCallback(callback); } @Override @@ -427,7 +447,7 @@ public class PolyAiKit implements IPolyAiAPI { SobLog.d(TAG,NOTLOGIN_TIP); return; } - TTsManager.getInstance().startSynthesis(format,rate); +// TTsManager.getInstance().startSynthesis(format,rate); } @Override @@ -437,7 +457,7 @@ public class PolyAiKit implements IPolyAiAPI { SobLog.d(TAG,NOTLOGIN_TIP); return; } - TTsManager.getInstance().sendLongTextStream(text,format,rate); +// TTsManager.getInstance().sendLongTextStream(text,format,rate); } @Override @@ -447,7 +467,7 @@ public class PolyAiKit implements IPolyAiAPI { SobLog.d(TAG,NOTLOGIN_TIP); return; } - TTsManager.getInstance().runSynthesis(text); +// TTsManager.getInstance().runSynthesis(text); } @Override @@ -457,7 +477,7 @@ public class PolyAiKit implements IPolyAiAPI { SobLog.d(TAG,NOTLOGIN_TIP); return; } - TTsManager.getInstance().stopSynthesis(); +// TTsManager.getInstance().stopSynthesis(); } @Override @@ -465,7 +485,7 @@ public class PolyAiKit implements IPolyAiAPI { if(!AuthReceiverHandler.getInstance().isLogined()){ SobLog.d(TAG,NOTLOGIN_TIP); } - TTsManager.getInstance().setOnTTSDataChange(onTTSDataChange); +// TTsManager.getInstance().setOnTTSDataChange(onTTSDataChange); } @Override @@ -509,7 +529,7 @@ public class PolyAiKit implements IPolyAiAPI { if(type==1){ return TranscriptionManager.getInstance().getConnectState(); }else if(type==2){ - return ChatManager.getInstance().getConnectState(); + return VoiceChatManager.getInstance().getConnectState(); }else if(type==3){ return TTsManager.getInstance().getConnectState(); }else { diff --git a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/data/PolyApiKit.java b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/data/PolyApiKit.java index e48eddc..7b5bbc2 100644 --- a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/data/PolyApiKit.java +++ b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/data/PolyApiKit.java @@ -76,7 +76,7 @@ public class PolyApiKit implements IPolyAPI, IBtReceiverCallback { SpUtils.getInstance().saveValue(SpUtils.KEY_CHANNEL_KEY,key); ChatManager.getInstance().checkoutChannel(channelChangeCallback); TranscriptionManager.getInstance().connectTran(false); - TTsManager.getInstance().init(); +// TTsManager.getInstance().init(); } @@ -87,7 +87,7 @@ public class PolyApiKit implements IPolyAPI, IBtReceiverCallback { ChatManager.getInstance().close(); AuthReceiverHandler.getInstance().close(); TranscriptionManager.getInstance().close(false); - TTsManager.getInstance().close(); +// TTsManager.getInstance().close(); } @Override diff --git a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/entity/VcPayload.java b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/entity/VcPayload.java new file mode 100644 index 0000000..9e9177c --- /dev/null +++ b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/entity/VcPayload.java @@ -0,0 +1,36 @@ +package com.zhixun.android.sdk.polysdk.entity; + +public class VcPayload { + + private String dialog_id; + private String text; + private String type; + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public VcPayload(String dialog_id) { + this.dialog_id = dialog_id; + } + + public String getDialog_id() { + return dialog_id; + } + + public void setDialog_id(String dialog_id) { + this.dialog_id = dialog_id; + } +} diff --git a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/util/MyConfig.java b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/util/MyConfig.java index ea46bfc..3181a1c 100644 --- a/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/util/MyConfig.java +++ b/polysdk/src/main/java/com/zhixun/android/sdk/polysdk/util/MyConfig.java @@ -17,13 +17,13 @@ public class MyConfig { // public final static String URL_AI_TRAN= "ws://121.40.67.151:9099/asr/ws"; - public final static String URL_AI_TRAN= "ws://amp.raisound.com/asr/ws"; + public final static String URL_AI_TRAN= "ws://118.145.158.207:22080/asr/ws"; // public final static String URL_AI_TTS= "ws://121.40.67.151:9099/tts/stream"; public final static String URL_AI_TTS= "ws://amp.raisound.com/tts/stream"; - public final static String URL_VOICE_CHAT= "ws://amp.raisound.com/voice-chat/ws"; + public final static String URL_VOICE_CHAT= "ws://118.145.158.207:22080/voice-chat/ws"; public final static String AI_IS_AUTH= "1"; public final static String VOICE_CHAT_APPKEY = "j2QhAoOeBi5AUlrM";