diff --git a/app/build.gradle b/app/build.gradle index 809c0e4..2c6b420 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { minSdkVersion 22 targetSdkVersion 30 versionCode 6 - versionName "V2.0.7.31" + versionName "V2.0.7.30" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' diff --git a/app/src/main/assets/vad_aicar_v0.16.bin b/app/src/main/assets/vad_aicar_v0.16.bin new file mode 100644 index 0000000..02e9fd6 Binary files /dev/null and b/app/src/main/assets/vad_aicar_v0.16.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 c71e2ef..b475041 100644 --- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java @@ -731,8 +731,12 @@ public class WebViewActivity extends BaseActivity { private void initASR(){ if(mEngine == null){ AICloudASRConfig config = new AICloudASRConfig(); -// config.setLocalVadEnable(true); -// config.setVadResource("vad_aihome_v0.11.bin"); + config.setLocalVadEnable(true); + if(Constant.asrModel.equals("aicar")){ + config.setVadResource("vad_aicar_v0.16.bin"); + }else{ + config.setVadResource("vad_aihome_v0.11.bin"); + } mEngine = AICloudASREngine.createInstance(); aiCloudASRIntent = new AICloudASRIntent(); aiCloudASRIntent.setEnablePunctuation(true); diff --git a/app/src/main/java/qianmu/container/activity/device/ViewDeviceInfo.java b/app/src/main/java/qianmu/container/activity/device/ViewDeviceInfo.java index aeab82f..145af51 100644 --- a/app/src/main/java/qianmu/container/activity/device/ViewDeviceInfo.java +++ b/app/src/main/java/qianmu/container/activity/device/ViewDeviceInfo.java @@ -15,6 +15,7 @@ import qianmu.container.adapter.DeviceNameAdapter; import qianmu.container.adapter.DeviceTypeAdapter; import qianmu.container.adapter.FloorAdapter; import qianmu.container.app.Constant; +import qianmu.container.app.MyApplication; import qianmu.container.data.DeviceData; import qianmu.container.data.FloorData; import qianmu.container.data.MqttData; @@ -329,6 +330,7 @@ public class ViewDeviceInfo extends ViewBase { DeviceData.addDevice((DeviceInfoActivity) context, null, () -> { if (listener != null) listener.onClick(ACTION_SAVE_DEVICE_INFO); }); + MyApplication.getInstance().restartApp(); }