|
|
@@ -192,8 +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, ""},
|
|
|
{"1", "1", define.DEVICE_ID_DOORLOCK, define.DEVICE_ENABLE, "종류(무선)"},
|
|
|
@@ -206,7 +205,6 @@ public class wallpaddbmgr {
|
|
|
{"1", "1", define.DEVICE_ID_VENTIL, define.DEVICE_DISABLE, ""},
|
|
|
{"1", "1", define.DEVICE_ID_INTERLAYER_NOISE_SENSOR, define.DEVICE_DISABLE, ""},
|
|
|
{"1", "1", define.DEVICE_ID_SENSOR_AP, define.DEVICE_DISABLE, ""},
|
|
|
-
|
|
|
{"1", "1", define.DEVICE_ID_ENERGY_DEVICES, define.DEVICE_DISABLE, ""},
|
|
|
{"1", "1", define.DEVICE_ID_IPARKENERGY, define.DEVICE_DISABLE, ""},
|
|
|
{"1", "1", define.DEVICE_ID_IDLE_POWER_SAVING_SWITCH, define.DEVICE_DISABLE, ""},
|
|
|
@@ -215,16 +213,13 @@ public class wallpaddbmgr {
|
|
|
{"1", "1", define.DEVICE_ID_SENSOR, define.DEVICE_DISABLE, "외부동체사용(사용안함)내부동체사용(사용안함)외부동체를내부동체로사용(사용안함))"},
|
|
|
{"1", "1", define.DEVICE_ID_WALLPAD_CAMERA, define.DEVICE_DISABLE, ""},
|
|
|
{"1", "1", define.DEVICE_ID_GUARDCALL_VIDEO_ON, define.DEVICE_DISABLE, ""},
|
|
|
-
|
|
|
{"1", "1", define.DEVICE_ID_EMERGENGY_LEDDER, define.DEVICE_DISABLE, ""},
|
|
|
-
|
|
|
- //{"1", "1", define.DEVICE_ID_MOOD_LIGHT, define.DEVICE_DISABLE, "종류(하단등)"},
|
|
|
-
|
|
|
{"1", "1", define.DEVICE_ID_PARKING, define.DEVICE_DISABLE, "종류(아이콘트롤스)IP(10.0.1.10:10000)"},
|
|
|
{"1", "1", define.DEVICE_ID_ENERGY_SERVER_CONNECT, define.DEVICE_DISABLE, "IP(10.0.1.1:10000)검침일사용자설정(사용안함)"},
|
|
|
{"1", "1", define.DEVICE_ID_MAIN_GUI_SELECT, define.DEVICE_ENABLE, "종류(기본)"},
|
|
|
{"1", "1", define.DEVICE_ID_ESCAPELADDER_DOWN_RECV, define.DEVICE_DISABLE, ""},
|
|
|
{"1", "1", define.DEVICE_ID_DISTRIBUTION_KIND, define.DEVICE_DISABLE, "종류(사용안함)"},
|
|
|
+ {"1", "1", define.DEVICE_ID_LCDKEEPER, define.DEVICE_ENABLE, "종류(보호/복구모드)"},
|
|
|
};
|
|
|
|
|
|
// 첫번째 - 기기개수(기본 1로 입력), 두번째 - 회로수(방개수 등), 세번째 - 디바이스 이름, 네번째 - 사용여부, 다섯번째 - 기타정보
|
|
|
@@ -1938,10 +1933,7 @@ public class wallpaddbmgr {
|
|
|
);
|
|
|
}
|
|
|
}
|
|
|
- else if (mModelType == Version.MODEL_TYPE.IHN_1020B_A
|
|
|
- || mModelType == Version.MODEL_TYPE.IHN_1030_D
|
|
|
- || mModelType == Version.MODEL_TYPE.IHN_1020B_C)
|
|
|
- {
|
|
|
+ else if (mModelType == Version.MODEL_TYPE.IHN_1020B_A || mModelType == Version.MODEL_TYPE.IHN_1030_D || mModelType == Version.MODEL_TYPE.IHN_1020B_C) {
|
|
|
for (int i = 0; i < iHN1020B_A_DevicesSettingInitData.length; i++) {
|
|
|
Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);
|
|
|
InsertinitDeviceData("subdev_list"
|
|
|
@@ -1960,15 +1952,13 @@ public class wallpaddbmgr {
|
|
|
);
|
|
|
}
|
|
|
}
|
|
|
- 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)
|
|
|
- {
|
|
|
+ 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) {
|
|
|
for (int i = 0; i < iHND101_DevicesSettingInitData.length; i++) {
|
|
|
Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);
|
|
|
if ((iHND101_DevicesSettingInitData[i][2].endsWith(define.DEVICE_ID_KITCHEN_TV_PSTN_CALL) == true)
|
|
|
|| (iHND101_DevicesSettingInitData[i][2].endsWith(define.DEVICE_ID_BATH_TV_PSTN_CALL) == true)
|
|
|
- || (iHND101_DevicesSettingInitData[i][2].endsWith(define.DEVICE_ID_BATH_PSTN_CALL) == true))
|
|
|
- { //욕실폰, 욕실TV, 주방TV 국선전화 연동 시 "1(1:국선(사용함))" 으로 저장하기 위함.
|
|
|
+ || (iHND101_DevicesSettingInitData[i][2].endsWith(define.DEVICE_ID_BATH_PSTN_CALL) == true)) {
|
|
|
+ //욕실폰, 욕실TV, 주방TV 국선전화 연동 시 "1(1:국선(사용함))" 으로 저장하기 위함.
|
|
|
InsertinitDeviceData("subdev_list"
|
|
|
, iHND101_DevicesSettingInitData[i][2]
|
|
|
, 0
|
|
|
@@ -2021,27 +2011,25 @@ public class wallpaddbmgr {
|
|
|
);
|
|
|
}
|
|
|
}
|
|
|
- else if (mModelType == Version.MODEL_TYPE.IHN_1010_I_ALT)
|
|
|
- {
|
|
|
- for (int i = 0; i < iHN1000_DevicesSettingInitData.length; i++) {
|
|
|
+ else if (mModelType == Version.MODEL_TYPE.IHN_1010_I_ALT) {
|
|
|
+ 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]+
|
|
|
")"
|
|
|
);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
else if (mModelType == Version.MODEL_TYPE.IHN_1010GL || mModelType == Version.MODEL_TYPE.IHN_1010GL_I) {
|
|
|
for (int i = 0; i < iHN1010GL_DevicesSettingInitData.length; i++) {
|
|
|
Log.d(TAG, mModelType+"_DevicesSettingInitData! "+i);
|