From b76842474f58619cbd0ecc6f825568cdc3740fd5 Mon Sep 17 00:00:00 2001 From: gaozl Date: Wed, 22 Apr 2026 16:42:36 +0800 Subject: [PATCH] fix: ci --- .../container/activity/H5/WebViewActivity.java | 15 +++++++++++---- .../main/java/qianmu/container/app/Constant.java | 7 ++++--- .../java/qianmu/container/data/FloorData.java | 2 +- .../main/java/qianmu/container/util/TTSUtil.java | 2 +- 4 files changed, 17 insertions(+), 9 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 e76846e..67c1caa 100644 --- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java @@ -112,7 +112,7 @@ public class WebViewActivity extends BaseActivity { static final int TYPE_START_SERVER = 4;//重新启动web服务 static final int TYPE_SHENG_HTML_MAG = 5;//返回接口请求值给h5 static String HtmlUrl = "http://127.0.0.1:8080/index.html";//webServer服务地址 - //static String HtmlUrl = "http://192.168.0.105:5173/"; + //static String HtmlUrl = "http://192.168.0.108:5173/"; int time = 0; String interfaceRequestData=""; // 语音听写对象 @@ -651,6 +651,14 @@ public class WebViewActivity extends BaseActivity { } }); break; + case Constant.VOID_ERROR: + runOnUiThread(new Runnable() { + @Override + public void run() { + binding.web.evaluateJavascript("javascript: window.micphoneError('网络连接错误');", null); + } + }); + break; case Constant.ACTION_UPDATE_PROG2://后台下发节目通知，重置导视倒计时。 LoggerUtil.e(TAG,"重启导视倒计时"); leaveScreenSave(); @@ -672,7 +680,7 @@ public class WebViewActivity extends BaseActivity { //aiCloudASRIntent.setEnableNumberConvert(true);//设置启用识别结果汉字数字转阿拉伯数字功能 aiCloudASRIntent.setWaitingTimeout(30000); //设置等待识别结果超时时长 aiCloudASRIntent.setNoSpeechTimeOut(10000); //收不到声音超时时间 - aiCloudASRIntent.setPauseTime(3000); // 中间停顿时间 + aiCloudASRIntent.setPauseTime(2000); // 中间停顿时间 mEngine.init(config, new AIASRListenerImpl()); } } @@ -685,8 +693,8 @@ public class WebViewActivity extends BaseActivity { runOnUiThread(new Runnable() { @Override public void run() { - //binding.web.evaluateJavascript("javascript: window.voiceContent('{\"data\":\"\",\"error\":\""+error.getMessage()+"\",\"flag\":2}');", null); binding.web.evaluateJavascript("javascript: window.youAskOver('');", null); + binding.web.evaluateJavascript("javascript: window.micphoneError("+error.getMessage()+");", null); } }); stopAsr(); @@ -734,7 +742,6 @@ public class WebViewActivity extends BaseActivity { runOnUiThread(new Runnable() { @Override public void run() { - //binding.web.evaluateJavascript("javascript: window.voiceContent('{\"data\":\""+resultString+"\",\"flag\":1}');", null); binding.web.evaluateJavascript("javascript: window.youAskOver('');", null); } }); diff --git a/app/src/main/java/qianmu/container/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java index 7bc15aa..fae69d4 100644 --- a/app/src/main/java/qianmu/container/app/Constant.java +++ b/app/src/main/java/qianmu/container/app/Constant.java @@ -22,19 +22,20 @@ public class Constant { public static String screenType = "HDMI"; // 欣威视通3399设备为假关机 HDMI连接：可以用来判断是否为关机状态 LVDS连接：只能用定时关机时间来判断 public static String mqttState = ""; // 屏幕连接方式 public static String TTSHome="sbc"; // sbc-思必驰 kdxf-科大讯飞 (有语音的项目需要配置） - public static String androidBoardType = ""; //设备板子型号 无固定版 - //public static String androidBoardType = "ys"; // 设备板子型号 ys（亿晟） 北京颐堤港定制touch + // public static String androidBoardType = ""; //设备板子型号 无固定版 + public static String androidBoardType = "ys"; // 设备板子型号 ys（亿晟） 北京颐堤港定制touch // public static String androidBoardType = "xwst"; //设备板子型号 xwst（欣威视通3399） // public static String androidBoardType = "xwst2"; //设备板子型号 xwst2（欣威视通3588、T982、3576） // public static String androidBoardType = "zc"; //设备板子型号 zc（卓策主板——王府井喜悦、杨浦中心医院） // public static String androidBoardType = "sx"; //设备板子型号 sx（视想） // public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED - // public static String androidBoardType = "huidu"; //设备板子型号 huidu（灰度主板） 罗湖寻车机 + // public static String androidBoardType = "huidu"; //设备板子型号 huidu（灰度主板） 罗湖寻车机 // public static String androidBoardType = "bv"; //设备板子型号 Bv-3588M // public static String androidBoardType = "smt"; //设备板子型号 视美泰 // public static String androidBoardType = "ctf"; //创泰丰 public static final String VOID_STOP = "void_stop";// + public static final String VOID_ERROR = "void_error"; public static String whoActivity = ""; // 哪个activity页面 // 本地缓存地址 public static final String CACHE_PATH = StringUtil.strSplice(Environment.getExternalStorageDirectory().getPath(), diff --git a/app/src/main/java/qianmu/container/data/FloorData.java b/app/src/main/java/qianmu/container/data/FloorData.java index a56a082..d3a59f2 100644 --- a/app/src/main/java/qianmu/container/data/FloorData.java +++ b/app/src/main/java/qianmu/container/data/FloorData.java @@ -227,7 +227,7 @@ public class FloorData extends BaseData { if (finishListener != null) finishListener.onFinish(); } - if(response.body().getMsg()!=null){ + if(response.body() != null &&response.body().getMsg()!=null){ ToastUtils.showToast(response.body().getMsg()); } } catch (Throwable t) { diff --git a/app/src/main/java/qianmu/container/util/TTSUtil.java b/app/src/main/java/qianmu/container/util/TTSUtil.java index 6535260..f58820b 100644 --- a/app/src/main/java/qianmu/container/util/TTSUtil.java +++ b/app/src/main/java/qianmu/container/util/TTSUtil.java @@ -44,7 +44,7 @@ public class TTSUtil { @Override public void onError(String utteranceId, AIError error) { Log.e(TAG, "onError: " + utteranceId + "," + error.toString()); - EventBus.getDefault().post(new MessageEvent(Constant.VOID_STOP)); + EventBus.getDefault().post(new MessageEvent(Constant.VOID_ERROR)); } @Override