From 0501fc8056f6b2c9355199dee83afca1a9955ba0 Mon Sep 17 00:00:00 2001 From: gaozl Date: Fri, 5 Dec 2025 11:52:20 +0800 Subject: [PATCH] fix: ci --- app/build.gradle | 2 +- .../container/activity/H5/WebViewActivity.java | 1 + .../java/qianmu/container/app/MyApplication.java | 14 ++++++++++---- .../java/qianmu/container/util/SignWayUtil.java | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 93d3eb2..d0fa336 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { minSdkVersion 22 targetSdkVersion 30 versionCode 6 - versionName "V2.0.7.35" + versionName "V2.0.7.36" // 7.0.2.35 接口加密 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java index aec74ae..d54ab5d 100644 --- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java @@ -691,6 +691,7 @@ public class WebViewActivity extends BaseActivity { // h5调用android:开始合成语音 @JavascriptInterface public void startTTS(String txt) { + ttsUtil.stopTTs(); LoggerUtil.e(TAG,"JS调用了Android的方法:startTTS()"); ttsUtil.startTTs(txt.toLowerCase(Locale.ENGLISH)); } diff --git a/app/src/main/java/qianmu/container/app/MyApplication.java b/app/src/main/java/qianmu/container/app/MyApplication.java index fb3249c..481c16a 100644 --- a/app/src/main/java/qianmu/container/app/MyApplication.java +++ b/app/src/main/java/qianmu/container/app/MyApplication.java @@ -16,6 +16,7 @@ import com.alibaba.android.arouter.launcher.ARouter; import com.jakewharton.processphoenix.ProcessPhoenix; import com.lztek.toolkit.Lztek; import com.lzy.okgo.OkGo; +import com.ys.rkapi.MyManager; import java.io.PrintWriter; import java.io.StringWriter; @@ -90,10 +91,15 @@ public class MyApplication extends Application { private void initSbcSDK(){ // 产品认证需设置 apiKey, productId, productKey, productSecret DUILiteConfig config = new DUILiteConfig.Builder() - .setApiKey("d823edab41b8d823edab41b868ecc552") - .setProductId("279632533") - .setProductKey("ab73065d16e11bcfac026eee3db9f6cb") - .setProductSecret("85d9490c438099acc33be7676799399f").create(); + .setApiKey("3ac5b2151aab3ac5b2151aab692e463b") + .setProductId("279633115") + .setProductKey("f08d7e0da576f89fedc67bbf44e2e2d6") + .setProductSecret("25846304a956fd09b14de16cbf3832b0").create(); + + MyManager manager = MyManager.getInstance(this); + String mac = manager.getEthMacAddress(); + config.setExtraParameter("DEVICE_ID", mac); + config.setExtraParameter("DEVICE_NAME", mac); DUILiteSDK.init(getApplicationContext()); // SDK 授权 diff --git a/app/src/main/java/qianmu/container/util/SignWayUtil.java b/app/src/main/java/qianmu/container/util/SignWayUtil.java index 44655d9..090f52e 100644 --- a/app/src/main/java/qianmu/container/util/SignWayUtil.java +++ b/app/src/main/java/qianmu/container/util/SignWayUtil.java @@ -373,7 +373,7 @@ public class SignWayUtil { return SdkApi.getInstance().DeviceInfo().getEthMac(); }else if(Constant.androidBoardType.equals("ys")){ MyManager manager = MyManager.getInstance(MyApplication.getInstance()); - return manager.getEthMacAddress (); + return manager.getEthMacAddress(); }else if(Constant.androidBoardType.equals("sx")){ return readEthMacAddress(); }else if(Constant.androidBoardType.equals("bv")){