Quellcode durchsuchen

Merge branch 'master' of https://hub.hdc-smart.com/WallPad/2443-ALT

jglee vor 3 Jahren
Ursprung
Commit
ee67c84aa6

BIN
WallPadAPI/jar/WallPadAPI.jar


BIN
WallPadAPI/jar/WallPadAPIforSVC.jar


BIN
WallPadAPI/libs/WallPadSupport.jar


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

@@ -142,7 +142,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 			else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_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
 					|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
 					|| mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
 					|| mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
-					|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443ALT || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410ALT
+					|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410
 					|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
 					|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
 			{
 			{
 				if (GetData[1].indexOf("현산향일체형조명기본형") > 0) returnData[1] = LIGHT_TYPE_HDC_INTLIGHT_NORMAL;
 				if (GetData[1].indexOf("현산향일체형조명기본형") > 0) returnData[1] = LIGHT_TYPE_HDC_INTLIGHT_NORMAL;
@@ -214,7 +214,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 			}
 			}
 			else {
 			else {
 				if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I
 				if (Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL || Version.getModelType() == Version.MODEL_TYPE.IHN_1010GL_I
-						|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443ALT || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410ALT)
+						|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410)
 					strSettingValue = "1(3:" + define.DEVICE_ID_LIGHT + "(" + define.DEVICE_ENABLE + ")종류(" + strLightingControllerType + ")";
 					strSettingValue = "1(3:" + define.DEVICE_ID_LIGHT + "(" + define.DEVICE_ENABLE + ")종류(" + strLightingControllerType + ")";
 				else strSettingValue = "1(1:" + define.DEVICE_ID_LIGHT + "(" + define.DEVICE_ENABLE + ")종류(" + strLightingControllerType + ")";
 				else strSettingValue = "1(1:" + define.DEVICE_ID_LIGHT + "(" + define.DEVICE_ENABLE + ")종류(" + strLightingControllerType + ")";
 			}
 			}
@@ -263,7 +263,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 		if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
 		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
 				|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
 				|| mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
 				|| mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
-				|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443ALT || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410ALT
+				|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410
 				|| mModelType == Version.MODEL_TYPE.IHN_1020GL
 				|| mModelType == Version.MODEL_TYPE.IHN_1020GL
 				|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
 				|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
 		{
 		{
@@ -293,7 +293,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 			if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
 			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
 					|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
 					|| mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
 					|| mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
-					|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443ALT || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410ALT
+					|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410
 					|| mModelType == Version.MODEL_TYPE.IHN_1020GL
 					|| mModelType == Version.MODEL_TYPE.IHN_1020GL
 					|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
 					|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
 			{
 			{
@@ -1069,7 +1069,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 
 
 				if (mModelType == Version.MODEL_TYPE.IHN_1020GL
 				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_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
-						|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443ALT || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410ALT) {
+						|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410) {
 					UpdateSettingData("subdev_list", "분전반", 0, "1(1:"+"분전반" + "(" + "사용안함" + ")종류(" + "사용안함" + ")");
 					UpdateSettingData("subdev_list", "분전반", 0, "1(1:"+"분전반" + "(" + "사용안함" + ")종류(" + "사용안함" + ")");
 				}
 				}
 				else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
 				else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_I
@@ -3258,7 +3258,7 @@ public class WallpadDeviceSet extends wallpaddbmgr {
 				else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_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
 						|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
 						|| mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
 						|| mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
-						|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443ALT || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410ALT
+						|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410
 						|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
 						|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
 				{
 				{
 					// IGW300 설정
 					// IGW300 설정

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

@@ -2142,7 +2142,7 @@ public class wallpaddbmgr {
                 );
                 );
             }
             }
         }
         }
-        else if (mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443ALT) {
+        else if (mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443) {
             for (int i = 0; i < iHN1010GL_I_2443ALT_DevicesSettingInitData.length; i++) {
             for (int i = 0; i < iHN1010GL_I_2443ALT_DevicesSettingInitData.length; i++) {
                 Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);
                 Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);
                 InsertinitDeviceData("subdev_list"
                 InsertinitDeviceData("subdev_list"
@@ -2161,7 +2161,7 @@ public class wallpaddbmgr {
                 );
                 );
             }
             }
         }
         }
