From 456730cc69792153b07e29d088820d641193fa8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=B4=AA=E9=BE=99?= <599179587@qq.com> Date: Wed, 23 Aug 2017 13:58:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9D=BF=E8=8A=AF=E7=8B=AC=E7=AB=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ifish/socket/SomeServer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ifish/socket/SomeServer.java b/src/main/java/com/ifish/socket/SomeServer.java index e81bea5..d538208 100644 --- a/src/main/java/com/ifish/socket/SomeServer.java +++ b/src/main/java/com/ifish/socket/SomeServer.java @@ -340,7 +340,7 @@ public class SomeServer { //柜灯状态 dataMap.put(strSrc + "Result7", receive.getSarkLamp() == 1 ? "开" : "关"); //加热制冷控制开关 - dataMap.put(strSrc + "Result8", receive.getIsRefrigeration() == 1 ? "开" : "关"); + dataMap.put(strSrc + "Result8", receive.getOnoff5() == 1 ? "制冷" : "加热"); dataMap.put(strSrc + "Wendu", (float) receive.getWendu() / 10 + ""); json.put("result", "onoff"); json.put("data", dataMap); @@ -700,8 +700,8 @@ public class SomeServer { map14.put("onOff4Checkbox", "灯3"); map14.put("onOff5Checkbox", "灯4"); map14.put("onOff6Checkbox", "柜灯开关"); - map14.put("onOff7Checkbox", "加热制冷开关"); + map14.put("onOff7Checkbox", "加热制冷切换"); showNameMap.put(str1[14], map14); - orderNumberMap.put(str1[14], new int[]{-1, 14, 1, 2, 3, 4, 13}); + orderNumberMap.put(str1[14], new int[]{-1, 14, 1, 2, 3, 4, 13, 5}); } }