gaozl
/
Container_iot_custom_kdxf4.7
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: 可设置asr模型

sibichiAi
高志龙 8 months ago
parent
dfa32e6b52
commit
ce2d1ab15a
5 changed files with 110 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java
  2. 39
      app/src/main/java/qianmu/container/activity/device/ViewDeviceInfo.java
  3. 1
      app/src/main/java/qianmu/container/app/Constant.java
  4. 68
      app/src/main/res/layout/view_device_info.xml
  5. 1
      app/src/main/res/values/strings.xml

6
app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java
View File

@ -731,13 +731,13 @@ 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);
// config.setVadResource("vad_aihome_v0.11.bin");
mEngine = AICloudASREngine.createInstance();
aiCloudASRIntent = new AICloudASRIntent();
aiCloudASRIntent.setEnablePunctuation(true);
aiCloudASRIntent.setRealback(true);//打开实时反馈功能
aiCloudASRIntent.setResourceType("aihome");
aiCloudASRIntent.setResourceType(Constant.asrModel);
aiCloudASRIntent.setEnableNumberConvert(true);//设置启用识别结果汉字数字转阿拉伯数字功能
aiCloudASRIntent.setWaitingTimeout(30000); //设置等待识别结果超时时长，默认5000ms
aiCloudASRIntent.setNoSpeechTimeOut(10000);

39
app/src/main/java/qianmu/container/activity/device/ViewDeviceInfo.java
View File

@ -14,6 +14,7 @@ import qianmu.container.adapter.BuildingAdapter;
import qianmu.container.adapter.DeviceNameAdapter;
import qianmu.container.adapter.DeviceTypeAdapter;
import qianmu.container.adapter.FloorAdapter;
import qianmu.container.app.Constant;
import qianmu.container.data.DeviceData;
import qianmu.container.data.FloorData;
import qianmu.container.data.MqttData;
@ -22,6 +23,7 @@ import qianmu.container.entity.Building;
import qianmu.container.entity.Dict;
import qianmu.container.listener.ItemSelectedListener;
import qianmu.container.util.DeviceUtil;
import qianmu.container.util.LoggerUtil;
import qianmu.container.util.SignWayUtil;
import qianmu.container.util.StringUtil;
import qianmu.container.util.ToastUtils;
@ -52,6 +54,24 @@ 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);
switch (Constant.asrModel){
case "aihome" :
binding.rgModel.check(R.id.rg_model_home);
break;
case "aienglish" :
binding.rgModel.check(R.id.rg_model_english);
break;
case "airobot" :
binding.rgModel.check(R.id.rg_model_rot);
break;
case "aiuniversal" :
binding.rgModel.check(R.id.rg_model_all);
break;
case "aienglish-mix" :
binding.rgModel.check(R.id.rg_model_zhen);
break;
}
binding.deviceIp.setText(DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_IP, DeviceUtil.getLocalIP()));//显示Ip
binding.tvProjectName.setText(FloorData.getMallName());//商场名称显示
binding.deviceMac.setText(DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_MAC, SignWayUtil.getEthMacAddress()));//显示Mac
@ -276,6 +296,25 @@ public class ViewDeviceInfo extends ViewBase<ViewDeviceInfoBinding> {
return;
}
switch (binding.rgModel.getCheckedRadioButtonId()){
case R.id.rg_model_home :
Constant.asrModel = "aihome";
break;
case R.id.rg_model_english :
Constant.asrModel = "aienglish";
break;
case R.id.rg_model_rot :
Constant.asrModel = "airobot";
break;
case R.id.rg_model_all :
Constant.asrModel = "aiuniversal";
break;
case R.id.rg_model_zhen :
Constant.asrModel = "aienglish-mix";
break;
}
LoggerUtil.e("asrModel: ",Constant.asrModel);
FloorData.saveCurrentDeviceInfo(machine);
DeviceData.saveDeviceInfo(DeviceData.HINT_SYNC_TEST, checkId == R.id.sync_test_open ? "开启" : "关闭");

1
app/src/main/java/qianmu/container/app/Constant.java
View File

@ -34,6 +34,7 @@ public class Constant {
// public static String androidBoardType = "smt"; //设备板子型号 视美泰
public static final String VOID_STOP = "void_stop";//
public static String asrModel = "aihome"; //思必驰语音识别模型
public static String whoActivity = ""; // 哪个activity页面
// 本地缓存地址
public static final String CACHE_PATH = StringUtil.strSplice(Environment.getExternalStorageDirectory().getPath(),

68
app/src/main/res/layout/view_device_info.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data></data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
@ -170,6 +170,70 @@
</RadioGroup>
<TextView
android:id="@+id/txt_model"
android:layout_width="wrap_content"
android:layout_height="@dimen/dimens_50"
android:gravity="center"
android:text="@string/model_select"
android:textColor="#555555"
android:textSize="@dimen/dimens_26" />
<RadioGroup
android:id="@+id/rg_model"
android:layout_width="@dimen/dimens_700"
android:layout_height="@dimen/dimens_50"
android:gravity="center"
android:orientation="horizontal">
<RadioButton
android:id="@+id/rg_model_home"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="家居"
android:textColor="@color/colorText"
android:textSize="@dimen/dimens_26" />
<RadioButton
android:id="@+id/rg_model_rot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimens_2"
android:checked="true"
android:text="机器"
android:textColor="@color/colorText"
android:textSize="@dimen/dimens_26" />
<RadioButton
android:id="@+id/rg_model_all"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimens_2"
android:text="通用"
android:textColor="@color/colorText"
android:textSize="@dimen/dimens_26" />
<RadioButton
android:id="@+id/rg_model_english"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimens_2"
android:text="英文"
android:textColor="@color/colorText"
android:textSize="@dimen/dimens_26" />
<RadioButton
android:id="@+id/rg_model_zhen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimens_2"
android:text="英混"
android:textColor="@color/colorText"
android:textSize="@dimen/dimens_26" />
</RadioGroup>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"

1
app/src/main/res/values/strings.xml
View File

@ -11,6 +11,7 @@
<string name="hint_floor">楼层</string>
<string name="hint_device_type">设备类型</string>
<string name="hint_sync_test">同屏测试</string>
<string name="model_select">模型选择</string>
<string name="hint_small_app">小程序：</string>
<string name="hint_face_test">人脸测试：</string>
<string name="hint_screen_info">屏幕信息：</string>

Write Preview
Loading…
Cancel
Save