fix: 水牌更新

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   同屏优化

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="";
     // 语音听写对象

app/src/main/java/qianmu/container/activity/program/MyPresentation.java

@@ -3862,7 +3862,7 @@ class MyPresentation extends Presentation {
             List<InterFaceBean> 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

app/src/main/java/qianmu/container/activity/program/ViewScreenSaver.java

@@ -3936,7 +3936,7 @@ public class ViewScreenSaver extends ViewBase<ViewScreenSaverBinding> {
             List<InterFaceBean> 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

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（灰度主板） 罗湖寻车机

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<ShuipaiDataListBean>() {}.getType());
                         List<InterFaceBean> 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