From: xiewei <892331662@qq.com>
Date: Tue, 13 Aug 2024 08:15:32 +0000 (+0800)
Subject: 240813:重连机制优化
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=41f573c9633c5c41528e963369424eb181219cd3;p=mirrors%2Fpoly-sdk.git
240813:重连机制优化
---
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d5e6d7e..8cca1e2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,6 +34,9 @@
+
diff --git a/app/src/main/assets/A021_036.png b/app/src/main/assets/A021_036.png
new file mode 100644
index 0000000..45acb99
Binary files /dev/null and b/app/src/main/assets/A021_036.png differ
diff --git a/app/src/main/assets/ComRets.bin b/app/src/main/assets/ComRets.bin
new file mode 100644
index 0000000..0d6bc9b
Binary files /dev/null and b/app/src/main/assets/ComRets.bin differ
diff --git a/app/src/main/assets/DialDog.png b/app/src/main/assets/DialDog.png
new file mode 100644
index 0000000..3207324
Binary files /dev/null and b/app/src/main/assets/DialDog.png differ
diff --git a/app/src/main/assets/TestCompress.png b/app/src/main/assets/TestCompress.png
new file mode 100644
index 0000000..a518b9c
Binary files /dev/null and b/app/src/main/assets/TestCompress.png differ
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 dc1a330..dc8ba2b 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
@@ -45,12 +45,12 @@ public class MainActivity extends AppCompatActivity {
VoiceChatManager.getInstance().start();
String cannel = PolymerizeAgent.getInstance().getAiAPI().getAIChannel();
Log.i(TAG,"cannel--"+cannel);
- PolymerizeAgent.getInstance().getAiAPI().checkGPTKey("sk-proj-fdifVB2nPBIVcQeegE0AT3BlbkFJsgOXO5mnrmzox8pnSxMV", new IOnKeyCheckCallback() {
+ /*PolymerizeAgent.getInstance().getAiAPI().checkGPTKey("sk-proj-fdifVB2nPBIVcQeegE0AT3BlbkFJsgOXO5mnrmzox8pnSxMV", new IOnKeyCheckCallback() {
@Override
public void OnKeyCheckResult(boolean result) {
Log.i(TAG,"OnKeyCheckResult--"+result);
}
- });
+ });*/
}
@@ -111,12 +111,17 @@ public class MainActivity extends AppCompatActivity {
public void start(View view){
}
+
+ public void goPicTest(View view){
+ startActivity(new Intent(this, PicTestActivity.class));
+ }
public void goRegiest(View view){
PolymerizeAgent.getInstance().getAuthenAPI().regiest("HHosiYUNdG42t1cTgKOzIUPOvAVMI2QT"
, "281106AFB0F7", "pafOCKLiUbeVHbdZlddH", new AuthCallback() {
@Override
public void onSuccess(String result) {
Log.i(TAG,"result--"+result);
+ pwd = result;
}
@Override
@@ -146,9 +151,12 @@ public class MainActivity extends AppCompatActivity {
productKey = ccvUoJOLbXn
secretKey = nNRjkRpKTxvprGaW
deviceSecret = ZqqFHYeXf4xuv5jEfuHUE2hdMnoaegGi*/
+
+ private String pwd = "5GkTxKuLSHok1nOyLTFmwyUeiznQCG";
public void goLogin(View view){
+
PolymerizeAgent.getInstance().getAuthenAPI().authentication("281106AFB0F7"
- , "aWGKrBWaijsKD5eEsVVU5rjWPI1sVy", "HHosiYUNdG42t1cTgKOzIUPOvAVMI2QT", new AuthCallback() {
+ , pwd, "HHosiYUNdG42t1cTgKOzIUPOvAVMI2QT", new AuthCallback() {
@Override
public void onSuccess(String result) {
isLogin = true;
diff --git a/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/PicTestActivity.java b/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/PicTestActivity.java
new file mode 100644
index 0000000..3d6d039
--- /dev/null
+++ b/app/src/main/java/com/zhixun/android/sdk/polymerizesdk/PicTestActivity.java
@@ -0,0 +1,155 @@
+package com.zhixun.android.sdk.polymerizesdk;
+
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.Environment;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+
+import com.zhixun.android.sdk.polysdk.PolymerizeAgent;
+import com.zhixun.android.sdk.polysdk.callback.IPicCompressCallback;
+import com.zhixun.android.sdk.polysdk.callback.IPicDecompressCallback;
+import com.zhixun.android.sdk.polysdk.entity.PolyDecompressRet;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class PicTestActivity extends AppCompatActivity {
+
+ private String TAG = "PicTestActivity";
+ private Bitmap bitMapSrc;
+ private File compressedFile;
+ private ImageView srcPic;
+ private ImageView destPic;
+ private Button btnCompress;
+ private Button btnDecompress;
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_pic_test);
+ ImageView srcPic = findViewById(R.id.iv_src);
+ destPic = findViewById(R.id.iv_dest);
+ btnCompress = findViewById(R.id.btn_compress);
+ btnCompress.setOnClickListener(view -> compress());
+ btnDecompress = findViewById(R.id.btn_decompress);
+ btnDecompress.setOnClickListener(view -> decompress());
+
+ bitMapSrc = getImageFromAssetsFile(getApplicationContext(), "DialDog.png");
+ srcPic.setImageBitmap(bitMapSrc);
+ // 设置å缩å解åçç»æåè°
+
+
+ }
+
+ //å缩
+ private void compress() {
+
+ btnCompress.setEnabled(false);
+ PolymerizeAgent.getInstance().getAiAPI().picCompress(bitMapSrc, new IPicCompressCallback() {
+ @Override
+ public void compressRets(int id, int state, int tileWidth, byte[] data) {
+ Log.i(TAG, "compressRetsFromJNI: id = " + id + " state = " + state + " tileWidth = " + tileWidth + " len = " + data.length);
+ compressedFile = writeBuffer("ComRets" + tileWidth, data, 0, data.length);
+ runOnUiThread(() -> btnCompress.setEnabled(true));
+ }
+ });
+
+ }
+
+ private File writeBuffer(String name, byte[] content, int offset, int length) {
+ File bufferFile = getBufferFile(name);
+
+ try {
+ FileOutputStream fos = new FileOutputStream(bufferFile);
+ fos.write(content, 0, length);
+ } catch (IOException var6) {
+ var6.printStackTrace();
+ }
+
+ return bufferFile;
+ }
+
+ private File getBufferFile(String name) {
+ File file;
+ if (Environment.getExternalStorageState().equals("mounted")) {
+ file = new File(this.getExternalFilesDir("Log").getPath() + "/");
+ } else {
+ file = new File(getFilesDir().getPath() + "/Log/");
+ }
+
+ if (!file.exists()) {
+ file.mkdir();
+ }
+
+ File logFile = new File(file.getPath() + "/" + name + ".bin");
+ if (!logFile.exists()) {
+ try {
+ logFile.createNewFile();
+ } catch (Exception var4) {
+ Log.e("LogToFileUtils", "Create log file failure !!! " + var4.toString());
+ }
+ }
+
+ return logFile;
+ }
+
+ //解å
+ private void decompress() {
+ if (compressedFile == null) {
+ Toast.makeText(this, "Invalid File", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ PolymerizeAgent.getInstance().getAiAPI().picDeCompress(compressedFile.getPath(), new IPicDecompressCallback() {
+ @Override
+ public void deCompressRets(int id, int state, Bitmap bitmapDe) {
+
+ runOnUiThread(() -> destPic.setImageBitmap(bitmapDe));
+ }
+ });
+
+ }
+
+ private Bitmap getImageFromAssetsFile(Context ctx, String fileName) {
+ Bitmap bitmap = null;
+ AssetManager assetManager = ctx.getAssets();
+ try {
+ InputStream is = assetManager.open(fileName);
+ bitmap = BitmapFactory.decodeStream(is);
+ is.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return bitmap;
+ }
+ private byte[] getBuffer(Context ctx, String fileName) {
+ AssetManager assetManager = ctx.getAssets();
+ byte[] rets = new byte[1024 * 300];
+ int len = 0;
+ try {
+ InputStream is = assetManager.open(fileName);
+ len = is.read(rets);
+ is.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return rets;
+ }
+
+ public void back(View view) {
+ finish();
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 75df144..fba3c63 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -57,6 +57,11 @@
android:layout_height="wrap_content"
android:text="smbcTopcm"/>
+