|
@@ -24,7 +24,7 @@ public final class THINGS_INFO {
|
|
|
LIGHT_DIMMER("dimming","{\"capabilities\" : [ { \"name\" : \"Power\" }, { \"name\" : \"Brightness\" } ]}"),
|
|
|
COLOR_LIGHT("colorLight", "{\"capabilities\" : [ { \"name\" : \"Power\" }, { \"name\" : \"ColorMode\"}, { \"name\" : \"ColorTemperature\"} ]}"),
|
|
|
COLOR_LIGHT_DIMMER("colorDimming", "{\"capabilities\" : [ { \"name\" : \"Power\" }, { \"name\" : \"Brightness\" }, { \"name\" : \"ColorMode\"}, { \"name\" : \"ColorTemperature\", \"attributes\" : { \"colorTemperature\": { \"min\":3000, \"max\":5700 } } } ]}"),
|
|
|
- TEMPER("temper", "{\"capabilities\" : [ { \"name\" : \"Power\" }, { \"name\" : \"Temperature\" }, { \"name\" : \"TemperatureSetpoint\" , \"attributes\" : { \"targetSetpoint\": { \"min\":20, \"max\":30 } } } ]}"),
|
|
|
+ TEMPER("temper", "{\"capabilities\" : [ { \"name\" : \"Power\" }, { \"name\" : \"Temperature\" }, { \"name\" : \"TemperatureSetpoint\" , \"attributes\" : { \"targetSetpoint\": { \"min\":8, \"max\":40 } } } ]}"),
|
|
|
VENTIL("ventil","{\"capabilities\" : [ { \"name\" : \"Power\" }, { \"name\" : \"AirFlow\" } ]}"),
|
|
|
GAS("gas","{\"capabilities\" : [ { \"name\" : \"Lock\" } ] }"),
|
|
|
ELEVATOR("elevator", "{\"capabilities\" : [ { \"name\" : \"ElevatorCall\" } ] }"),
|
|
@@ -52,62 +52,63 @@ public final class THINGS_INFO {
|
|
|
}
|
|
|
|
|
|
public enum DEVICE_DETAIL{
|
|
|
- LIVINGLIGHT ("livinglight", "Light", "거실조명"),
|
|
|
- LIGHT01 ("light01", "Light", "주방조명"),
|
|
|
- LIGHT02 ("light02", "Light", "방1조명"),
|
|
|
- LIGHT03 ("light03", "Light", "방2조명"),
|
|
|
- LIGHT04 ("light04", "Light", "방3조명"),
|
|
|
- LIGHT05 ("light05", "Light", "방4조명"),
|
|
|
- LIGHT06 ("light06", "Light", "방5조명"),
|
|
|
- LIGHT07 ("light07", "Light", "방6조명"),
|
|
|
- LIGHT08 ("light08", "Light", "방7조명"),
|
|
|
- LIGHT09 ("light09", "Light", "방8조명"),
|
|
|
- LIGHT10 ("light10", "Light", "방9조명"),
|
|
|
- DIMMER_LIVINGLIGHT ("dimmer_livinglight", "LightDimmer", "거실조명"),
|
|
|
- DIMMER_LIGHT01 ("dimmer_light01", "LightDimmer", "주방조명"),
|
|
|
- DIMMER_LIGHT02 ("dimmer_light02", "LightDimmer", "방1조명"),
|
|
|
- DIMMER_LIGHT03 ("dimmer_light03", "LightDimmer", "방2조명"),
|
|
|
- DIMMER_LIGHT04 ("dimmer_light04", "LightDimmer", "방3조명"),
|
|
|
- DIMMER_LIGHT05 ("dimmer_light05", "LightDimmer", "방4조명"),
|
|
|
- DIMMER_LIGHT06 ("dimmer_light06", "LightDimmer", "방5조명"),
|
|
|
- DIMMER_LIGHT07 ("dimmer_light07", "LightDimmer", "방6조명"),
|
|
|
- DIMMER_LIGHT08 ("dimmer_light08", "LightDimmer", "방7조명"),
|
|
|
- DIMMER_LIGHT09 ("dimmer_light09", "LightDimmer", "방8조명"),
|
|
|
- DIMMER_LIGHT10 ("dimmer_light10", "LightDimmer", "방9조명"),
|
|
|
- COLOR_DIMMER_LIVINGLIGHT ("colorDimmer_livinglight", "ColorLightDimmer", "거실조명"),
|
|
|
- COLOR_DIMMER_LIGHT01 ("colorDimmer_light01", "ColorLightDimmer", "주방조명"),
|
|
|
- COLOR_DIMMER_LIGHT02 ("colorDimmer_light02", "ColorLightDimmer", "방1조명"),
|
|
|
- COLOR_DIMMER_LIGHT03 ("colorDimmer_light03", "ColorLightDimmer", "방2조명"),
|
|
|
- COLOR_DIMMER_LIGHT04 ("colorDimmer_light04", "ColorLightDimmer", "방3조명"),
|
|
|
- COLOR_DIMMER_LIGHT05 ("colorDimmer_light05", "ColorLightDimmer", "방4조명"),
|
|
|
- COLOR_DIMMER_LIGHT06 ("colorDimmer_light06", "ColorLightDimmer", "방5조명"),
|
|
|
- COLOR_DIMMER_LIGHT07 ("colorDimmer_light07", "ColorLightDimmer", "방6조명"),
|
|
|
- COLOR_DIMMER_LIGHT08 ("colorDimmer_light08", "ColorLightDimmer", "방7조명"),
|
|
|
- COLOR_DIMMER_LIGHT09 ("colorDimmer_light09", "ColorLightDimmer", "방8조명"),
|
|
|
- COLOR_DIMMER_LIGHT10 ("colorDimmer_light10", "ColorLightDimmer", "방9조명"),
|
|
|
- VENTIL ("ventil", "AirVentilator", "환기"),
|
|
|
- GAS ("gas", "GasValve", "가스밸브"),
|
|
|
- ELEVATOR ("elevator", "ElevatorCaller", "엘리베이터"),
|
|
|
- TEMPER1 ("temper_1", "FloorHeater", "거실난방"),
|
|
|
- TEMPER2 ("temper_2", "FloorHeater", "방1난방"),
|
|
|
- TEMPER3 ("temper_3", "FloorHeater", "방2난방"),
|
|
|
- TEMPER4 ("temper_4", "FloorHeater", "방3난방"),
|
|
|
- TEMPER5 ("temper_5", "FloorHeater", "방4난방"),
|
|
|
- TEMPER6 ("temper_6", "FloorHeater", "방5난방"),
|
|
|
- TEMPER7 ("temper_7", "FloorHeater", "방6난방"),
|
|
|
- TEMPER8 ("temper_8", "FloorHeater", "방7난방"),
|
|
|
- TEMPER9 ("temper_9", "FloorHeater", "방8난방"),
|
|
|
- TEMPER10 ("temper_10", "FloorHeater", "방9난방"),
|
|
|
- ELECTRIC01 ("electric01", "PowerOutlet", "거실콘센트"),
|
|
|
- ELECTRIC02 ("electric02", "PowerOutlet", "주방콘센트"),
|
|
|
- ELECTRIC03 ("electric03", "PowerOutlet", "방1콘센트"),
|
|
|
- ELECTRIC04 ("electric04", "PowerOutlet", "방2콘센트"),
|
|
|
- ELECTRIC05 ("electric05", "PowerOutlet", "방3콘센트"),
|
|
|
- ELECTRIC06 ("electric06", "PowerOutlet", "방4콘센트"),
|
|
|
- ELECTRIC07 ("electric07", "PowerOutlet", "방5콘센트"),
|
|
|
- ELECTRIC08 ("electric08", "PowerOutlet", "방6콘센트"),
|
|
|
- ELECTRIC09 ("electric09", "PowerOutlet", "방7콘센트"),
|
|
|
- ELECTRIC10 ("electric10", "PowerOutlet", "방8콘센트")
|
|
|
+ LIVINGLIGHT ("livinglight", "Light", "거실조명", "거실"),
|
|
|
+ LIGHT01 ("light01", "Light", "주방조명", "주방"),
|
|
|
+ LIGHT02 ("light02", "Light", "안방조명", "안방"),
|
|
|
+ LIGHT03 ("light03", "Light", "방1조명", "방1"),
|
|
|
+ LIGHT04 ("light04", "Light", "방2조명", "방2"),
|
|
|
+ LIGHT05 ("light05", "Light", "방3조명", "방3"),
|
|
|
+ LIGHT06 ("light06", "Light", "방4조명", "방4"),
|
|
|
+ LIGHT07 ("light07", "Light", "방5조명", "방5"),
|
|
|
+ LIGHT08 ("light08", "Light", "방6조명", "방6"),
|
|
|
+ LIGHT09 ("light09", "Light", "방7조명", "방7"),
|
|
|
+ LIGHT10 ("light10", "Light", "방8조명", "방8"),
|
|
|
+ DIMMER_LIVINGLIGHT ("dimmer_livinglight", "LightDimmer", "거실조명", "거실"),
|
|
|
+ DIMMER_LIGHT01 ("dimmer_light01", "LightDimmer", "주방조명", "주방"),
|
|
|
+ DIMMER_LIGHT02 ("dimmer_light02", "LightDimmer", "안방조명", "안방"),
|
|
|
+ DIMMER_LIGHT03 ("dimmer_light03", "LightDimmer", "방1조명", "방1"),
|
|
|
+ DIMMER_LIGHT04 ("dimmer_light04", "LightDimmer", "방2조명", "방2"),
|
|
|
+ DIMMER_LIGHT05 ("dimmer_light05", "LightDimmer", "방3조명", "방3"),
|
|
|
+ DIMMER_LIGHT06 ("dimmer_light06", "LightDimmer", "방4조명", "방4"),
|
|
|
+ DIMMER_LIGHT07 ("dimmer_light07", "LightDimmer", "방5조명", "방5"),
|
|
|
+ DIMMER_LIGHT08 ("dimmer_light08", "LightDimmer", "방6조명", "방6"),
|
|
|
+ DIMMER_LIGHT09 ("dimmer_light09", "LightDimmer", "방7조명", "방7"),
|
|
|
+ DIMMER_LIGHT10 ("dimmer_light10", "LightDimmer", "방8조명", "방8"),
|
|
|
+ COLOR_DIMMER_LIVINGLIGHT ("colorDimmer_livinglight", "ColorLightDimmer", "거실조명", "거실"),
|
|
|
+ COLOR_DIMMER_LIGHT01 ("colorDimmer_light01", "ColorLightDimmer", "주방조명", "주방"),
|
|
|
+ COLOR_DIMMER_LIGHT02 ("colorDimmer_light02", "ColorLightDimmer", "안방조명", "안방"),
|
|
|
+ COLOR_DIMMER_LIGHT03 ("colorDimmer_light03", "ColorLightDimmer", "방1조명", "방1"),
|
|
|
+ COLOR_DIMMER_LIGHT04 ("colorDimmer_light04", "ColorLightDimmer", "방2조명", "방2"),
|
|
|
+ COLOR_DIMMER_LIGHT05 ("colorDimmer_light05", "ColorLightDimmer", "방3조명", "방3"),
|
|
|
+ COLOR_DIMMER_LIGHT06 ("colorDimmer_light06", "ColorLightDimmer", "방4조명", "방4"),
|
|
|
+ COLOR_DIMMER_LIGHT07 ("colorDimmer_light07", "ColorLightDimmer", "방5조명", "방5"),
|
|
|
+ COLOR_DIMMER_LIGHT08 ("colorDimmer_light08", "ColorLightDimmer", "방6조명", "방6"),
|
|
|
+ COLOR_DIMMER_LIGHT09 ("colorDimmer_light09", "ColorLightDimmer", "방7조명", "방7"),
|
|
|
+ COLOR_DIMMER_LIGHT10 ("colorDimmer_light10", "ColorLightDimmer", "방8조명", "방8"),
|
|
|
+ VENTIL ("ventil", "AirVentilator", "환기", "거실"),
|
|
|
+ GAS ("gas", "GasValve", "가스밸브", "주방"),
|
|
|
+ ELEVATOR ("elevator", "ElevatorCaller", "엘리베이터", "공용부"),
|
|
|
+ TEMPER1 ("temper_1", "FloorHeater", "거실난방", "거실"),
|
|
|
+ TEMPER2 ("temper_2", "FloorHeater", "안방난방", "안방"),
|
|
|
+ TEMPER3 ("temper_3", "FloorHeater", "방1난방", "방1"),
|
|
|
+ TEMPER4 ("temper_4", "FloorHeater", "방2난방", "방2"),
|
|
|
+ TEMPER5 ("temper_5", "FloorHeater", "방3난방", "방3"),
|
|
|
+ TEMPER6 ("temper_6", "FloorHeater", "방4난방", "방4"),
|
|
|
+ TEMPER7 ("temper_7", "FloorHeater", "방5난방", "방5"),
|
|
|
+ TEMPER8 ("temper_8", "FloorHeater", "방6난방", "방6"),
|
|
|
+ TEMPER9 ("temper_9", "FloorHeater", "방7난방", "방7"),
|
|
|
+ TEMPER10 ("temper_10", "FloorHeater", "방8난방", "방8"),
|
|
|
+ ELECTRIC01 ("electric01", "PowerOutlet", "거실콘센트", "거실"),
|
|
|
+ ELECTRIC02 ("electric02", "PowerOutlet", "주방콘센트", "주방"),
|
|
|
+ ELECTRIC03 ("electric03", "PowerOutlet", "안방콘센트", "안방"),
|
|
|
+ ELECTRIC04 ("electric04", "PowerOutlet", "방1콘센트", "방1"),
|
|
|
+ ELECTRIC05 ("electric05", "PowerOutlet", "방2콘센트", "방2"),
|
|
|
+ ELECTRIC06 ("electric06", "PowerOutlet", "방3콘센트", "방3"),
|
|
|
+ ELECTRIC07 ("electric07", "PowerOutlet", "방4콘센트", "방4"),
|
|
|
+ ELECTRIC08 ("electric08", "PowerOutlet", "방5콘센트", "방5"),
|
|
|
+ ELECTRIC09 ("electric09", "PowerOutlet", "방6콘센트", "방6"),
|
|
|
+ ELECTRIC10 ("electric10", "PowerOutlet", "방7콘센트", "방7"),
|
|
|
+ ELECTRIC11 ("electric11", "PowerOutlet", "방8콘센트", "방8")
|
|
|
;
|
|
|
|
|
|
|
|
@@ -117,11 +118,13 @@ public final class THINGS_INFO {
|
|
|
|
|
|
private String displayName;
|
|
|
|
|
|
+ private String roomName;
|
|
|
|
|
|
- private DEVICE_DETAIL(String modelId, String displayType, String displayName) {
|
|
|
+ private DEVICE_DETAIL(String modelId, String displayType, String displayName, String roomName) {
|
|
|
this.modelId = modelId;
|
|
|
this.displayType = displayType;
|
|
|
this.displayName = displayName;
|
|
|
+ this.roomName = roomName;
|
|
|
}
|
|
|
|
|
|
public String getModelId() {
|
|
@@ -147,6 +150,15 @@ public final class THINGS_INFO {
|
|
|
public void setDisplayName(String displayName) {
|
|
|
this.displayName = displayName;
|
|
|
}
|
|
|
+
|
|
|
+ public String getRoomName() {
|
|
|
+ return roomName;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setRoomName(String roomName) {
|
|
|
+ this.roomName = roomName;
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
public enum THINGS{
|