diff --git a/.idea/misc.xml b/.idea/misc.xml index 3378229..a740c72 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 8dbb5b6..1a937bc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -101,7 +101,6 @@ dependencies { implementation files('libs\\signway.jar') //欣威视通 implementation files('libs\\sdkapi.jar') //Bv-3588 implementation files('libs\\smdt.jar') //视美泰 - implementation files('libs\\DUI-lite-SDK-for-Android-3.5.0-466a4c77.jar') //思必驰语音 testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/app/libs/DUI-lite-SDK-for-Android-3.5.0-466a4c77.jar b/app/libs/DUI-lite-SDK-for-Android-3.5.0-0a84f3b4.jar similarity index 67% rename from app/libs/DUI-lite-SDK-for-Android-3.5.0-466a4c77.jar rename to app/libs/DUI-lite-SDK-for-Android-3.5.0-0a84f3b4.jar index 6f50de5..032d3a4 100644 Binary files a/app/libs/DUI-lite-SDK-for-Android-3.5.0-466a4c77.jar and b/app/libs/DUI-lite-SDK-for-Android-3.5.0-0a84f3b4.jar differ diff --git a/app/libs/armeabi-v7a/libaispeechaudio.so b/app/libs/armeabi-v7a/libaispeechaudio.so new file mode 100644 index 0000000..fd192a2 Binary files /dev/null and b/app/libs/armeabi-v7a/libaispeechaudio.so differ diff --git a/app/libs/armeabi-v7a/libduiitn.so b/app/libs/armeabi-v7a/libduiitn.so deleted file mode 100644 index 1f8817f..0000000 Binary files a/app/libs/armeabi-v7a/libduiitn.so and /dev/null differ diff --git a/app/libs/armeabi-v7a/libsspe.so b/app/libs/armeabi-v7a/libsspe.so new file mode 100644 index 0000000..3ccfab1 Binary files /dev/null and b/app/libs/armeabi-v7a/libsspe.so differ diff --git a/app/src/main/assets/sspe_aec-bf-bss-wkp_ch10-mic8-ref2_outgain4_v2.0.0.165_20251127_v1.bin b/app/src/main/assets/sspe_aec-bf-bss-wkp_ch10-mic8-ref2_outgain4_v2.0.0.165_20251127_v1.bin new file mode 100644 index 0000000..a384583 Binary files /dev/null and b/app/src/main/assets/sspe_aec-bf-bss-wkp_ch10-mic8-ref2_outgain4_v2.0.0.165_20251127_v1.bin differ diff --git a/app/src/main/assets/vad_aicar_v0.16.bin b/app/src/main/assets/vad_aicar_v0.16.bin deleted file mode 100644 index 02e9fd6..0000000 Binary files a/app/src/main/assets/vad_aicar_v0.16.bin and /dev/null differ diff --git a/app/src/main/assets/vad_aihome_v0.11.bin b/app/src/main/assets/vad_aihome_v0.11.bin deleted file mode 100644 index a609b40..0000000 Binary files a/app/src/main/assets/vad_aihome_v0.11.bin and /dev/null differ diff --git a/app/src/main/assets/vad_aihome_v0.12c_noDither.bin b/app/src/main/assets/vad_aihome_v0.12c_noDither.bin new file mode 100644 index 0000000..f14f971 Binary files /dev/null and b/app/src/main/assets/vad_aihome_v0.12c_noDither.bin differ diff --git a/app/src/main/assets/wakeup_aifar_comm_h7_20210127.bin b/app/src/main/assets/wakeup_aifar_comm_h7_20210127.bin new file mode 100644 index 0000000..ebfdd8a Binary files /dev/null and b/app/src/main/assets/wakeup_aifar_comm_h7_20210127.bin differ 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 a381b8d..381507c 100644 --- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java @@ -930,16 +930,18 @@ public class WebViewActivity extends BaseActivity { if(mEngine == null){ AICloudASRConfig config = new AICloudASRConfig(); config.setLocalVadEnable(true); - config.setVadResource("vad_aihome_v0.11.bin"); + config.setVadResource("vad_aihome_v0.12c_noDither.bin"); mEngine = AICloudASREngine.createInstance(); aiCloudASRIntent = new AICloudASRIntent(); aiCloudASRIntent.setEnablePunctuation(true); aiCloudASRIntent.setRealback(true);//打开实时反馈功能 + aiCloudASRIntent.setCloudVadEnable(false); aiCloudASRIntent.setResourceType(Constant.asrModel); aiCloudASRIntent.setEnableNumberConvert(true);//设置启用识别结果汉字数字转阿拉伯数字功能 aiCloudASRIntent.setWaitingTimeout(30000); //设置等待识别结果超时时长,默认5000ms aiCloudASRIntent.setNoSpeechTimeOut(10000); aiCloudASRIntent.setPauseTime(2000); + //aiCloudASRIntent.setServer("wss://asr.dui.ai/runtime/v2/recognize"); mEngine.init(config, new AIASRListenerImpl()); } } @@ -947,7 +949,7 @@ public class WebViewActivity extends BaseActivity { private class AIASRListenerImpl implements AIASRListener { public void onError(AIError error) { - LoggerUtil.e("ASRInit: ",error.getMessage()); + LoggerUtil.e("ASRInitErroe: ",error.getMessage()); // 在非主线程中需要调用 WebView 方法时 runOnUiThread(new Runnable() { @Override @@ -959,7 +961,7 @@ public class WebViewActivity extends BaseActivity { } public void onResults(AIResult results) { - LoggerUtil.e("ASRInit: ", String.valueOf(results.isLast())); + LoggerUtil.e("ASRInitResult: ", String.valueOf(results.isLast())); if (results.getResultType() == AIConstant.AIENGINE_MESSAGE_TYPE_JSON) { JSONResultParser parser = new JSONResultParser((String) results.getResultObject()); if("".equals(parser.getVar()) && !"".equals(parser.getText())){ diff --git a/app/src/main/java/qianmu/container/app/MyApplication.java b/app/src/main/java/qianmu/container/app/MyApplication.java index 481c16a..de06b67 100644 --- a/app/src/main/java/qianmu/container/app/MyApplication.java +++ b/app/src/main/java/qianmu/container/app/MyApplication.java @@ -11,6 +11,7 @@ import android.util.Log; import com.aispeech.DUILiteConfig; import com.aispeech.DUILiteSDK; +import com.aispeech.export.config.AuthConfig; import com.alibaba.android.arouter.BuildConfig; import com.alibaba.android.arouter.launcher.ARouter; import com.jakewharton.processphoenix.ProcessPhoenix; @@ -89,17 +90,19 @@ public class MyApplication extends Application { } private void initSbcSDK(){ + AuthConfig authConfig = new AuthConfig.Builder() + .setCustomDeviceName("19a2ebc079d6d99e") // my_uniqie_device_name只是举例,请用真实设备唯一码替换 + .setAuthTimeout(5000) + .create(); + // 产品认证需设置 apiKey, productId, productKey, productSecret DUILiteConfig config = new DUILiteConfig.Builder() .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); + .setProductSecret("25846304a956fd09b14de16cbf3832b0") + .setAuthConfig(authConfig) + .create(); DUILiteSDK.init(getApplicationContext()); // SDK 授权