|
@@ -619,7 +619,7 @@ public class DriverInterOpAPI {
|
|
|
IGW_Controller = ServiceMain.iGW200D_Controller;
|
|
|
Driver_Title = define.DRIVER_TITLE_IGW200D;
|
|
|
}
|
|
|
- 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_D101_I_LX2
|
|
|
|| 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_I_2443 || mModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410
|
|
@@ -764,7 +764,7 @@ public class DriverInterOpAPI {
|
|
|
*/
|
|
|
public int setAllLight(boolean OnOff) {
|
|
|
try {
|
|
|
- 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_D101_I_LX2
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
|
|
|
int onoff = 0;
|
|
@@ -861,7 +861,7 @@ public class DriverInterOpAPI {
|
|
|
*/
|
|
|
public boolean getAllLight() {
|
|
|
try {
|
|
|
- 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_D101_I_LX2
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
|
|
|
//Log.i(TAG, "[getAllLight] - IHN_D101");
|
|
@@ -966,7 +966,7 @@ public class DriverInterOpAPI {
|
|
|
try {
|
|
|
String DriverTitleStr = null;
|
|
|
|
|
|
- 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_D101_I_LX2
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
|
|
|
//DriverTitleStr = define.DRIVER_TITLE_SDB_LIVINGROOM_LIGHT;
|
|
@@ -1059,7 +1059,7 @@ public class DriverInterOpAPI {
|
|
|
}
|
|
|
|
|
|
try {
|
|
|
- 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_D101_I_LX2
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
|
|
|
// 스마트분전반 - 거실에너지미터 조명 제어
|
|
@@ -1252,7 +1252,7 @@ public class DriverInterOpAPI {
|
|
|
*/
|
|
|
public boolean getLight(byte index) {
|
|
|
try {
|
|
|
- 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_D101_I_LX2
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
|
|
|
WallpadDeviceSet wds = new WallpadDeviceSet(ServiceMain.svcContext);
|
|
@@ -1482,7 +1482,7 @@ public class DriverInterOpAPI {
|
|
|
*/
|
|
|
public int setSdbAllLightControl(boolean OnOff, byte Dimming, byte Color, boolean ColorControl) {
|
|
|
try {
|
|
|
- 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_D101_I
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
|
|
|
DeviceLog(null ,"setSdbAllLightControl(OnOff:" + OnOff + ", Dimming:" + Dimming + ", Color:" + Color + ", ColorControl:" + ColorControl + ")");
|
|
@@ -1521,7 +1521,7 @@ public class DriverInterOpAPI {
|
|
|
*/
|
|
|
public int setSdbEachRoomLightOnOffControl(byte RoomIndex, boolean OnOff) {
|
|
|
try {
|
|
|
- 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_D101_I_LX2
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
|
|
|
DeviceLog(null ,"D101 - setSdbEachRoomLightControl - Start");
|
|
@@ -1574,7 +1574,7 @@ public class DriverInterOpAPI {
|
|
|
*/
|
|
|
public int setSdbEachRoomDimControl(byte RoomIndex, byte LightIndex, byte DimLevel) {
|
|
|
try {
|
|
|
- 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_D101_I_LX2
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
|
|
|
DeviceLog(null ,"D101 - setSdbEachRoomDimControl - Start");
|
|
@@ -1627,7 +1627,7 @@ public class DriverInterOpAPI {
|
|
|
*/
|
|
|
public int setRealTimeMeterElecAccSave() {
|
|
|
try {
|
|
|
- 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_D101_I_LX2
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101K || mModelType == Version.MODEL_TYPE.IHN_D101K_I
|
|
|
|| mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF) {
|
|
|
DeviceLog(null ,"setRealTimeMeterElecAccSave()");
|