Jelajahi Sumber

WallPadSupport.jar WallPadAPI.jar 파일 각 모듈에 추가

jslee(madeinlab) 3 tahun lalu
induk
melakukan
46c4ed7150
37 mengubah file dengan 10 tambahan dan 7 penghapusan
  1. TEMPAT SAMPAH
      AutoPicture/libs/WallPadAPI.jar
  2. TEMPAT SAMPAH
      AutoPicture/libs/WallPadSupport.jar
  3. TEMPAT SAMPAH
      LogOutputService/libs/WallPadAPI.jar
  4. TEMPAT SAMPAH
      LogOutputService/libs/WallPadSupport.jar
  5. TEMPAT SAMPAH
      ManagerSetting/libs/WallPadAPI.jar
  6. TEMPAT SAMPAH
      ManagerSetting/libs/WallPadSupport.jar
  7. 1 1
      WallPadAPI/build.gradle
  8. TEMPAT SAMPAH
      WallPadAPI/jar/WallPadAPI.jar
  9. TEMPAT SAMPAH
      WallPadAPI/jar/WallPadAPIforSVC.jar
  10. TEMPAT SAMPAH
      WallPadAPI/libs/WallPadSupport.jar
  11. TEMPAT SAMPAH
      WallPadAddService/libs/WallPadAPI.jar
  12. TEMPAT SAMPAH
      WallPadAddService/libs/WallPadSupport.jar
  13. TEMPAT SAMPAH
      WallPadCall/libs/WallPadAPI.jar
  14. TEMPAT SAMPAH
      WallPadCall/libs/WallPadSupport.jar
  15. TEMPAT SAMPAH
      WallPadConfig/libs/WallPadAPI.jar
  16. TEMPAT SAMPAH
      WallPadConfig/libs/WallPadSupport.jar
  17. TEMPAT SAMPAH
      WallPadDevService/libs/WallPadAPIforSVC.jar
  18. TEMPAT SAMPAH
      WallPadDevService/libs/WallPadSupport.jar
  19. TEMPAT SAMPAH
      WallPadEmergency/libs/WallPadAPI.jar
  20. TEMPAT SAMPAH
      WallPadEmergency/libs/WallPadSupport.jar
  21. TEMPAT SAMPAH
      WallPadEnergyCtrl/libs/WallPadAPI.jar
  22. TEMPAT SAMPAH
      WallPadEnergyCtrl/libs/WallPadSupport.jar
  23. TEMPAT SAMPAH
      WallPadGlobalButton/libs/WallPadAPI.jar
  24. TEMPAT SAMPAH
      WallPadGlobalScreen/libs/WallPadAPI.jar
  25. TEMPAT SAMPAH
      WallPadGlobalScreen/libs/WallPadSupport.jar
  26. TEMPAT SAMPAH
      WallPadHomeCtrl/libs/WallPadAPI.jar
  27. TEMPAT SAMPAH
      WallPadHomeCtrl/libs/WallPadSupport.jar
  28. TEMPAT SAMPAH
      WallPadMain/libs/WallPadAPI.jar
  29. TEMPAT SAMPAH
      WallPadMain/libs/WallPadSupport.jar
  30. TEMPAT SAMPAH
      WallPadMultiControlService/libs/WallPadAPI.jar
  31. TEMPAT SAMPAH
      WallPadMultiControlService/libs/WallPadSupport.jar
  32. 9 6
      WallPadMultiControlService/src/main/java/kr/co/icontrols/wallpadmulticontrolservice/DataSenderService.java
  33. TEMPAT SAMPAH
      WallPadOutmodeRun/libs/WallPadAPI.jar
  34. TEMPAT SAMPAH
      WallPadOutmodeRun/libs/WallPadSupport.jar
  35. TEMPAT SAMPAH
      WallPadSecurity/libs/WallPadAPI.jar
  36. TEMPAT SAMPAH
      WallPadSecurity/libs/WallPadSupport.jar
  37. TEMPAT SAMPAH
      WallPadSupport/jar/WallPadSupport.jar

TEMPAT SAMPAH
AutoPicture/libs/WallPadAPI.jar


TEMPAT SAMPAH
AutoPicture/libs/WallPadSupport.jar


TEMPAT SAMPAH
LogOutputService/libs/WallPadAPI.jar


TEMPAT SAMPAH
LogOutputService/libs/WallPadSupport.jar


TEMPAT SAMPAH
ManagerSetting/libs/WallPadAPI.jar


TEMPAT SAMPAH
ManagerSetting/libs/WallPadSupport.jar


+ 1 - 1
WallPadAPI/build.gradle

@@ -40,7 +40,7 @@ android {
             java {
                 //WallPadAPI jar생성시에는 아래 코드 주석처리하고 exportJar 수행
                 //WallPadDevice용 jar생성시에는 아래 코드 주석 해제하고 exportServiceJar 실행
-//                exclude "**/wallpadapi/**"
+                exclude "**/wallpadapi/**"
             }
         }
     }

TEMPAT SAMPAH
WallPadAPI/jar/WallPadAPI.jar


TEMPAT SAMPAH
WallPadAPI/jar/WallPadAPIforSVC.jar


TEMPAT SAMPAH
WallPadAPI/libs/WallPadSupport.jar


TEMPAT SAMPAH
WallPadAddService/libs/WallPadAPI.jar


TEMPAT SAMPAH
WallPadAddService/libs/WallPadSupport.jar


TEMPAT SAMPAH
WallPadCall/libs/WallPadAPI.jar


TEMPAT SAMPAH
WallPadCall/libs/WallPadSupport.jar


TEMPAT SAMPAH
WallPadConfig/libs/WallPadAPI.jar


TEMPAT SAMPAH
WallPadConfig/libs/WallPadSupport.jar


