瀏覽代碼

[WallPadDevService]
1. App Ver. 갱신
- 2021.12.13.01
2. 현산향일괄소등제어기 대응기능 추가
- 드라이버 로딩기능 추가
2. 최신 WallPadAPI 적용
- API Ver.: 2021.12.13.01

[WallPadAPI]
1. App Ver. 갱신
- 2021.12.13.01
2. 현산향 일괄소등 제어기 대응 기능 추가
- 일괄소등 기본설정을 '현산향일괄소등제어기'로 설정

Changwoo Nam 4 年之前
父節點
當前提交
b8efc5e939

二進制
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="2021.12.13.01">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

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

@@ -981,8 +981,8 @@ public class ServiceMain extends Service {
 					///////////////////////////////////////////
 
 					// 0. 로딩여부 판단
-					if(mModelType != Version.MODEL_TYPE.IHN_1020GL) return;
-					if(Get_HDCIntLightType()) return;
+					int [] Get_BatchSW_Info = ServiceMain.dataBaseLoader.data.wallpadDeviceSet.Get_BatchSW_Info;
+					if (Get_BatchSW_Info[0] == WallpadDeviceSet.DO_NOT_USE || Get_BatchSW_Info[1] != WallpadDeviceSet.BATCH_TYPE_HDC_BATCHSWITCH) return;
 
 					// 1. Class 생성
 					allLightHDC_Controller = new AllLightHDC_Controller();
@@ -2222,7 +2222,8 @@ public class ServiceMain extends Service {
 						"</portmap>   <drivermap> " +
 
 						// COM2 - Ctrl_Module1 EtcLivingLight_Controller
-						"<driver name = \"BatchLight_Driver\"             module =\"Ctrl_Module1\"              startaddr = \"0x11\"    endaddr = \"0x11\"    option = \"null\"  />"+
+						"<driver name = \"AllLightHDC_Driver\"            module =\"Ctrl_Module1\"               startaddr = \"0x11\"    endaddr = \"0x11\"    option = \"null\"  />"+
+//						"<driver name = \"BatchLight_Driver\"             module =\"Ctrl_Module1\"              startaddr = \"0x11\"    endaddr = \"0x11\"    option = \"null\"  />"+
 						"<driver name = \"Light_Driver\"                  module =\"Ctrl_Module1\"              startaddr = \"0x11\"    endaddr = \"0x12\"    option = \"null\"  />"+
 						"<driver name = \"EtcLivingLight_Controller\"     module =\"Ctrl_Module1\"              startaddr = \"0x16\"    endaddr = \"0x16\"    option = \"null\"  />"+
 						"<driver name = \"Ventilation_Driver\"            module =\"Ctrl_Module1\"              startaddr = \"0x61\"    endaddr = \"0x68\"    option = \"null\"  />"+

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

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