Просмотр исходного кода

[WallPadDevService]
1. App Ver. 갱신
- 2021.06.04.01
2. 로그 출력 옵션 변경
- 모든 디바이스 드라이버에 로그, 시리얼통신 로그 출력 옵션을 false로 설정함
3. 최신 WallPadPI 적용
- API Ver.: 2021.06.04.01

[WallPadAPI]
1. API Ver. 갱신
- 2021.06.04.01
2. IHN-1010GL-I-2443 기본설정 변경
- 스마트스위치: 사용안함
- 안심통화: 사용안함

cwnam@hdc-icontrols.com 3 лет назад
Родитель
Сommit
4e8527a138
35 измененных файлов с 68 добавлено и 45 удалено
  1. BIN
      WallPadDevService/libs/WallPadAPIforSVC.jar
  2. 1 1
      WallPadDevService/src/main/AndroidManifest.xml
  3. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/AllLightHDC_Controller.java
  4. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/AllLight_Controller.java
  5. 2 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/BioRecognition_Controller.java
  6. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/CookTopFinder_Controller.java
  7. 4 6
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/CurtainV1_Controller.java
  8. 2 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/CutOffConcent_Controller.java
  9. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/DLock_Controller.java
  10. 1 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/DeviceManager.java
  11. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/ElectricRange_Controller.java
  12. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/EnergyMeter_Controller.java
  13. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/EnergyModule_Controller.java
  14. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/FP_DLock_Controller.java
  15. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/GasValve_Controller.java
  16. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingFinder_Controller.java
  17. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingV1_Controller.java
  18. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/HeatingV2_Controller.java
  19. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/IGW200D_Controller.java
  20. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/IGW300_Controller.java
  21. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/InRoomDetectSensor_Controller.java
  22. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/IntLight_Controller.java
  23. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/InterlayerNoise_Controller.java
  24. 2 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/KNX_Controller.java
  25. 2 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/KNX_LivingRoomLight_Controller.java
  26. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Knx_Ventilation_Controller.java
  27. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/LedDimming_Controller_KCC.java
  28. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Louver_Controller.java
  29. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/PhoneNRemocon.java
  30. 2 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Purity_Controller.java
  31. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/RealTimeMeter_Controller.java
  32. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/RfDoorCam_Controller.java
  33. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/Sample_Controller.java
  34. 2 1
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/SmartSwitchEvt_Controller.java
  35. 2 2
      WallPadDevService/src/main/java/com/artncore/wallpaddevservice/driver/SmartSwitchPol_Controller.java

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.06.01.01">
+    android:versionName="2021.06.04.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

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

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

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

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

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

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

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

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

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

@@ -116,14 +116,12 @@ public class CurtainV1_Controller extends DeviceManager {
      * 생성자
      */
     public CurtainV1_Controller(boolean isRoom) {
-        if(isRoom)
-            DEVICE_ADDRESS = (byte)0x90;
-        else
-            DEVICE_ADDRESS = (byte)0x80;
+        if (isRoom) DEVICE_ADDRESS = (byte)0x90;
+        else DEVICE_ADDRESS = (byte)0x80;
 
         /* 로그 초기상태 */
-        log_sw = true;
-        SerialLog = true;
+//        log_sw = true;
+//        SerialLog = true;
 
         /* 드라이버 내부 변수 초기화 */
         mDriver = new Driver();

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

@@ -82,8 +82,8 @@ public class CutOffConcent_Controller extends DeviceManager
     public CutOffConcent_Controller()
     {
         // 1. 로그
-        log_sw = true;
-        SerialLog = true;
+//        log_sw = true;
+//        SerialLog = true;
 
         // 2. 드라이버 내부 변수
         mDriver = new Driver();

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

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

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

@@ -83,7 +83,7 @@ public class DeviceManager extends Thread
 
 	public boolean      Doing = false;
 
-	public boolean      SerialLog = true;
+	public boolean      SerialLog = false;
 
 	//for test or business sample
 	static boolean 		virtualmode = true;

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

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

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

@@ -372,7 +372,8 @@ public class EnergyMeter_Controller extends DeviceManager
     public EnergyMeter_Controller()
     {
         // 1. 로그
-        log_sw = false;
+//        log_sw = true;
+//        SerialLog = true;
 
         // 2. 드라이버 내부 변수
         mDriver = new Driver();

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

@@ -82,7 +82,8 @@ public class EnergyModule_Controller extends DeviceManager
     public EnergyModule_Controller()
     {
         // 1. 로그
-        log_sw = false;
+//        log_sw = true;
+//        SerialLog = true;
 
         // 2. 드라이버 내부 변수
         mDriver = new Driver();

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

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

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

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

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

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

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

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

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

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

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

@@ -835,7 +835,8 @@ public class IGW200D_Controller extends DeviceManager
      */
     public IGW200D_Controller()
     {
-        log_sw = false;
+//        log_sw = true;
+//        SerialLog = true;
 
         super.CommDataGeneration(1);
 

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

@@ -919,7 +919,8 @@ public class IGW300_Controller extends DeviceManager
      */
     public IGW300_Controller()
     {
-        log_sw = true;//false;
+//        log_sw = true;
+//        SerialLog = true;
 
         super.CommDataGeneration(1);
 

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

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

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

@@ -186,7 +186,8 @@ public class IntLight_Controller extends DeviceManager
 
 	public IntLight_Controller()
 	{
-		log_sw = false;
+//        log_sw = true;
+//        SerialLog = true;
 
 		super.CommDataGeneration(1);
 

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

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

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

@@ -944,8 +944,8 @@ public class KNX_Controller extends DeviceManager {
         Log.i(TAG, "[KNX_Controller] Create !!!");
 
         /** 로그 초기상태 */
-        //log_sw = true;
-        //SerialLog = true;
+//        log_sw = true;
+//        SerialLog = true;
 
         /** 통신성공률 변수 초기화 */
         super.CommDataGeneration(1);

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

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

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

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

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

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

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

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

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

@@ -569,7 +569,8 @@ public class PhoneNRemocon extends DeviceManager {
     DriverInterOpAPI DriverAPI;
     public PhoneNRemocon()
     {
-        log_sw = false;
+//        log_sw = true;
+//        SerialLog = true;
 
         mSubCallEventReceiver = new SubCallEventReceiver();
 

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

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

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

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

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

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

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

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

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

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

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

@@ -673,8 +673,8 @@ public class SmartSwitchPol_Controller extends DeviceManager
      */
     public SmartSwitchPol_Controller() {
         /** 로그 초기상태 */
-        log_sw = true;
-        SerialLog = true;
+//        log_sw = true;
+//        SerialLog = true;
 
         /** 모델정보 가져오기 */
         mModelType = Version.getModelType();