From 511eb4083e43b9d487ee955a769f06c11da7e5fe Mon Sep 17 00:00:00 2001 From: gaozl Date: Fri, 19 Dec 2025 19:46:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B0=B4=E7=89=8C=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- .../java/qianmu/container/activity/H5/WebViewActivity.java | 4 ++-- .../qianmu/container/activity/program/MyPresentation.java | 2 +- .../qianmu/container/activity/program/ViewScreenSaver.java | 2 +- app/src/main/java/qianmu/container/app/Constant.java | 4 ++-- app/src/main/java/qianmu/container/data/ScreenSaverData.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e803922..a39cc98 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdkVersion 24 targetSdkVersion 30 versionCode 6 - versionName "V2.0.8.7" + versionName "V2.0.8.8" // 2.0.8.2 修改网络连接证书设置、定时开关机设置 // 2.0.8.3 获取mac修改 // V2.0.8.5 同屏优化 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 1f94cc7..0676725 100644 --- a/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java +++ b/app/src/main/java/qianmu/container/activity/H5/WebViewActivity.java @@ -99,8 +99,8 @@ public class WebViewActivity extends BaseActivity { static final int TYPE_HINT_PASSWORD = 3;//隐藏密码输入框 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.1.196:5501/index.html"; + static String HtmlUrl = "http://127.0.0.1:8080/index.html";//webServer服务地址 + //static String HtmlUrl = "http://192.168.1.196:5501/index.html"; int time = 0; String interfaceRequestData=""; // 语音听写对象 diff --git a/app/src/main/java/qianmu/container/activity/program/MyPresentation.java b/app/src/main/java/qianmu/container/activity/program/MyPresentation.java index 8b3b2d9..174e631 100644 --- a/app/src/main/java/qianmu/container/activity/program/MyPresentation.java +++ b/app/src/main/java/qianmu/container/activity/program/MyPresentation.java @@ -3862,7 +3862,7 @@ class MyPresentation extends Presentation { List InterFaceList = shuipaiDataListBean.getData(); shuipaifacenumb = InterFaceList.size(); for(InterFaceBean interFacebean: InterFaceList ){ - if(interFacebean.getInterfaceName().equals("GetDevCoordinateByIP")){ + if(interFacebean.getInterfaceName().equals("getDevCoordinateByIP")){ if(interFacebean.getInterfaceUrl().contains("http")||interFacebean.getInterfaceUrl().contains("https")){ ScreenSaverData.getGetData(context,interFacebean.getInterfaceUrl()+DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_CODE),interFacebean.getInterfaceName(),null,new QueryFinishListener(){ @Override diff --git a/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java b/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java index 8684234..2d36875 100644 --- a/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java +++ b/app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java @@ -3936,7 +3936,7 @@ public class ViewScreenSaver extends ViewBase { List InterFaceList = shuipaiDataListBean.getData(); shuipaifacenumb = InterFaceList.size(); for(InterFaceBean interFacebean: InterFaceList ){ - if(interFacebean.getInterfaceName().equals("GetDevCoordinateByIP")){ + if(interFacebean.getInterfaceName().equals("getDevCoordinateByIP")){ if(interFacebean.getInterfaceUrl().contains("http")||interFacebean.getInterfaceUrl().contains("https")){ ScreenSaverData.getGetData(context,interFacebean.getInterfaceUrl()+DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_CODE),interFacebean.getInterfaceName(),null,new QueryFinishListener(){ @Override diff --git a/app/src/main/java/qianmu/container/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java index 3e436a5..7b2dba6 100644 --- a/app/src/main/java/qianmu/container/app/Constant.java +++ b/app/src/main/java/qianmu/container/app/Constant.java @@ -24,10 +24,10 @@ public class Constant { public static String mqttState = ""; // 屏幕连接方式 public static String TTSHome=""; // sbc-思必驰 kdxf-科大讯飞 //public static String androidBoardType = ""; //设备板子型号 无固定版 - // public static String androidBoardType = "ys"; // 设备板子型号 ys（亿晟） 北京颐堤港定制touch + 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 = "zc"; //设备板子型号 zc（卓策主板——王府井喜悦、杨浦中心医院） // public static String androidBoardType = "sx"; //设备板子型号 sx（视想） // public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED // public static String androidBoardType = "huidu"; //设备板子型号 huidu（灰度主板） 罗湖寻车机 diff --git a/app/src/main/java/qianmu/container/data/ScreenSaverData.java b/app/src/main/java/qianmu/container/data/ScreenSaverData.java index 9cacbbe..6e1bbaa 100644 --- a/app/src/main/java/qianmu/container/data/ScreenSaverData.java +++ b/app/src/main/java/qianmu/container/data/ScreenSaverData.java @@ -603,7 +603,7 @@ public class ScreenSaverData extends BaseData { ShuipaiDataListBean shuipaiDataListBean = GsonUtil.getGson().fromJson(response, new TypeToken() {}.getType()); List InterFaceList = shuipaiDataListBean.getData(); for(InterFaceBean interFacebean: InterFaceList ){ - if(interFacebean.getInterfaceName().equals("GetDevCoordinateByIP")){ + if(interFacebean.getInterfaceName().equals("getDevCoordinateByIP")){ if(interFacebean.getInterfaceUrl().contains("http")||interFacebean.getInterfaceUrl().contains("https")){ ScreenSaverData.getGetData(context,interFacebean.getInterfaceUrl()+DeviceData.getDeviceInfo(DeviceData.HINT_DEVICE_CODE),interFacebean.getInterfaceName(),null,new QueryFinishListener(){ @Override