ソースを参照

[모든앱]
1. Ver. 갱신
- 2022.01.04.01
2. WallPadAPI 수정
- LCD Keeper 기본설정 변경
> 사용안함 -> 사용함(보호/복구모드)
3. WallPadDevService 수정
- 제어드라이버 로그 플래그 정리
> 모두 사용안함으로 정리 (필요하지 않은 디버깅용 로그 비활성화)

Changwoo Nam 4 年 前
コミット
ad540c4a86
81 ファイル変更138 行追加149 行削除
  1. BIN
      10_Release/AutoPicture.apk
  2. BIN
      10_Release/LogOutputService.apk
  3. BIN
      10_Release/ManagerSetting.apk
  4. BIN
      10_Release/WallPadAddService.apk
  5. BIN
      10_Release/WallPadCall.apk
  6. BIN
      10_Release/WallPadConfig.apk
  7. BIN
      10_Release/WallPadDevService.apk
  8. BIN
      10_Release/WallPadEmergency.apk
  9. BIN
      10_Release/WallPadEnergyCtrl.apk
  10. BIN
      10_Release/WallPadGlobalButton.apk
  11. BIN
      10_Release/WallPadGlobalScreen.apk
  12. BIN
      10_Release/WallPadHomeCtrl.apk
  13. BIN
      10_Release/WallPadKeyBoard.apk
  14. BIN
      10_Release/WallPadMain.apk
  15. BIN
      10_Release/WallPadOutModeRun.apk
  16. BIN
      10_Release/WallPadSecurity.apk
  17. BIN
      AutoPicture/libs/WallPadAPI.jar
  18. 1 1
      AutoPicture/src/main/AndroidManifest.xml
  19. BIN
      LogOutputService/libs/WallPadAPI.jar
  20. BIN
      LogOutputService/libs/WallPadAPIforSVC.jar
  21. 1 1
      LogOutputService/src/main/AndroidManifest.xml
  22. BIN
      ManagerSetting/libs/WallPadAPI.jar
  23. 1 1
      ManagerSetting/src/main/AndroidManifest.xml
  24. BIN
      WallPadAPI/jar/WallPadAPI.jar
  25. BIN
      WallPadAPI/jar/WallPadAPIforSVC.jar
  26. 14 26
      WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/wallpaddbmgr.java
  27. 1 1
      WallPadAPI/src/main/java/com/artncore/commons/define.java
  28. BIN
      WallPadAddService/libs/WallPadAPI.jar
  29. 1 1
      WallPadAddService/src/main/AndroidManifest.xml
  30. BIN
      WallPadCall/libs/WallPadAPI.jar
  31. 1 1
      WallPadCall/src/main/AndroidManifest.xml
  32. BIN
      WallPadConfig/libs/WallPadAPI.jar
  33. 1 1
      WallPadConfig/src/main/AndroidManifest.xml
  34. BIN
      WallPadDevService/libs/WallPadAPIforSVC.jar
  35. 1 1
      WallPadDevService/src/main/AndroidManifest.xml
  36. 4 4
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/AllLightHDC_Controller.java
  37. 5 5
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/AllLight_Controller.java
  38. 2 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/BioRecognition_Controller.java
  39. 4 4
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/CutOffConcent_Controller.java
  40. 3 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/DLock_Controller.java
  41. 3 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/ElectricRange_Controller.java
  42. 4 4
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/EnergyMeter_Controller.java
  43. 4 4
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/EnergyModule_Controller.java
  44. 3 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/EtcLivingLight_Controller.java
  45. 3 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/FP_DLock_Controller.java
  46. 3 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/GasValve_Controller.java
  47. 3 4
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingFinder_Controller.java
  48. 4 5
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingV1_Controller.java
  49. 4 5
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingV2_Controller.java
  50. 4 4
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HomeAutomation_New_Controller.java
  51. 4 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/IGW200D_Controller.java
  52. 4 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/IGW300_Controller.java
  53. 3 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/InRoomDetectSensor_Controller.java
  54. 4 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/IntLight_Controller.java
  55. 3 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/InterlayerNoise_Controller.java
  56. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Knx_Ventilation_Controller.java
  57. 3 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/LedDimming_Controller_KCC.java
  58. 3 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Light_Controller.java
  59. 3 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Louver_Controller.java
  60. 3 4
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/MultiSwitch_Controller.java
  61. 4 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/PhoneNRemocon.java
  62. 4 5
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Purity_Controller.java
  63. 3 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/RealTimeMeter_Controller.java
  64. 3 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/RfDoorCam_Controller.java
  65. 3 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Sample_Controller.java
  66. 3 3
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/SmartKeyRfDoor_Controller.java
  67. 4 4
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/SmartSwitchEvt_Controller.java
  68. BIN
      WallPadEmergency/libs/WallPadAPI.jar
  69. 1 1
      WallPadEmergency/src/main/AndroidManifest.xml
  70. BIN
      WallPadEnergyCtrl/libs/WallPadAPI.jar
  71. 1 1
      WallPadEnergyCtrl/src/main/AndroidManifest.xml
  72. BIN
      WallPadGlobalScreen/libs/WallPadAPI.jar
  73. 1 1
      WallPadGlobalScreen/src/main/AndroidManifest.xml
  74. BIN
      WallPadHomeCtrl/libs/WallPadAPI.jar
  75. 1 1
      WallPadHomeCtrl/src/main/AndroidManifest.xml
  76. BIN
      WallPadMain/libs/WallPadAPI.jar
  77. 1 1
      WallPadMain/src/main/AndroidManifest.xml
  78. BIN
      WallPadOutmodeRun/libs/WallPadAPI.jar
  79. 1 1
      WallPadOutmodeRun/src/main/AndroidManifest.xml
  80. BIN
      WallPadSecurity/libs/WallPadAPI.jar
  81. 1 1
      WallPadSecurity/src/main/AndroidManifest.xml