TEMPAT SAMPAH
WallPadDevService/libs/WallPadAPIforSVC.jar


TEMPAT SAMPAH
WallPadDevService/libs/WallPadSupport.jar


TEMPAT SAMPAH
WallPadEmergency/libs/WallPadAPI.jar


TEMPAT SAMPAH
WallPadEmergency/libs/WallPadSupport.jar


TEMPAT SAMPAH
WallPadEnergyCtrl/libs/WallPadAPI.jar


TEMPAT SAMPAH
WallPadEnergyCtrl/libs/WallPadSupport.jar


TEMPAT SAMPAH
WallPadGlobalButton/libs/WallPadAPI.jar


TEMPAT SAMPAH
WallPadGlobalScreen/libs/WallPadAPI.jar


TEMPAT SAMPAH
WallPadGlobalScreen/libs/WallPadSupport.jar


TEMPAT SAMPAH
WallPadHomeCtrl/libs/WallPadAPI.jar


TEMPAT SAMPAH
WallPadHomeCtrl/libs/WallPadSupport.jar


TEMPAT SAMPAH
WallPadMain/libs/WallPadAPI.jar


TEMPAT SAMPAH
WallPadMain/libs/WallPadSupport.jar


TEMPAT SAMPAH
WallPadMultiControlService/libs/WallPadAPI.jar


TEMPAT SAMPAH
WallPadMultiControlService/libs/WallPadSupport.jar


+ 9 - 6
WallPadMultiControlService/src/main/java/kr/co/icontrols/wallpadmulticontrolservice/DataSenderService.java

@@ -376,7 +376,8 @@ public class DataSenderService extends Service {
                         outputStream.writeObject(json);
                         outputStream.close();
                         Log.d("ServerThread", "result 보냄 : " + result);
-                    } else if (data != null && !data.trim().equals("") && basicData.getType().equalsIgnoreCase("request") && basicData.getReason() == JSON.REASON.Status) {
+                    }
+                    else if (data != null && !data.trim().equals("") && basicData.getType().equalsIgnoreCase("request") && basicData.getReason() == JSON.REASON.Status) {
                         try {
                             JSONObject result = updateRequest(basicData.getMenu(), basicData.getKind(), basicData.getPosition());
                             Random rand = new Random();
@@ -418,7 +419,7 @@ public class DataSenderService extends Service {
                                     "\"boiler_hotwater_temp\" : 33, " +
                                     "\"boiler_frost_protect\" : true, " +
                                     "\"boiler_error_code\" : 0, " +
-                                    "\"data_seq\" : \"2_3_1_0\", " +
+                                    "\"data_seq\" : \"8_7_6_5_4_3_2_1\", " +
                                     "\"data_array\" : [" +
                                     "{ \"roomNumber\" : 1, \"mode\" : " + 1 + ", \"setTemp\" : " + iValue + ",\"nowTemp\" : 20, \"reservationArray\" : [0,1,2,3,20], \"sleepTemp\" : 1, \"sleepTime\" : 1 }," +
                                     "{ \"roomNumber\" : 2, \"mode\" : " + 2 + ", \"setTemp\" : " + iValue + ",\"nowTemp\" : 21, \"reservationArray\" : [0,1,2,3,21], \"sleepTemp\" : 2, \"sleepTime\" : 2 }," +
@@ -510,7 +511,8 @@ public class DataSenderService extends Service {
                             outputStream.close();
                             e.printStackTrace();
                         }
-                    } else if (data != null && !data.trim().equals("") && basicData.getType().equalsIgnoreCase("request") && basicData.getMenu() == JSON.MENU.PASSWORD) {
+                    }
+                    else if (data != null && !data.trim().equals("") && basicData.getType().equalsIgnoreCase("request") && basicData.getMenu() == JSON.MENU.PASSWORD) {
                         //비밀번호 변경 요청
                         int result = passwordChangeRequest(basicData.getNumber());
                         String json = "";
@@ -1428,13 +1430,13 @@ public class DataSenderService extends Service {
             String[] strValue = devSet.GetSettingData("UI순서");
             devSet.closeDB();
 
-            // 현대건설 더 펜트하우스 서버에서 설정된 UI 순서를 이용하도록 한다.
+            //서버에서 설정된 UI 순서를 이용하도록 한다.
             if (strValue != null) {
                 strLight = strValue[1].substring((strValue[1].indexOf("조명(") + 3), (strValue[1].indexOf(")난방(")));
 
                 int strLightCount = Integer.valueOf(strLight.substring(0, strLight.indexOf(":")));
 
-                if (strLightCount == (1 + bedDataCount)) {
+                if (strLightCount == (1 + bedDataCount + switchDataCount)) {
                     //개수가 일치하는 경우에 적용
                     strLight = strLight.substring(strLight.indexOf(":") + 1);
                 } else {
@@ -1883,7 +1885,8 @@ public class DataSenderService extends Service {
         try {
             if (menu == JSON.MENU.LIGHT) {
                 return updateLight(kind, position);
-            } else if (menu == JSON.MENU.CONCENT) {
+            }
+            else if (menu == JSON.MENU.CONCENT) {
                 return updateConcent(kind, position);
             } else if (menu == JSON.MENU.HEATING) {
                 return updateHeating(kind, position);

TEMPAT SAMPAH
WallPadOutmodeRun/libs/WallPadAPI.jar


TEMPAT SAMPAH
WallPadOutmodeRun/libs/WallPadSupport.jar


TEMPAT SAMPAH
WallPadSecurity/libs/WallPadAPI.jar


TEMPAT SAMPAH
WallPadSecurity/libs/WallPadSupport.jar


TEMPAT SAMPAH
WallPadSupport/jar/WallPadSupport.jar