浏览代码

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

Changwoo Nam 4 年之前
父节点
当前提交
fd98152daa

二进制
WallPadAPI/jar/WallPadAPI.jar


二进制
WallPadAPI/jar/WallPadAPIforSVC.jar


+ 8 - 5
WallPadAPI/src/main/java/com/artncore/WallPadDataMgr/WallpadDeviceSet.java

@@ -199,10 +199,11 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 
 
 
-	public static final int BATCH_TYPE_GENERAL       = 21; //대외향일괄소등제어기 + 3로조명확장스위치 (id 검색하여 해당 드라이버 로딩)
-	public static final int BATCH_TYPE_SMART         = 22; //대외향스마트스위치 - iSS-201
-	public static final int BATCH_TYPE_HDC_OLD_SMART = 25; //현산향스마트스위치 - iSS-101
-	public static final int BATCH_TYPE_HDC_LCD_SMART = 26; //현산향스마트스위치 - iSS-430
+	public static final int BATCH_TYPE_GENERAL       = 21;   // 대외향일괄소등제어기 + 3로조명확장스위치 (id 검색하여 해당 드라이버 로딩)
+	public static final int BATCH_TYPE_SMART         = 22;   // 대외향스마트스위치 - iSS-201
+	public static final int BATCH_TYPE_HDC_OLD_SMART = 25;   // 현산향스마트스위치 - iSS-101
+	public static final int BATCH_TYPE_HDC_LCD_SMART = 26;   // 현산향스마트스위치 - iSS-430
+	public static final int BATCH_TYPE_HDC_BATCHSWITCH = 27;   // 현산향일괄소등제어기
 
 	/**
 	 * @description
@@ -212,7 +213,8 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 	 * BATCH_TYPE_GENERAL:        대외향일괄소등제어기 <br>
 	 * BATCH_TYPE_SMART:          대외향스마트스위치(iSS-201)<br>
 	 * BATCH_TYPE_HDC_OLD_SMART:  현산향스마트스위치(iSS-101)<br>
-	 *  BATCH_TYPE_HDC_LCD_SMART: 현산향스마트스위치(iSS-430)<br>
+	 * BATCH_TYPE_HDC_LCD_SMART: 현산향스마트스위치(iSS-430)<br>
+	 * BATCH_TYPE_HDC_BATCHSWITCH: 현산향일괄소등제어기<br>
 	 * int[2] - L1설정 <br>
 	 * int[3] - L2설정
 	 */
@@ -265,6 +267,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 				if (GetData[1].indexOf("대외향스마트스위치") > 0) returnData[1] = BATCH_TYPE_SMART;
 				else if (GetData[1].indexOf("대외향일괄소등제어기") > 0) returnData[1] = BATCH_TYPE_GENERAL;
 				else if (GetData[1].indexOf("현산향스마트스위치") > 0) returnData[1] = BATCH_TYPE_HDC_OLD_SMART;
+				else if (GetData[1].indexOf("현산향일괄소등제어기") > 0) returnData[1] = BATCH_TYPE_HDC_BATCHSWITCH;
 				else {
 					returnData[0] = 0;
 					return returnData;

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

@@ -192,7 +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, ""},
@@ -200,7 +200,7 @@ public class wallpaddbmgr {
             {"1", "4", define.DEVICE_ID_THERMO, define.DEVICE_ENABLE, ""},
             {"1", "3", define.DEVICE_ID_LIGHT, define.DEVICE_ENABLE, "종류(대외기본형)"},
             {"1", "5", define.DEVICE_ID_REALTIMEMETER, define.DEVICE_DISABLE, ""},
-            {"1", "1", define.DEVICE_ID_BATCHLIGHT, define.DEVICE_ENABLE, "종류(대외향일괄소등제어기)L1설정(3)L2설정(4)"},
+            {"1", "1", define.DEVICE_ID_BATCHLIGHT, define.DEVICE_ENABLE, "종류(현산향일괄소등제어기)L1설정(3)L2설정(4)"},
             {"1", "1", define.DEVICE_ID_REMOTECON, define.DEVICE_DISABLE, ""},
             {"1", "1", define.DEVICE_ID_DOORCAM, define.DEVICE_ENABLE, "종류(기본)"},
             {"1", "1", define.DEVICE_ID_VENTIL, define.DEVICE_DISABLE, ""},
@@ -2023,20 +2023,20 @@ public class wallpaddbmgr {
         }
         else if (mModelType == Version.MODEL_TYPE.IHN_1010_I_ALT)
         {
-            for (int i = 0; i < iHN1000_DevicesSettingInitData.length; i++) {
+            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]+
                                 ")"
                 );
             }

+ 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 = "2021.12.13.01";
 	///////////////////////////////////////////////////////////////////////
 	// WallPadDevService 의 각 드라이버와 통신을 위한 드라이버 이름을 정의합니다.
 	///////////////////////////////////////////////////////////////////////

+ 4 - 6
WallPadAPI/src/main/java/com/artncore/wallpadapi/WallPadAPI.java

@@ -155,7 +155,6 @@ public class WallPadAPI {
                 WallpadDeviceSet wds = new WallpadDeviceSet(mContext);
                 int nDPType = wds.Get_DistributionPannelType_Info();
                 wds.closeDB();
-                Log.d(TAG, "[SetBatchSwitchStatus] nDPType [" + nDPType + "]");
 
                 int ret = -1;
                 if (nDPType == Version.DISTRIBUTION_MODEL.SMART_DIST) {
@@ -179,8 +178,8 @@ public class WallPadAPI {
 
                 return ret;
             }
-            else if (mModelType == Version.MODEL_TYPE.IHN_1020GL
-                    || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I) {
+            else if (mModelType == Version.MODEL_TYPE.IHN_1020GL || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
+                    || mModelType == Version.MODEL_TYPE.IHN_1010_I_ALT) {
                 // AC 분전반 사용 (AC 조명)
                 if (!Get_HDCIntLightType()) {
                     // 0:일괄소등 릴레이
@@ -237,7 +236,6 @@ public class WallPadAPI {
                 WallpadDeviceSet wds = new WallpadDeviceSet(mContext);
                 int nDPType = wds.Get_DistributionPannelType_Info();
                 wds.closeDB();
-                Log.d(TAG, "[GetBatchSwitchStatus] nDPType [" + nDPType + "]");
 
                 if (nDPType == Version.DISTRIBUTION_MODEL.SMART_DIST) {
                     // 스마트 분전반
@@ -270,8 +268,8 @@ public class WallPadAPI {
                     else return 1;
                 }
             }
-            else if (mModelType == Version.MODEL_TYPE.IHN_1020GL
-                    || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I) {
+            else if (mModelType == Version.MODEL_TYPE.IHN_1020GL || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
+                    || mModelType == Version.MODEL_TYPE.IHN_1010_I_ALT) {
                 if (!Get_HDCIntLightType()) {
                     // 0:일괄소등 릴레이
                     AllLightHDCAPI allLightHDCAPI = Get_AllLightHDCController();