BIN
10_Release/AutoPicture.apk


BIN
10_Release/LogOutputService.apk


BIN
10_Release/ManagerSetting.apk


BIN
10_Release/WallPadAddService.apk


BIN
10_Release/WallPadCall.apk


BIN
10_Release/WallPadConfig.apk


BIN
10_Release/WallPadDevService.apk


BIN
10_Release/WallPadEmergency.apk


BIN
10_Release/WallPadEnergyCtrl.apk


BIN
10_Release/WallPadGlobalButton.apk


BIN
10_Release/WallPadGlobalScreen.apk


BIN
10_Release/WallPadHomeCtrl.apk


BIN
10_Release/WallPadKeyBoard.apk


BIN
10_Release/WallPadMain.apk


BIN
10_Release/WallPadOutModeRun.apk


BIN
10_Release/WallPadSecurity.apk


BIN
AutoPicture/libs/WallPadAPI.jar


+ 1 - 1
AutoPicture/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.autopicture"
     android:versionCode="17"
-    android:versionName="2021.12.06.01">
+    android:versionName="2022.01.04.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 

BIN
LogOutputService/libs/WallPadAPI.jar


BIN
LogOutputService/libs/WallPadAPIforSVC.jar


+ 1 - 1
LogOutputService/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.artncore.apps.ic_wallpad.service.log"
     android:versionCode="24"
-    android:versionName="2021.12.06.01">
+    android:versionName="2022.01.04.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

BIN
ManagerSetting/libs/WallPadAPI.jar


+ 1 - 1
ManagerSetting/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.artncore.managersetting"
     android:versionCode="23"
-    android:versionName="2021.12.06.01">
+    android:versionName="2022.01.04.01">
 
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>

BIN
WallPadAPI/jar/WallPadAPI.jar


BIN
WallPadAPI/jar/WallPadAPIforSVC.jar


+ 14 - 26
WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/wallpaddbmgr.java

@@ -192,8 +192,7 @@ public class wallpaddbmgr {
             {"1", "1", define.DEVICE_ID_DISTRIBUTION_KIND, define.DEVICE_DISABLE, "종류(사용안함)"},
     };
 
