fix: asr模型配置

app/build.gradle

@@ -10,7 +10,7 @@ android {
         minSdkVersion 22
         targetSdkVersion 30
         versionCode 6
-        versionName "V2.0.7.30"
+        versionName "V2.0.7.31"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'

app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java

@@ -519,6 +519,7 @@ public class WebViewActivity extends BaseActivity {
                     }
                     binding.layoutPass.setVisibility(View.GONE);
                     ARouter.getInstance().build(Constant.ROUTE_DEVICE_INFO).withBoolean(Constant.INPUT_PASSWORD, false).navigation();
+                    finish();
                 }else {
                     binding.tvPass.setText(binding.tvPass.getText().toString()+position);
                 }
@@ -732,11 +733,7 @@ public class WebViewActivity extends BaseActivity {
         if(mEngine == null){
             AICloudASRConfig config = new AICloudASRConfig();
             config.setLocalVadEnable(true);
-            if(Constant.asrModel.equals("aicar")){
-                config.setVadResource("vad_aicar_v0.16.bin");
-            }else{
-                config.setVadResource("vad_aihome_v0.11.bin");
-            }
+            config.setVadResource("vad_aihome_v0.11.bin");
             mEngine = AICloudASREngine.createInstance();
             aiCloudASRIntent = new AICloudASRIntent();
             aiCloudASRIntent.setEnablePunctuation(true);

app/src/main/java/qianmu/container/activity/device/ViewDeviceInfo.java

@@ -55,6 +55,8 @@ public class ViewDeviceInfo extends ViewBase<ViewDeviceInfoBinding> {
         if ("开启".equals(syncTest)) binding.rgSyncTest.check(R.id.sync_test_open);
         else binding.rgSyncTest.check(R.id.sync_test_close);
 
+        Constant.asrModel = DeviceData.getDeviceInfo(DeviceData.HINT_ASR_MODE, "aihome");
+
         switch (Constant.asrModel){
             case "aihome" :
                 binding.rgModel.check(R.id.rg_model_home);
@@ -297,27 +299,29 @@ public class ViewDeviceInfo extends ViewBase<ViewDeviceInfoBinding> {
             return;
         }
 
+        String model = "";
         switch (binding.rgModel.getCheckedRadioButtonId()){
             case R.id.rg_model_home :
-                Constant.asrModel = "aihome";
+                model = "aihome";
                 break;
             case R.id.rg_model_english :
-                Constant.asrModel = "aienglish";
+                model = "aienglish";
                 break;
             case R.id.rg_model_rot :
-                Constant.asrModel = "airobot";
+                model = "airobot";
                 break;
             case R.id.rg_model_all :
-                Constant.asrModel = "aiuniversal";
+                model = "aiuniversal";
                 break;
             case R.id.rg_model_zhen :
-                Constant.asrModel = "aienglish-mix";
+                model = "aienglish-mix";
                 break;
         }
-        LoggerUtil.e("asrModel: ",Constant.asrModel);
+        LoggerUtil.e("asrModel: ",model);
 
         FloorData.saveCurrentDeviceInfo(machine);
-
+        Constant.asrModel = model;
+        DeviceData.saveDeviceInfo(DeviceData.HINT_ASR_MODE, model);//设备ip
         DeviceData.saveDeviceInfo(DeviceData.HINT_SYNC_TEST, checkId == R.id.sync_test_open ? "开启" : "关闭");
         DeviceData.saveDeviceInfo(DeviceData.HINT_DEVICE_IP, deviceIp);//设备ip
         DeviceData.saveDeviceInfo(DeviceData.HINT_DEVICE_CODE, StringUtil.getString(machine.getCode()));//设备code
@@ -330,7 +334,6 @@ public class ViewDeviceInfo extends ViewBase<ViewDeviceInfoBinding> {
         DeviceData.addDevice((DeviceInfoActivity) context, null, () -> {
             if (listener != null) listener.onClick(ACTION_SAVE_DEVICE_INFO);
         });
-        MyApplication.getInstance().restartApp();
     }
 
 

app/src/main/java/qianmu/container/data/DeviceData.java

@@ -72,6 +72,7 @@ public class DeviceData extends BaseData {
     public static final String HINT_DEVICE_TYPE = "hint_device_type";
     public static final String HINT_DEVICE_TOUCH = "hint_device_touch";//触摸属性  // 0触摸 1非触摸
     public static final String HINT_SYNC_TEST = "hint_sync_test";
+    public static final String HINT_ASR_MODE = "hint_asr_mode";
     public static final String HINT_DEVICE_ROTATION = "hint_device_rotation";
     public static final String HINT_DEVICE_POSITION = "hint_device_position";
     public static final String HINT_DEVICE_NAME = "hint_device_name";//设备名称