|
@@ -149,7 +149,7 @@ public class wallpaddbmgr {
|
|
{"1", "1", define.DEVICE_ID_MOOD_LIGHT, define.DEVICE_DISABLE, "종류(하단등)"}, //17.11.02 사용안함으로 변경(현정배CJ 요청)
|
|
{"1", "1", define.DEVICE_ID_MOOD_LIGHT, define.DEVICE_DISABLE, "종류(하단등)"}, //17.11.02 사용안함으로 변경(현정배CJ 요청)
|
|
|
|
|
|
{"1", "1", define.DEVICE_ID_PARKING, define.DEVICE_DISABLE, "종류(아이콘트롤스)IP(10.0.1.10:10000)"},
|
|
{"1", "1", define.DEVICE_ID_PARKING, define.DEVICE_DISABLE, "종류(아이콘트롤스)IP(10.0.1.10:10000)"},
|
|
- {"1", "1", define.DEVICE_ID_ELECTRIC_CAR, define.DEVICE_DISABLE, "IP(10.0.1.1:10000)"},
|
|
|
|
|
|
+ {"1", "1", define.DEVICE_ID_ELECTRIC_CAR, define.DEVICE_ENABLE, "IP(10.0.1.1:10000)"},
|
|
{"1", "1", define.DEVICE_ID_ENERGY_SERVER_CONNECT, define.DEVICE_DISABLE, "IP(10.0.1.1:10000)검침일사용자설정(사용안함)"},
|
|
{"1", "1", define.DEVICE_ID_ENERGY_SERVER_CONNECT, define.DEVICE_DISABLE, "IP(10.0.1.1:10000)검침일사용자설정(사용안함)"},
|
|
{"1", "1", define.DEVICE_ID_BLE_SMARTKEY, define.DEVICE_DISABLE, ""},
|
|
{"1", "1", define.DEVICE_ID_BLE_SMARTKEY, define.DEVICE_DISABLE, ""},
|
|
{"1", "1", define.DEVICE_ID_SUBPHONE_BAUDRATE, define.DEVICE_ENABLE, "종류(9600)"},
|
|
{"1", "1", define.DEVICE_ID_SUBPHONE_BAUDRATE, define.DEVICE_ENABLE, "종류(9600)"},
|
|
@@ -160,7 +160,9 @@ public class wallpaddbmgr {
|
|
{"1", "1", define.DEVICE_ID_GATEWAY_MODEL_KIND, define.DEVICE_ENABLE, "종류(IGW300)"},
|
|
{"1", "1", define.DEVICE_ID_GATEWAY_MODEL_KIND, define.DEVICE_ENABLE, "종류(IGW300)"},
|
|
{"1", "1", define.DEVICE_ID_ESCAPELADDER_DOWN_SEND, define.DEVICE_ENABLE, "종류(윗집)"},
|
|
{"1", "1", define.DEVICE_ID_ESCAPELADDER_DOWN_SEND, define.DEVICE_ENABLE, "종류(윗집)"},
|
|
{"1", "1", define.DEVICE_ID_MOBILEAPP_AUTH_USE, define.DEVICE_ENABLE, ""},
|
|
{"1", "1", define.DEVICE_ID_MOBILEAPP_AUTH_USE, define.DEVICE_ENABLE, ""},
|
|
- {"1", "1", define.DEVICE_ID_DISTRIBUTION_KIND, define.DEVICE_ENABLE, "종류(스마트분전반)"},
|
|
|
|
|
|
+ {"1", "1", define.DEVICE_ID_DISTRIBUTION_KIND, define.DEVICE_ENABLE, "종류(KNX분전반)"},
|
|
|
|
+ {"1", "1", define.DEVICE_ID_CONCENT, define.DEVICE_DISABLE, ""},
|
|
|
|
+ {"1", "1", define.DEVICE_ID_CONCENT, define.DEVICE_DISABLE, ""},
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
@@ -2600,8 +2602,7 @@ public class wallpaddbmgr {
|
|
* **/
|
|
* **/
|
|
public void initWidgetData() {
|
|
public void initWidgetData() {
|
|
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) {
|
|
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());
|
|
@@ -2614,8 +2615,6 @@ public class wallpaddbmgr {
|
|
InsertinitWidgetData(9, define.ICONS.MENUS.SECURITY_SETARMED.getID());
|
|
InsertinitWidgetData(9, define.ICONS.MENUS.SECURITY_SETARMED.getID());
|
|
InsertinitWidgetData(10, define.ICONS.MENUS.ADD_CCTV.getID());
|
|
InsertinitWidgetData(10, define.ICONS.MENUS.ADD_CCTV.getID());
|
|
InsertinitWidgetData(11, define.ICONS.MENUS.SETTING_CONFIG.getID());
|
|
InsertinitWidgetData(11, define.ICONS.MENUS.SETTING_CONFIG.getID());
|
|
-
|
|
|
|
-
|
|
|
|
}
|
|
}
|
|
else if(mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2 || mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF){
|
|
else if(mModelType == Version.MODEL_TYPE.IHN_D101_I_LX2 || mModelType == Version.MODEL_TYPE.IHN_D101_I_OCF){
|
|
InsertinitWidgetData(0, define.ICONS.MENUS.TALK_NEIGHBOR.getID());
|
|
InsertinitWidgetData(0, define.ICONS.MENUS.TALK_NEIGHBOR.getID());
|