|
@@ -199,7 +199,18 @@ public class WallPadAPI {
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410) {
|
|
|
// AC 분전반 사용 (AC 조명)
|
|
|
- if (!Get_HDCIntLightType()) {
|
|
|
+ WallpadDeviceSet devSet = new WallpadDeviceSet(mContext);
|
|
|
+ int[] batchinfo = devSet.Get_BatchSW_Info();
|
|
|
+ devSet.closeDB();
|
|
|
+ //DB에 현산향제일전기일괄소등제어기 되어 있으면 2세대 전용 일괄소등임(제일전기)
|
|
|
+ if(batchinfo!=null && batchinfo.length > 2 && batchinfo[1]== WallpadDeviceSet.BATCH_TYPE_HDC_ALLLIGHT)
|
|
|
+ {
|
|
|
+ AllLightHDCAPI allLightHDCAPI = Get_AllLightHDCController();
|
|
|
+ if (allLightHDCAPI == null) return -1;
|
|
|
+ int ret = allLightHDCAPI.AllLightControl(onoff);
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+ else if (!Get_HDCIntLightType()) {
|
|
|
// 0:일괄소등 릴레이
|
|
|
AllLightHDCAPI allLightHDCAPI = Get_AllLightHDCController();
|
|
|
if (allLightHDCAPI == null) return -1;
|
|
@@ -296,7 +307,20 @@ public class WallPadAPI {
|
|
|
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_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410) {
|
|
|
- if (!Get_HDCIntLightType()) {
|
|
|
+
|
|
|
+
|
|
|
+ WallpadDeviceSet devSet = new WallpadDeviceSet(mContext);
|
|
|
+ int[] batchinfo = devSet.Get_BatchSW_Info();
|
|
|
+ devSet.closeDB();
|
|
|
+ //DB에 현산향제일전기일괄소등제어기 되어 있으면 2세대 전용 일괄소등임(제일전기)
|
|
|
+ if(batchinfo!=null && batchinfo.length > 2 && batchinfo[1]== WallpadDeviceSet.BATCH_TYPE_HDC_ALLLIGHT)
|
|
|
+ {
|
|
|
+ AllLightHDCAPI allLightHDCAPI = Get_AllLightHDCController();
|
|
|
+ if (allLightHDCAPI == null) return -1;
|
|
|
+ if (allLightHDCAPI.data.AllLightStatus) ret = 1;
|
|
|
+ else ret = 0;
|
|
|
+ }
|
|
|
+ else if (!Get_HDCIntLightType()) {
|
|
|
// 0:일괄소등 릴레이
|
|
|
AllLightHDCAPI allLightHDCAPI = Get_AllLightHDCController();
|
|
|
if (allLightHDCAPI == null) return -1;
|