Browse Source

fix: ci

sibichiAi
高志龙 8 months ago
parent
commit
3def4ddc62
  1. 2
      app/build.gradle
  2. BIN
      app/src/main/assets/vad_aicar_v0.16.bin
  3. 8
      app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java
  4. 2
      app/src/main/java/qianmu/container/activity/device/ViewDeviceInfo.java

2
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'

BIN
app/src/main/assets/vad_aicar_v0.16.bin

Binary file not shown.

8
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);

2
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<ViewDeviceInfoBinding> {
DeviceData.addDevice((DeviceInfoActivity) context, null, () -> {
if (listener != null) listener.onClick(ACTION_SAVE_DEVICE_INFO);
});
MyApplication.getInstance().restartApp();
}

Loading…
Cancel
Save