From d588edd7f9db36fbb4241c3ff3a7a77afec03324 Mon Sep 17 00:00:00 2001 From: xiewei <892331662@qq.com> Date: Thu, 22 Aug 2024 18:24:01 +0800 Subject: [PATCH] =?utf8?q?240823:=E5=A2=9E=E5=8A=A0chat=E8=B6=85=E6=97=B6?= =?utf8?q?=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../sdk/polymerizesdk/AigcActivity.java | 1 + .../sdk/polymerizesdk/AsrActivity.java | 1 - .../sdk/polymerizesdk/ChatActivity.java | 40 +- .../sdk/polymerizesdk/MainActivity.java | 13 +- app/src/main/res/layout/activity_chat.xml | 40 +- .../src/androidTest/java/poly_sdk_log(4).txt | 3229 -------- polysdk/src/androidTest/poly_sdk_log(11).txt | 2151 +++++ polysdk/src/androidTest/poly_sdk_log(12).txt | 7046 +++++++++++++++++ polysdk/src/androidTest/poly_sdk_log(14).txt | 244 + .../sdk/polysdk/{asr => ai}/ChatManager.java | 20 +- .../sdk/polysdk/{asr => ai}/TTsManager.java | 5 +- .../{asr => ai}/TranscriptionManager.java | 213 +- .../polysdk/{asr => ai}/VoiceChatManager.java | 4 +- .../authentication/AuthReceiverHandler.java | 8 +- .../android/sdk/polysdk/data/PolyAiKit.java | 6 +- .../android/sdk/polysdk/data/PolyApiKit.java | 8 +- .../{aigc => socket}/JWebSocketClient.java | 4 +- 17 files changed, 9664 insertions(+), 3369 deletions(-) delete mode 100644 polysdk/src/androidTest/java/poly_sdk_log(4).txt create mode 100644 polysdk/src/androidTest/poly_sdk_log(11).txt create mode 100644 polysdk/src/androidTest/poly_sdk_log(12).txt create mode 100644 polysdk/src/androidTest/poly_sdk_log(14).txt rename polysdk/src/main/java/com/zhixun/android/sdk/polysdk/{asr => ai}/ChatManager.java (92%) rename polysdk/src/main/java/com/zhixun/android/sdk/polysdk/{asr => ai}/TTsManager.java (98%) rename polysdk/src/main/java/com/zhixun/android/sdk/polysdk/{asr => ai}/TranscriptionManager.java (70%) rename polysdk/src/main/java/com/zhixun/android/sdk/polysdk/{asr => ai}/VoiceChatManager.java (98%) rename polysdk/src/main/java/com/zhixun/android/sdk/polysdk/{aigc => socket}/JWebSocketClient.java (91%) diff --git a/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/AigcActivity.java b/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/AigcActivity.java index 36075b1..14d033e 100644 --- a/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/AigcActivity.java +++ b/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/AigcActivity.java @@ -63,6 +63,7 @@ public class AigcActivity extends AppCompatActivity { // 设置ImageView的Bitmap back_img.setImageBitmap(bitmap); }*/ + Log.e(TAG,"url--"+url); Glide.with(AigcActivity.this) .load(url) .into(back_img); diff --git a/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/AsrActivity.java b/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/AsrActivity.java index b83b086..1b1406a 100644 --- a/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/AsrActivity.java +++ b/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/AsrActivity.java @@ -12,7 +12,6 @@ import android.widget.Button; import com.zhixun.android.sdk.polymerizesdk.adapter.MsgAdapter; import com.zhixun.android.sdk.polysdk.PolymerizeAgent; -import com.zhixun.android.sdk.polysdk.asr.VoiceChatManager; import com.zhixun.android.sdk.polysdk.callback.AIRequestCallback; import com.zhixun.android.sdk.polysdk.callback.OnTTSDataChange; import com.zhixun.android.sdk.polysdk.callback.OnTranscriptionDataChange; 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 c9783e6..d9380b6 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 @@ -196,9 +196,21 @@ public class ChatActivity extends AppCompatActivity { Toast.makeText(this,"正在回答,请稍后再发送",Toast.LENGTH_SHORT).show(); return; } + PolymerizeAgent.getInstance().getAuthenAPI().setAIChannelKey("baidu", "", new IAIChannelChangeCallback() { + @Override + public void onChange(boolean result, String channel) { + Log.d(TAG,"result--"+result+"--channel--"+channel); + } + }); + } + public void setXunfei(View view){ + if(chatType.equals("start")){ + Toast.makeText(this,"正在回答,请稍后再发送",Toast.LENGTH_SHORT).show(); + return; + } - PolymerizeAgent.getInstance().getAuthenAPI().setAIChannelKey("baidu", "", new IAIChannelChangeCallback() { + PolymerizeAgent.getInstance().getAuthenAPI().setAIChannelKey("xunfei", "", new IAIChannelChangeCallback() { @Override public void onChange(boolean result, String channel) { Log.d(TAG,"result--"+result+"--channel--"+channel); @@ -219,6 +231,32 @@ public class ChatActivity extends AppCompatActivity { }); } + public void setKimi(View view){ + if(chatType.equals("start")){ + Toast.makeText(this,"正在回答,请稍后再发送",Toast.LENGTH_SHORT).show(); + return; + } + PolymerizeAgent.getInstance().getAuthenAPI().setAIChannelKey("moonshot", "", new IAIChannelChangeCallback() { + @Override + public void onChange(boolean result, String channel) { + Log.d(TAG,"result--"+result+"--channel--"+channel); + } + }); + } + + public void setAli(View view){ + if(chatType.equals("start")){ + Toast.makeText(this,"正在回答,请稍后再发送",Toast.LENGTH_SHORT).show(); + return; + } + PolymerizeAgent.getInstance().getAuthenAPI().setAIChannelKey("aliyun", "", new IAIChannelChangeCallback() { + @Override + public void onChange(boolean result, String channel) { + Log.d(TAG,"result--"+result+"--channel--"+channel); + } + }); + } + public void cancleChat(View view){ PolymerizeAgent.getInstance().getAiAPI().cancleChat(); } diff --git a/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/MainActivity.java b/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/MainActivity.java index dc8ba2b..b3bb7a4 100644 --- a/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/MainActivity.java +++ b/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/MainActivity.java @@ -13,12 +13,12 @@ import android.widget.Toast; import com.zhixun.android.sdk.polymerizesdk.util.PermissionUtil; import com.zhixun.android.sdk.polysdk.PolymerizeAgent; -import com.zhixun.android.sdk.polysdk.asr.VoiceChatManager; +import com.zhixun.android.sdk.polysdk.ai.VoiceChatManager; import com.zhixun.android.sdk.polysdk.callback.AuthCallback; import com.zhixun.android.sdk.polysdk.callback.HttRequestCallback; import com.zhixun.android.sdk.polysdk.callback.IAudioConvertListener; import com.zhixun.android.sdk.polysdk.gpt.ChatGPTClient; -import com.zhixun.android.sdk.polysdk.callback.IOnKeyCheckCallback; +import com.zhixun.android.sdk.polysdk.util.SpUtils; import java.io.File; import java.io.FileInputStream; @@ -117,11 +117,12 @@ public class MainActivity extends AppCompatActivity { } public void goRegiest(View view){ PolymerizeAgent.getInstance().getAuthenAPI().regiest("HHosiYUNdG42t1cTgKOzIUPOvAVMI2QT" - , "281106AFB0F7", "pafOCKLiUbeVHbdZlddH", new AuthCallback() { + , "FD2420000083", "pafOCKLiUbeVHbdZlddH", new AuthCallback() { @Override public void onSuccess(String result) { Log.i(TAG,"result--"+result); pwd = result; + SpUtils.getInstance().saveValue("devicePwd",pwd); } @Override @@ -152,10 +153,10 @@ public class MainActivity extends AppCompatActivity { secretKey = nNRjkRpKTxvprGaW deviceSecret = ZqqFHYeXf4xuv5jEfuHUE2hdMnoaegGi*/ - private String pwd = "5GkTxKuLSHok1nOyLTFmwyUeiznQCG"; + private String pwd = "CVOachlw1DO1Ei5uabOkHd1wRYoMQA"; public void goLogin(View view){ - - PolymerizeAgent.getInstance().getAuthenAPI().authentication("281106AFB0F7" + pwd = SpUtils.getInstance().getStringValue("devicePwd"); + PolymerizeAgent.getInstance().getAuthenAPI().authentication("FD2420000083" , pwd, "HHosiYUNdG42t1cTgKOzIUPOvAVMI2QT", new AuthCallback() { @Override public void onSuccess(String result) { diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml index 994ae08..40944ef 100644 --- a/app/src/main/res/layout/activity_chat.xml +++ b/app/src/main/res/layout/activity_chat.xml @@ -42,6 +42,13 @@ android:layout_width="80dp" android:layout_height="match_parent" android:text="发送"/> + +