-        else if (mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410ALT) {
+        else if (mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410) {
             for (int i = 0; i < iHN1010GL_I_6410ALT_DevicesSettingInitData.length; i++) {
             for (int i = 0; i < iHN1010GL_I_6410ALT_DevicesSettingInitData.length; i++) {
                 Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);
                 Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);
                 InsertinitDeviceData("subdev_list"
                 InsertinitDeviceData("subdev_list"
@@ -2562,7 +2562,7 @@ public class wallpaddbmgr {
             InsertinitWidgetData(9, define.ICONS.MENUS.CTRL_GAS.getID());   // 가스밸브
             InsertinitWidgetData(9, define.ICONS.MENUS.CTRL_GAS.getID());   // 가스밸브
             InsertinitWidgetData(10, define.ICONS.MENUS.ADD_NOTICE.getID());   // 공지사항
             InsertinitWidgetData(10, define.ICONS.MENUS.ADD_NOTICE.getID());   // 공지사항
         }
         }
-        else if (mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443ALT) {
+        else if (mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443) {
             InsertinitWidgetData(0, define.ICONS.MENUS.MAIN_ELEVATOR.getID());
             InsertinitWidgetData(0, define.ICONS.MENUS.MAIN_ELEVATOR.getID());
             InsertinitWidgetData(1, define.ICONS.MENUS.TALK_FRONT.getID());
             InsertinitWidgetData(1, define.ICONS.MENUS.TALK_FRONT.getID());
             InsertinitWidgetData(2, define.ICONS.MENUS.TALK_GUARD.getID());
             InsertinitWidgetData(2, define.ICONS.MENUS.TALK_GUARD.getID());
@@ -2577,7 +2577,7 @@ public class wallpaddbmgr {
             InsertinitWidgetData(11, define.ICONS.MENUS.SETTING_CONFIG.getID());
             InsertinitWidgetData(11, define.ICONS.MENUS.SETTING_CONFIG.getID());
 
 
         }
         }
-        else if (mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410ALT) {
+        else if (mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410) {
             InsertinitWidgetData(0, define.ICONS.MENUS.MAIN_CALRENDAR.getID());   // 달력/시계
             InsertinitWidgetData(0, define.ICONS.MENUS.MAIN_CALRENDAR.getID());   // 달력/시계
             InsertinitWidgetData(1, define.ICONS.MENUS.MAIN_ELEVATOR.getID());   // 엘리베이터
             InsertinitWidgetData(1, define.ICONS.MENUS.MAIN_ELEVATOR.getID());   // 엘리베이터
             InsertinitWidgetData(2, define.ICONS.MENUS.TALK_GUARD.getID());   // 경비통화
             InsertinitWidgetData(2, define.ICONS.MENUS.TALK_GUARD.getID());   // 경비통화

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

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

+ 5 - 5
WallPadAPI/src/main/java/com/artncore/wallpadapi/WallPadAPI.java

@@ -197,7 +197,7 @@ public class WallPadAPI {
             }
             }
             else if (mModelType == Version.MODEL_TYPE.IHN_1020GL
             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_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
-                    || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443ALT || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410ALT) {
+                    || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410) {
                 // AC 분전반 사용 (AC 조명)
                 // AC 분전반 사용 (AC 조명)
                 if (!Get_HDCIntLightType()) {
                 if (!Get_HDCIntLightType()) {
                     // 0:일괄소등 릴레이
                     // 0:일괄소등 릴레이
@@ -295,7 +295,7 @@ public class WallPadAPI {
             }
             }
             else if (mModelType == Version.MODEL_TYPE.IHN_1020GL
             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_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
-                    || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443ALT || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410ALT) {
+                    || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410) {
                 if (!Get_HDCIntLightType()) {
                 if (!Get_HDCIntLightType()) {
                     // 0:일괄소등 릴레이
                     // 0:일괄소등 릴레이
                     AllLightHDCAPI allLightHDCAPI = Get_AllLightHDCController();
                     AllLightHDCAPI allLightHDCAPI = Get_AllLightHDCController();
@@ -444,7 +444,7 @@ public class WallPadAPI {
                 else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_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
                         || mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
                         || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
                         || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
-                        || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443ALT || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410ALT
+                        || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410
                         || mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
                         || mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
                 {
                 {
                     IGW300API iGW300API = null;
                     IGW300API iGW300API = null;
@@ -558,7 +558,7 @@ public class WallPadAPI {
                 else if (mModelType == Version.MODEL_TYPE.IHN_D101 || mModelType == Version.MODEL_TYPE.IHN_D101_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
                         || mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
                         || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
                         || mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
-                        || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443ALT || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410ALT
+                        || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410
                         || mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
                         || mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF)
                 {
                 {
                     IGW300API iGW300API = null;
                     IGW300API iGW300API = null;
@@ -1497,7 +1497,7 @@ public class WallPadAPI {
         // 1. ModelType Check
         // 1. ModelType Check
         if ((mModelType != Version.MODEL_TYPE.IHN_1020GL)
         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_1010GL) && (mModelType != Version.MODEL_TYPE.IHN_1010GL_I)
-                && (mModelType != Version.MODEL_TYPE.IHN_1010GL_I_2443ALT) && (mModelType != Version.MODEL_TYPE.IHN_1010GL_I_6410ALT)) {
+                && (mModelType != Version.MODEL_TYPE.IHN_1010GL_I_2443) && (mModelType != Version.MODEL_TYPE.IHN_1010GL_I_6410)) {
             Log.w("WallPadAPI", "[SetAutoIGALStatusClear] Not Support ModelType : " + mModelType);
             Log.w("WallPadAPI", "[SetAutoIGALStatusClear] Not Support ModelType : " + mModelType);
             return -1;
             return -1;
         }
         }