From ce2d1ab15a935aa0c24b516d08a83f8fa7679b89 Mon Sep 17 00:00:00 2001 From: gaozl Date: Thu, 23 Oct 2025 13:31:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=AF=E8=AE=BE=E7=BD=AEasr=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/H5/WebViewActivity.java | 6 +- .../activity/device/ViewDeviceInfo.java | 39 +++++++++++ .../java/qianmu/container/app/Constant.java | 1 + app/src/main/res/layout/view_device_info.xml | 68 ++++++++++++++++++- app/src/main/res/values/strings.xml | 1 + 5 files changed, 110 insertions(+), 5 deletions(-) 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 af959e1..c71e2ef 100644 --- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java @@ -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); 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 09b63bc..aeab82f 100644 --- a/app/src/main/java/qianmu/container/activity/device/ViewDeviceInfo.java +++ b/app/src/main/java/qianmu/container/activity/device/ViewDeviceInfo.java @@ -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 { 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 { 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 ? "开启" : "关闭"); diff --git a/app/src/main/java/qianmu/container/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java index 81bafe0..4461a5a 100644 --- a/app/src/main/java/qianmu/container/app/Constant.java +++ b/app/src/main/java/qianmu/container/app/Constant.java @@ -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(), diff --git a/app/src/main/res/layout/view_device_info.xml b/app/src/main/res/layout/view_device_info.xml index 49c6181..5bd540d 100644 --- a/app/src/main/res/layout/view_device_info.xml +++ b/app/src/main/res/layout/view_device_info.xml @@ -1,9 +1,9 @@ - + - @@ -170,6 +170,70 @@ + + + + + + + + + + + + + + + + 楼层 设备类型 同屏测试 + 模型选择 小程序： 人脸测试： 屏幕信息：