-    private static String[][] iHN1000_DevicesSettingInitData = new String[][] {
-
+    private static String[][] IHN1010_I_ALT_DevicesSettingInitData = new String[][] {
             {"1", "1", define.DEVICE_ID_GAS, define.DEVICE_ENABLE, ""},
             {"1", "1", define.DEVICE_ID_ELECTRIC_RANGE, define.DEVICE_DISABLE, ""},
             {"1", "1", define.DEVICE_ID_DOORLOCK, define.DEVICE_ENABLE, "종류(무선)"},
@@ -206,7 +205,6 @@ public class wallpaddbmgr {
             {"1", "1", define.DEVICE_ID_VENTIL, define.DEVICE_DISABLE, ""},
             {"1", "1", define.DEVICE_ID_INTERLAYER_NOISE_SENSOR, define.DEVICE_DISABLE, ""},
             {"1", "1", define.DEVICE_ID_SENSOR_AP, define.DEVICE_DISABLE, ""},
-
             {"1", "1", define.DEVICE_ID_ENERGY_DEVICES, define.DEVICE_DISABLE, ""},
             {"1", "1", define.DEVICE_ID_IPARKENERGY, define.DEVICE_DISABLE, ""},
             {"1", "1", define.DEVICE_ID_IDLE_POWER_SAVING_SWITCH, define.DEVICE_DISABLE, ""},
@@ -215,16 +213,13 @@ public class wallpaddbmgr {
             {"1", "1", define.DEVICE_ID_SENSOR, define.DEVICE_DISABLE, "외부동체사용(사용안함)내부동체사용(사용안함)외부동체를내부동체로사용(사용안함))"},
             {"1", "1", define.DEVICE_ID_WALLPAD_CAMERA, define.DEVICE_DISABLE, ""},
             {"1", "1", define.DEVICE_ID_GUARDCALL_VIDEO_ON, define.DEVICE_DISABLE, ""},
-
             {"1", "1", define.DEVICE_ID_EMERGENGY_LEDDER, define.DEVICE_DISABLE, ""},
-
-            //{"1", "1", define.DEVICE_ID_MOOD_LIGHT, define.DEVICE_DISABLE, "종류(하단등)"},
-
             {"1", "1", define.DEVICE_ID_PARKING, define.DEVICE_DISABLE, "종류(아이콘트롤스)IP(10.0.1.10:10000)"},
             {"1", "1", define.DEVICE_ID_ENERGY_SERVER_CONNECT, define.DEVICE_DISABLE, "IP(10.0.1.1:10000)검침일사용자설정(사용안함)"},
             {"1", "1", define.DEVICE_ID_MAIN_GUI_SELECT, define.DEVICE_ENABLE, "종류(기본)"},
             {"1", "1", define.DEVICE_ID_ESCAPELADDER_DOWN_RECV, define.DEVICE_DISABLE, ""},
             {"1", "1", define.DEVICE_ID_DISTRIBUTION_KIND, define.DEVICE_DISABLE, "종류(사용안함)"},
+            {"1", "1", define.DEVICE_ID_LCDKEEPER, define.DEVICE_ENABLE, "종류(보호/복구모드)"},
     };
 
     // 첫번째 - 기기개수(기본 1로 입력), 두번째 - 회로수(방개수 등), 세번째 - 디바이스 이름, 네번째 - 사용여부, 다섯번째 - 기타정보
@@ -1938,10 +1933,7 @@ public class wallpaddbmgr {
                 );
             }
         }
-        else if (mModelType == Version.MODEL_TYPE.IHN_1020B_A
-                || mModelType == Version.MODEL_TYPE.IHN_1030_D
-                || mModelType == Version.MODEL_TYPE.IHN_1020B_C)
-        {
+        else if (mModelType == Version.MODEL_TYPE.IHN_1020B_A || mModelType == Version.MODEL_TYPE.IHN_1030_D || mModelType == Version.MODEL_TYPE.IHN_1020B_C) {
             for (int i = 0; i < iHN1020B_A_DevicesSettingInitData.length; i++) {
                 Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);
                 InsertinitDeviceData("subdev_list"
@@ -1960,15 +1952,13 @@ public class wallpaddbmgr {
                 );
             }
         }
-        else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
-                || mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I)
-        {
+        else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I || mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I) {
             for (int i = 0; i < iHND101_DevicesSettingInitData.length; i++) {
                 Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);
                 if ((iHND101_DevicesSettingInitData[i][2].endsWith(define.DEVICE_ID_KITCHEN_TV_PSTN_CALL) == true)
                         || (iHND101_DevicesSettingInitData[i][2].endsWith(define.DEVICE_ID_BATH_TV_PSTN_CALL) == true)
-                        || (iHND101_DevicesSettingInitData[i][2].endsWith(define.DEVICE_ID_BATH_PSTN_CALL) == true))
-                {   //욕실폰, 욕실TV, 주방TV 국선전화 연동 시 "1(1:국선(사용함))" 으로 저장하기 위함.
+                        || (iHND101_DevicesSettingInitData[i][2].endsWith(define.DEVICE_ID_BATH_PSTN_CALL) == true)) {
+                    //욕실폰, 욕실TV, 주방TV 국선전화 연동 시 "1(1:국선(사용함))" 으로 저장하기 위함.
                     InsertinitDeviceData("subdev_list"
                             , iHND101_DevicesSettingInitData[i][2]
                             , 0
@@ -2021,27 +2011,25 @@ public class wallpaddbmgr {
                 );
             }
         }
-        else if (mModelType == Version.MODEL_TYPE.IHN_1010_I_ALT)
-        {
-            for (int i = 0; i < iHN1000_DevicesSettingInitData.length; i++) {
+        else if (mModelType == Version.MODEL_TYPE.IHN_1010_I_ALT) {
+            for (int i = 0; i < IHN1010_I_ALT_DevicesSettingInitData.length; i++) {
                 Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);
                 InsertinitDeviceData("subdev_list"
-                        , iHN1000_DevicesSettingInitData[i][2]
+                        , IHN1010_I_ALT_DevicesSettingInitData[i][2]
                         , 0
-                        , iHN1000_DevicesSettingInitData[i][0]+
+                        , IHN1010_I_ALT_DevicesSettingInitData[i][0]+
                                 "("
-                                +iHN1000_DevicesSettingInitData[i][1]+
+                                + IHN1010_I_ALT_DevicesSettingInitData[i][1]+
                                 ":"
-                                +iHN1000_DevicesSettingInitData[i][2]+
+                                + IHN1010_I_ALT_DevicesSettingInitData[i][2]+
                                 "("+
-                                iHN1000_DevicesSettingInitData[i][3]+
+                                IHN1010_I_ALT_DevicesSettingInitData[i][3]+
                                 ")"+
-                                iHN1000_DevicesSettingInitData[i][4]+
+                                IHN1010_I_ALT_DevicesSettingInitData[i][4]+
                                 ")"
                 );
             }
         }
-
         else if (mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I) {
             for (int i = 0; i < iHN1010GL_DevicesSettingInitData.length; i++) {
                 Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);

+ 1 - 1
WallPadAPI/src/main/java/com/artncore/commons/define.java

@@ -4,7 +4,7 @@ import android.os.Environment;
 
 public class define {
 	/** WallPadAPI Version 을 정의합니다. */
-	public static final String WALLPADAPI_VERSION = "2021.12.06.01";
+	public static final String WALLPADAPI_VERSION = "2022.01.04.01";
 	///////////////////////////////////////////////////////////////////////
 	// WallPadDevService 의 각 드라이버와 통신을 위한 드라이버 이름을 정의합니다.
 	///////////////////////////////////////////////////////////////////////

BIN
WallPadAddService/libs/WallPadAPI.jar


+ 1 - 1
WallPadAddService/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadaddservice"
     android:versionCode="17"
-    android:versionName="2021.12.06.01">
+    android:versionName="2022.01.04.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

BIN
WallPadCall/libs/WallPadAPI.jar


+ 1 - 1
WallPadCall/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadcall"
     android:versionCode="17"
-    android:versionName="2021.12.07.01">
+    android:versionName="2022.01.04.01">
 
     <!--android:sharedUserId="android.uid.system"-->
     <!--<uses-sdk-->

BIN
WallPadConfig/libs/WallPadAPI.jar


+ 1 - 1
WallPadConfig/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadconfig"
     android:versionCode="01"
-    android:versionName="2021.12.06.01">
+    android:versionName="2022.01.04.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

BIN
WallPadDevService/libs/WallPadAPIforSVC.jar


+ 1 - 1
WallPadDevService/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.artncore.deviceservice"
     android:versionCode="1"
-    android:versionName="2021.12.07.01">
+    android:versionName="2022.01.04.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

+ 4 - 4
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/AllLightHDC_Controller.java

@@ -118,10 +118,10 @@ public class AllLightHDC_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public AllLightHDC_Controller()
-    {
-        /** 로그 초기상태 */
-        log_sw = false;
+    public AllLightHDC_Controller() {
+        /* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
 
         /** 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 5 - 5
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/AllLight_Controller.java

@@ -222,11 +222,11 @@ public class AllLight_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public AllLight_Controller()
-    {
-        /** 로그 초기상태 */
-        log_sw = false;
-        //SerialLog = true;
+    public AllLight_Controller() {
+        /* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
+
         /** 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);
 

+ 2 - 2
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/BioRecognition_Controller.java

@@ -345,8 +345,8 @@ public class BioRecognition_Controller extends DeviceManager {
      */
     public BioRecognition_Controller() {
         /* 로그 초기상태 */
-        //log_sw = true;
-        //SerialLog = true;
+//		log_sw = true;
+//		SerialLog = true;
 
         /* 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 4 - 4
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/CutOffConcent_Controller.java

@@ -79,10 +79,10 @@ public class CutOffConcent_Controller extends DeviceManager
 
 
     /** 생성자 */
-    public CutOffConcent_Controller()
-    {
-        // 1. 로그
-        log_sw = false;
+    public CutOffConcent_Controller() {
+        /* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
 
         // 2. 드라이버 내부 변수
         mDriver = new Driver();

+ 3 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/DLock_Controller.java

@@ -226,10 +226,10 @@ public class DLock_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public DLock_Controller()
-    {
+    public DLock_Controller() {
         /* 로그 초기상태 */
-        log_sw = false;
+//		log_sw = true;
+//		SerialLog = true;
 
         /* 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 3 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/ElectricRange_Controller.java

@@ -118,10 +118,10 @@ public class ElectricRange_Controller extends DeviceManager
 	private Driver mDriver = null;
 
 
-	public ElectricRange_Controller()
-	{
+	public ElectricRange_Controller() {
 		/* 로그 초기상태 */
-		log_sw = false;
+//		log_sw = true;
+//		SerialLog = true;
 
 		/* 통신성공률 변수 초기화 */
 		super.CommDataGeneration(1);

+ 4 - 4
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/EnergyMeter_Controller.java

@@ -368,10 +368,10 @@ public class EnergyMeter_Controller extends DeviceManager
 
 
     /** 생성자 */
-    public EnergyMeter_Controller()
-    {
-        // 1. 로그
-        log_sw = false;
+    public EnergyMeter_Controller() {
+        /* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
 
         // 2. 드라이버 내부 변수
         mDriver = new Driver();

+ 4 - 4
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/EnergyModule_Controller.java

@@ -78,10 +78,10 @@ public class EnergyModule_Controller extends DeviceManager
 
 
     /** 생성자 */
-    public EnergyModule_Controller()
-    {
-        // 1. 로그
-        log_sw = false;
+    public EnergyModule_Controller() {
+        /* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
 
         // 2. 드라이버 내부 변수
         mDriver = new Driver();

+ 3 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/EtcLivingLight_Controller.java

@@ -149,10 +149,10 @@ public class EtcLivingLight_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public EtcLivingLight_Controller()
-    {
+    public EtcLivingLight_Controller() {
         /* 로그 초기상태 */
-        log_sw = false;
+//		log_sw = true;
+//		SerialLog = true;
 
         /* 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 3 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/FP_DLock_Controller.java

@@ -124,10 +124,10 @@ public class FP_DLock_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public FP_DLock_Controller()
-    {
+    public FP_DLock_Controller() {
         /* 로그 초기상태 */
-        log_sw = false;
+//		log_sw = true;
+//		SerialLog = true;
 
         /* 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 3 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/GasValve_Controller.java

@@ -218,10 +218,10 @@ public class GasValve_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public GasValve_Controller()
-    {
+    public GasValve_Controller() {
         /* 로그 초기상태 */
-        log_sw = false;
+//		log_sw = true;
+//		SerialLog = true;
 
         /* 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 3 - 4
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingFinder_Controller.java

@@ -111,11 +111,10 @@ public class HeatingFinder_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public HeatingFinder_Controller()
-    {
+    public HeatingFinder_Controller() {
         /* 로그 초기상태 */
-        log_sw = false;
-        SerialLog = false;
+//		log_sw = true;
+//		SerialLog = true;
 
         /* 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 4 - 5
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingV1_Controller.java

@@ -152,11 +152,10 @@ public class HeatingV1_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public HeatingV1_Controller()
-    {
-        /** 로그 초기상태 */
-        log_sw = false;
-        SerialLog = false;
+    public HeatingV1_Controller() {
+        /* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
         /** 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);
 

+ 4 - 5
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingV2_Controller.java

@@ -207,11 +207,10 @@ public class HeatingV2_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public HeatingV2_Controller()
-    {
-        /** 로그 초기상태 */
-        log_sw = false;
-        SerialLog = false;
+    public HeatingV2_Controller() {
+        /* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
         /** 모델정보 가져오기 */
         mModelType = Version.getModelType();
 

+ 4 - 4
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HomeAutomation_New_Controller.java

@@ -635,10 +635,10 @@ public class HomeAutomation_New_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public HomeAutomation_New_Controller()
-    {
-        /** 로그 초기상태 */
-        log_sw = true;
+    public HomeAutomation_New_Controller() {
+        /* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
                 
         /** 통신성공률 변수 초기화 */
         CommDataGeneration(1);

+ 4 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/IGW200D_Controller.java

@@ -832,9 +832,10 @@ public class IGW200D_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public IGW200D_Controller()
-    {
-        log_sw = false;
+    public IGW200D_Controller() {
+        /* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
 
         super.CommDataGeneration(1);
 

+ 4 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/IGW300_Controller.java

@@ -916,9 +916,10 @@ public class IGW300_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public IGW300_Controller()
-    {
-        log_sw = true;//false;
+    public IGW300_Controller() {
+        /* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
 
         super.CommDataGeneration(1);
 

+ 3 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/InRoomDetectSensor_Controller.java

@@ -646,10 +646,10 @@ public class InRoomDetectSensor_Controller extends DeviceManager
 	private Driver mDriver = null;
 
 
-	public InRoomDetectSensor_Controller()
-	{
+	public InRoomDetectSensor_Controller() {
 		/* 로그 초기상태 */
-		log_sw = false;
+//		log_sw = true;
+//		SerialLog = true;
 
 		/* 통신성공률 변수 초기화 */
 		super.CommDataGeneration(1);

+ 4 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/IntLight_Controller.java

@@ -183,9 +183,10 @@ public class IntLight_Controller extends DeviceManager
 
 	private Data mData = null;
 
-	public IntLight_Controller()
-	{
-		log_sw = false;
+	public IntLight_Controller() {
+		/* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
 
 		super.CommDataGeneration(1);
 

+ 3 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/InterlayerNoise_Controller.java

@@ -162,10 +162,10 @@ public class InterlayerNoise_Controller extends DeviceManager
 
 	private Driver mDriver = null;
 
-	public InterlayerNoise_Controller()
-	{
+	public InterlayerNoise_Controller() {
 		/* 로그 초기상태 */
-		log_sw = false;
+//		log_sw = true;
+//		SerialLog = true;
 
 		/* 통신성공률 변수 초기화 */
 		super.CommDataGeneration(1);

+ 2 - 1
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Knx_Ventilation_Controller.java

@@ -323,7 +323,8 @@ public class Knx_Ventilation_Controller extends DeviceManager {
      */
     public Knx_Ventilation_Controller() {
         /* 로그 초기상태 */
-        log_sw = false;
+//		log_sw = true;
+//		SerialLog = true;
 
         /* 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 3 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/LedDimming_Controller_KCC.java

@@ -126,10 +126,10 @@ public class LedDimming_Controller_KCC extends DeviceManager
     /**
      * 생성자
      */
-    public LedDimming_Controller_KCC()
-    {
+    public LedDimming_Controller_KCC() {
         /* 로그 초기상태 */
-        log_sw = false;
+//		log_sw = true;
+//		SerialLog = true;
 
         /** 통신성공률 변수 초기화 */
         CommDataGeneration(1);

+ 3 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Light_Controller.java

@@ -160,10 +160,10 @@ public class Light_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public Light_Controller()
-    {
+    public Light_Controller() {
         /* 로그 초기상태 */
-        log_sw = false;
+//		log_sw = true;
+//		SerialLog = true;
 
         /* 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 3 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Louver_Controller.java

@@ -200,10 +200,10 @@ public class Louver_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public Louver_Controller()
-    {
+    public Louver_Controller() {
         /* 로그 초기상태 */
-        log_sw = false;
+//		log_sw = true;
+//		SerialLog = true;
 
         /* 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 3 - 4
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/MultiSwitch_Controller.java

@@ -387,11 +387,10 @@ public class MultiSwitch_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public MultiSwitch_Controller()
-    {
+    public MultiSwitch_Controller() {
         /* 로그 초기상태 */
-//        log_sw = true;
-//        SerialLog = true;
+//		log_sw = true;
+//		SerialLog = true;
 
         /* 드라이버 내부 변수 초기화 */
         mDriver = new Driver();

+ 4 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/PhoneNRemocon.java

@@ -546,9 +546,10 @@ public class PhoneNRemocon extends DeviceManager {
     RemoteInterface mRemoteInterfaceService = null;
     //    IRemoteService mService = null;
     DriverInterOpAPI DriverAPI;
-    public PhoneNRemocon()
-    {
-        log_sw = false;
+    public PhoneNRemocon() {
+        /* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
 
         mSubCallEventReceiver = new SubCallEventReceiver();
 

+ 4 - 5
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Purity_Controller.java

@@ -162,11 +162,10 @@ public class Purity_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public Purity_Controller()
-    {
-        /** 로그 초기상태 */
-        log_sw = true;
-        SerialLog = true;
+    public Purity_Controller() {
+        /* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
 
         /** 모델정보 가져오기 */
         mModelType = Version.getModelType();

+ 3 - 2
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/RealTimeMeter_Controller.java

@@ -111,8 +111,9 @@ public class RealTimeMeter_Controller extends DeviceManager {
      * 생성자
      */
     public RealTimeMeter_Controller() {
-        /** 로그 초기상태 */
-        log_sw = false;
+        /* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
 
         /** 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 3 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/RfDoorCam_Controller.java

@@ -350,10 +350,10 @@ public class RfDoorCam_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public RfDoorCam_Controller()
-    {
+    public RfDoorCam_Controller() {
         /* 로그 초기상태 */
-        log_sw = false;
+//		log_sw = true;
+//		SerialLog = true;
 
         /* 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 3 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Sample_Controller.java

@@ -83,10 +83,10 @@ public class Sample_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public Sample_Controller()
-    {
+    public Sample_Controller() {
         /* 로그 초기상태 */
-        log_sw = false;
+//		log_sw = true;
+//		SerialLog = true;
 
         /* 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 3 - 3
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/SmartKeyRfDoor_Controller.java

@@ -649,10 +649,10 @@ public class SmartKeyRfDoor_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public SmartKeyRfDoor_Controller()
-    {
+    public SmartKeyRfDoor_Controller() {
         /* 로그 초기상태 */
-        log_sw = false;
+//		log_sw = true;
+//		SerialLog = true;
 
         /* 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

+ 4 - 4
WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/SmartSwitchEvt_Controller.java

@@ -909,10 +909,10 @@ public class SmartSwitchEvt_Controller extends DeviceManager
     /**
      * 생성자
      */
-    public SmartSwitchEvt_Controller()
-    {
-        /** 로그 초기상태 */
-        log_sw = false;
+    public SmartSwitchEvt_Controller() {
+        /* 로그 초기상태 */
+//		log_sw = true;
+//		SerialLog = true;
 
         /** 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

BIN
WallPadEmergency/libs/WallPadAPI.jar


+ 1 - 1
WallPadEmergency/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpademergency"
     android:versionCode="01"
-    android:versionName="2021.12.06.01">
+    android:versionName="2022.01.04.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

BIN
WallPadEnergyCtrl/libs/WallPadAPI.jar


+ 1 - 1
WallPadEnergyCtrl/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadenergyctrl"
     android:versionCode="01"
-    android:versionName="2021.12.06.01">
+    android:versionName="2022.01.04.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

BIN
WallPadGlobalScreen/libs/WallPadAPI.jar


+ 1 - 1
WallPadGlobalScreen/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadglobalscreen"
     android:versionCode="17"
-    android:versionName="2021.12.06.01">
+    android:versionName="2022.01.04.01">
 
     <uses-feature android:name="android.hardware.camera" />
 

BIN
WallPadHomeCtrl/libs/WallPadAPI.jar


+ 1 - 1
WallPadHomeCtrl/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadhomectrl"
     android:versionCode="17"
-    android:versionName="2021.12.07.01">
+    android:versionName="2022.01.04.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

BIN
WallPadMain/libs/WallPadAPI.jar


+ 1 - 1
WallPadMain/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadmain"
     android:versionCode="17"
-    android:versionName="2021.12.09.01">
+    android:versionName="2022.01.04.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

BIN
WallPadOutmodeRun/libs/WallPadAPI.jar


+ 1 - 1
WallPadOutmodeRun/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadoutmoderun"
     android:versionCode="1"
-    android:versionName="2021.12.06.01">
+    android:versionName="2022.01.04.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

BIN
WallPadSecurity/libs/WallPadAPI.jar


+ 1 - 1
WallPadSecurity/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="kr.co.icontrols.wallpadsecurity"
     android:versionCode="1"
-    android:versionName="2021.12.06.01">
+    android:versionName="2022.01.04.01">
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>