Selaa lähdekoodia

[WallPadMain]
1. 홈 2.0에서 도어락 빼기

[WalPadAddService]
1. 기축서버 기능 추가

jglee 3 vuotta sitten
vanhempi
commit
417e19c34d

+ 8 - 8
WallPadDevService/src/main/aidl/com/artncore/wallpaddevservice/DevCtrCMD.aidl

@@ -1,9 +1,9 @@
-package com.artncore.wallpaddevservice;
-
-interface DevCtrCMD {
-	String getDevInfo(in String reqCMD);
-	void set_interval(int interval);
-	String Check_BootupStatus();
-	String Get_Devise_Info();
-	String Control_Device(in String cmdstr);
+package com.artncore.wallpaddevservice;
+
+interface DevCtrCMD {
+	String getDevInfo(in String reqCMD);
+	void set_interval(int interval);
+	String Check_BootupStatus();
+	String Get_Devise_Info();
+	String Control_Device(in String cmdstr);
 }

+ 2 - 1
WallPadMain/src/main/java/kr/co/icontrols/wallpadmain/util/iMapServer.java

@@ -6111,7 +6111,8 @@ public class iMapServer extends Service {
             }
 
             WallpadiCMDParser DevListCMD = new WallpadiCMDParser(ele);
-            String[] devlist = {"gas", "livinglight", "doorlock", "light", "ventil", "thermostat", "electric", "smartlight", "cooktop"};
+           // String[] devlist = {"gas", "livinglight", "doorlock", "light", "ventil", "thermostat", "electric", "smartlight", "cooktop"};
+            String[] devlist = {"gas", "livinglight", "light", "ventil", "thermostat", "electric", "smartlight", "cooktop"};
             strResult += "\"ok\">\r\n";
             strResult +="      <target name=\""+DevListCMD.target+"\" id=\""+DevListCMD.tid+"\" msg_no=\""+DevListCMD.msgno+"\"/>\r\n";
             strResult += "         <devlist total_count=\""+devlist.length+"\"/>\r\n";