mirror of
https://github.com/bwssytems/ha-bridge.git
synced 2025-12-18 16:17:30 +00:00
Fixed RC test issues for:
FHEM device decode on for first dim default OpoenHab Port Fibaro request debugging enhancement
This commit is contained in:
bsamuels
2
pom.xml
2
pom.xml
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<groupId>com.bwssystems.HABridge</groupId>
|
<groupId>com.bwssystems.HABridge</groupId>
|
||||||
<artifactId>ha-bridge</artifactId>
|
<artifactId>ha-bridge</artifactId>
|
||||||
<version>5.2.0RC3</version>
|
<version>5.2.0RC4</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>HA Bridge</name>
|
<name>HA Bridge</name>
|
||||||
|
|||||||
@@ -1166,7 +1166,24 @@ public class HueMulator {
|
|||||||
isOnRequest = true;
|
isOnRequest = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isOnRequest || (isDimRequest && device.isOnFirstDim() && !device.getDeviceState().isOn())) {
|
if(device.isOnFirstDim() && isDimRequest && !device.getDeviceState().isOn()) {
|
||||||
|
isOnRequest = true;
|
||||||
|
isDimRequest = false;
|
||||||
|
isColorRequest = false;
|
||||||
|
} else if(device.isOnFirstDim() && isDimRequest && device.getDeviceState().isOn()) {
|
||||||
|
if(device.getDeviceState().getBri() == theStateChanges.getBri()) {
|
||||||
|
isOnRequest = true;
|
||||||
|
isDimRequest = false;
|
||||||
|
isColorRequest = false;
|
||||||
|
} else {
|
||||||
|
isOnRequest = false;
|
||||||
|
isDimRequest = true;
|
||||||
|
isColorRequest = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(isOnRequest) {
|
||||||
|
log.debug("Calling on-off as requested.");
|
||||||
if (theStateChanges.isOn()) {
|
if (theStateChanges.isOn()) {
|
||||||
url = device.getOnUrl();
|
url = device.getOnUrl();
|
||||||
} else if (!theStateChanges.isOn()) {
|
} else if (!theStateChanges.isOn()) {
|
||||||
@@ -1191,6 +1208,7 @@ public class HueMulator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isDimRequest && !previousError) {
|
if (isDimRequest && !previousError) {
|
||||||
|
log.debug("Calling dim as requested.");
|
||||||
if(!device.isOnFirstDim() )
|
if(!device.isOnFirstDim() )
|
||||||
url = device.getDimUrl();
|
url = device.getDimUrl();
|
||||||
|
|
||||||
@@ -1222,6 +1240,7 @@ public class HueMulator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (isColorRequest && !previousError) {
|
if (isColorRequest && !previousError) {
|
||||||
|
log.debug("Calling color as requested.");
|
||||||
url = device.getColorUrl();
|
url = device.getColorUrl();
|
||||||
// code for backwards compatibility
|
// code for backwards compatibility
|
||||||
if(device.getMapType() != null && device.getMapType().equalsIgnoreCase(DeviceMapTypes.HUE_DEVICE[DeviceMapTypes.typeIndex])) {
|
if(device.getMapType() != null && device.getMapType().equalsIgnoreCase(DeviceMapTypes.HUE_DEVICE[DeviceMapTypes.typeIndex])) {
|
||||||
@@ -1248,7 +1267,6 @@ public class HueMulator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (responseString == null || !responseString.contains("[{\"error\":")) {
|
if (responseString == null || !responseString.contains("[{\"error\":")) {
|
||||||
log.debug("Response is in error: " + ((responseString == null) ? "null" : responseString));
|
|
||||||
if(!device.isNoState()) {
|
if(!device.isNoState()) {
|
||||||
responseString = this.formatSuccessHueResponse(theStateChanges, body, lightId, state, targetBri, targetBriInc, device.isOffState());
|
responseString = this.formatSuccessHueResponse(theStateChanges, body, lightId, state, targetBri, targetBriInc, device.isOffState());
|
||||||
device.setDeviceState(state);
|
device.setDeviceState(state);
|
||||||
@@ -1257,6 +1275,7 @@ public class HueMulator {
|
|||||||
responseString = this.formatSuccessHueResponse(theStateChanges, body, lightId, dummyState, targetBri, targetBriInc, device.isOffState());
|
responseString = this.formatSuccessHueResponse(theStateChanges, body, lightId, dummyState, targetBri, targetBriInc, device.isOffState());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return responseString;
|
return responseString;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,275 +75,12 @@ public class FHEMInstance {
|
|||||||
deviceList = new ArrayList<FHEMDevice>();
|
deviceList = new ArrayList<FHEMDevice>();
|
||||||
|
|
||||||
for (Result aResult:theFhemStates.getResults()) {
|
for (Result aResult:theFhemStates.getResults()) {
|
||||||
FHEMDevice aNewFhemDeviceDevice = new FHEMDevice();
|
String name = aResult.getName();
|
||||||
aNewFhemDeviceDevice.setItem(aResult);
|
if(name.contains("<a href=")) {
|
||||||
aNewFhemDeviceDevice.setAddress(theFhem.getIp() + ":" + theFhem.getPort());
|
name = name.substring(name.indexOf("<a href=") + name.indexOf(">"));
|
||||||
aNewFhemDeviceDevice.setName(theFhem.getName());
|
name = name.substring(1, name.indexOf("</a"));
|
||||||
deviceList.add(aNewFhemDeviceDevice);
|
aResult.setName(name);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
log.warn("Cannot get an devices for FHEM " + theFhem.getName() + " http call failed.");
|
|
||||||
return deviceList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<FHEMDevice> testGetDevices(HTTPHandler httpClient) {
|
|
||||||
String TestData = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n" +
|
|
||||||
"<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" +
|
|
||||||
" <head root=\"/fhem\">\n" +
|
|
||||||
" <title>Home, Sweet Home</title>\n" +
|
|
||||||
" <link rel=\"shortcut icon\" href=\"/fhem/icons/favicon\" />\n" +
|
|
||||||
" <meta charset=\"UTF-8\">\n" +
|
|
||||||
" <meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\n" +
|
|
||||||
" <link href=\"/fhem/pgm2/style.css?v=1513026539\" rel=\"stylesheet\"/>\n" +
|
|
||||||
" <link href=\"/fhem/pgm2/jquery-ui.min.css\" rel=\"stylesheet\"/>\n" +
|
|
||||||
" <script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/jquery.min.js\"></script>\n" +
|
|
||||||
" <script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/jquery-ui.min.js\"></script>\n" +
|
|
||||||
" <script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/fhemweb.js\"></script>\n" +
|
|
||||||
" <script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/fhemweb_colorpicker.js\"></script>\n" +
|
|
||||||
" <script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/fhemweb_fbcalllist.js\"></script>\n" +
|
|
||||||
" <script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/fhemweb_knob.js\"></script>\n" +
|
|
||||||
" <script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/fhemweb_readingsGroup.js\"></script>\n" +
|
|
||||||
" <script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/fhemweb_readingsHistory.js\"></script>\n" +
|
|
||||||
" <script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/fhemweb_sortable.js\"></script>\n" +
|
|
||||||
" <script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/fhemweb_uzsu.js\"></script>\n" +
|
|
||||||
" <script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/fhemweb_weekprofile.js\"></script>\n" +
|
|
||||||
" </head>\n" +
|
|
||||||
" <body name='Home, Sweet Home' fw_id='7880' generated=\"1513272732\" longpoll=\"1\" data-confirmDelete='1' data-confirmJSError='1' data-webName='haBridgeWeb '>\n" +
|
|
||||||
" <div id=\"menuScrollArea\">\n" +
|
|
||||||
" <div>\n" +
|
|
||||||
" <a href=\"/fhem?\">\n" +
|
|
||||||
" <div id=\"logo\"></div>\n" +
|
|
||||||
" </a>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" <div id=\"menu\">\n" +
|
|
||||||
" <table>\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <table class=\"room roomBlock1\">\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <div class=\"menu_Save_config\">\n" +
|
|
||||||
" <a href=\"/fhem?cmd=save\">Save config</a>\n" +
|
|
||||||
" <a id=\"saveCheck\" class=\"changed\" style=\"visibility:visible\">?</a>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" </table>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <table class=\"room roomBlock2\">\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <div class=\"menu_Alexa\">\n" +
|
|
||||||
" <a href=\"/fhem?room=Alexa\">Alexa</a>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <div class=\"menu_System\">\n" +
|
|
||||||
" <a href=\"/fhem?room=System\">System</a>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <div class=\"menu_WG_Zimmer\">\n" +
|
|
||||||
" <a href=\"/fhem?room=WG%2dZimmer\">WG-Zimmer</a>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <div class=\"menu_habridge\">\n" +
|
|
||||||
" <a href=\"/fhem?room=habridge\">habridge</a>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <div class=\"menu_Everything\">\n" +
|
|
||||||
" <a href=\"/fhem?room=all\">\n" +
|
|
||||||
" <img class='icon icoEverything' src=\"/fhem/images/default/icoEverything.png\" alt=\"icoEverything\" title=\"icoEverything\"> Everything\n" +
|
|
||||||
" </a>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" </table>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <table class=\"room roomBlock3\">\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <div class=\"menu_Logfile\">\n" +
|
|
||||||
" <a href=\"/fhem/FileLog_logWrapper?dev=Logfile&type=text&file=fhem-2017-12.log\">Logfile</a>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <div>\n" +
|
|
||||||
" <a href=\"/fhem/docs/commandref.html\" target=\"_blank\" >Commandref</a>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <div>\n" +
|
|
||||||
" <a href=\"http://fhem.de/fhem.html#Documentation\" target=\"_blank\" >Remote doc</a>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <div class=\"menu_Edit_files\">\n" +
|
|
||||||
" <a href=\"/fhem?cmd=style%20list\">Edit files</a>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <div class=\"menu_Select_style\">\n" +
|
|
||||||
" <a href=\"/fhem?cmd=style%20select\">Select style</a>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td>\n" +
|
|
||||||
" <div class=\"menu_Event_monitor\">\n" +
|
|
||||||
" <a href=\"/fhem?cmd=style%20eventMonitor\">Event monitor</a>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" </table>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" </table>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" <div id=\"hdr\">\n" +
|
|
||||||
" <table border=\"0\" class=\"header\">\n" +
|
|
||||||
" <tr>\n" +
|
|
||||||
" <td style=\"padding:0\">\n" +
|
|
||||||
" <form method=\"post\" action=\"/fhem\">\n" +
|
|
||||||
" <input type=\"hidden\" name=\"fw_id\" value=\"7880\"/>\n" +
|
|
||||||
" <input type=\"text\" name=\"cmd\" class=\"maininput\" size=\"40\" value=\"\"/>\n" +
|
|
||||||
" </form>\n" +
|
|
||||||
" </td>\n" +
|
|
||||||
" </tr>\n" +
|
|
||||||
" </table>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" <div id='content' >\n" +
|
|
||||||
" <pre>{ \n" +
|
|
||||||
" \"Arg\":\"room=habridge\", \n" +
|
|
||||||
" \"Results\": [ \n" +
|
|
||||||
" { \n" +
|
|
||||||
" \"Name\":\"Arbeitslicht\", \n" +
|
|
||||||
" \"PossibleSets\":\"on off\", \n" +
|
|
||||||
" \"PossibleAttrs\":\"alias comment:textField-long eventMap group room suppressReading userReadings:textField-long verbose:0,1,2,3,4,5 readingList setList useSetExtensions disable disabledForIntervals event-on-change-reading event-on-update-reading event-aggregator event-min-interval stateFormat:textField-long timestamp-on-change-reading alexaName alexaRoom cmdIcon devStateIcon devStateStyle fhem_widget_command fhem_widget_command_2 fhem_widget_command_3 genericDeviceType:security,ignore,switch,outlet,light,blind,thermometer,thermostat,contact,garage,window,lock homebridgeMapping:textField-long icon sortby webCmd widgetOverride userattr\", \n" +
|
|
||||||
" \"Internals\": { \n" +
|
|
||||||
" \"NAME\": \"Arbeitslicht\", \n" +
|
|
||||||
" \"NR\": \"28\", \n" +
|
|
||||||
" \"STATE\": \"-\", \n" +
|
|
||||||
" \"TYPE\": \"dummy\" \n" +
|
|
||||||
" }, \n" +
|
|
||||||
" \"Readings\": { \"state\": { \"Value\":\"on\", \"Time\":\"2017-12-14 15:41:05\" } }, \n" +
|
|
||||||
" \"Attributes\": { \n" +
|
|
||||||
" \"alexaName\": \"Arbeitslicht\", \n" +
|
|
||||||
" \"alexaRoom\": \"alexaroom\", \n" +
|
|
||||||
" \"fhem_widget_command\": \"{ \\u0022allowed_values\\u0022 : [ \\u0022on\\u0022 ], \\u0022order\\u0022 : 0}\", \n" +
|
|
||||||
" \"icon\": \"scene_office\", \n" +
|
|
||||||
" \"room\": \"Alexa,habridge\", \n" +
|
|
||||||
" \"setList\": \"on off\", \n" +
|
|
||||||
" \"stateFormat\": \"-\", \n" +
|
|
||||||
" \"webCmd\": \"on\" \n" +
|
|
||||||
" } \n" +
|
|
||||||
" }, \n" +
|
|
||||||
" { \n" +
|
|
||||||
" \"Name\":\"DeckenlampeLinks\", \n" +
|
|
||||||
" \"PossibleSets\":\"on off dim dimup dimdown HSV RGB sync pair unpair\", \n" +
|
|
||||||
" \"PossibleAttrs\":\"alias comment:textField-long eventMap group room suppressReading userReadings:textField-long verbose:0,1,2,3,4,5 gamma dimStep defaultColor defaultRamp colorCast whitePoint event-on-change-reading event-on-update-reading event-aggregator event-min-interval stateFormat:textField-long timestamp-on-change-reading alexaName alexaRoom cmdIcon devStateIcon devStateStyle fhem_widget_command fhem_widget_command_2 fhem_widget_command_3 genericDeviceType:security,ignore,switch,outlet,light,blind,thermometer,thermostat,contact,garage,window,lock homebridgeMapping:textField-long icon sortby webCmd widgetOverride \n" +
|
|
||||||
" <a href=\"/fhem?detail=AlleLampen\">AlleLampen</a> AlleLampen_map\n" +
|
|
||||||
" <a href=\"/fhem?detail=DeckenLampen\">DeckenLampen</a> DeckenLampen_map structexclude userattr\", \n" +
|
|
||||||
" \"Internals\": { \n" +
|
|
||||||
" \"CONNECTION\": \"bridge-V3\", \n" +
|
|
||||||
" \"DEF\": \"RGBW2 bridge-V3:10.2.3.3\", \n" +
|
|
||||||
" \"IP\": \"10.2.3.3\", \n" +
|
|
||||||
" \"LEDTYPE\": \"RGBW2\", \n" +
|
|
||||||
" \"NAME\": \"DeckenlampeLinks\", \n" +
|
|
||||||
" \"NR\": \"18\", \n" +
|
|
||||||
" \"NTFY_ORDER\": \"50-DeckenlampeLinks\", \n" +
|
|
||||||
" \"PORT\": \"8899\", \n" +
|
|
||||||
" \"PROTO\": \"0\", \n" +
|
|
||||||
" \"SLOT\": \"5\", \n" +
|
|
||||||
" \"STATE\": \"off\", \n" +
|
|
||||||
" \"TYPE\": \"WifiLight\" \n" +
|
|
||||||
" }, \n" +
|
|
||||||
" \"Readings\": { \n" +
|
|
||||||
" \"RGB\": { \"Value\":\"000000\", \"Time\":\"2017-12-14 15:41:10\" }, \n" +
|
|
||||||
" \"brightness\": { \"Value\":\"0\", \"Time\":\"2017-12-14 15:41:10\" }, \n" +
|
|
||||||
" \"hue\": { \"Value\":\"0\", \"Time\":\"2017-12-14 15:41:10\" }, \n" +
|
|
||||||
" \"saturation\": { \"Value\":\"0\", \"Time\":\"2017-12-14 15:41:10\" }, \n" +
|
|
||||||
" \"state\": { \"Value\":\"off\", \"Time\":\"2017-12-14 15:41:10\" } \n" +
|
|
||||||
" }, \n" +
|
|
||||||
" \"Attributes\": { \n" +
|
|
||||||
" \"AlleLampen\": \"AlleLampen\", \n" +
|
|
||||||
" \"DeckenLampen\": \"DeckenLampen\", \n" +
|
|
||||||
" \"fhem_widget_command\": \"{ \\u0022locations\\u0022 : [ \\u0022APP\\u0022, \\u0022WATCH\\u0022, \\u0022WIDGET\\u0022 ], \\u0022allowed_values\\u0022 : [ \\u0022off\\u0022, \\u0022on\\u0022 ], \\u0022order\\u0022 : 6}\", \n" +
|
|
||||||
" \"room\": \"habridge,Alexa,WG-Zimmer\", \n" +
|
|
||||||
" \"userattr\": \"AlleLampen AlleLampen_map\n" +
|
|
||||||
" <a href=\"/fhem?detail=DeckenLampen\">DeckenLampen</a> DeckenLampen_map structexclude\", \n" +
|
|
||||||
" \"webCmd\": \"RGB\", \n" +
|
|
||||||
" \"widgetOverride\": \"RGB:colorpicker,RGB\" \n" +
|
|
||||||
" } \n" +
|
|
||||||
" } ], \n" +
|
|
||||||
" \"totalResultsReturned\":2 \n" +
|
|
||||||
"}\n" +
|
|
||||||
" </pre>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </body>\n" +
|
|
||||||
"</html>";
|
|
||||||
|
|
||||||
String TestData2 = " <div id='content' >\n" +
|
|
||||||
" <pre>\n" + "{ \"Arg\":\"room=HaBridge\", \"Results\": [ { \"Name\":\"wifi_steckdose3\", \"PossibleSets\":\"on:noArg off:noArg off on toggle\", \"PossibleAttrs\":\"alias comment:textField-long eventMap group room suppressReading userReadings:textField-long verbose:0,1,2,3,4,5 IODev qos retain publishSet publishSet_.* subscribeReading_.* autoSubscribeReadings event-on-change-reading event-on-update-reading event-aggregator event-min-interval stateFormat:textField-long timestamp-on-change-reading alarmDevice:Actor,Sensor alarmSettings cmdIcon devStateIcon devStateStyle icon lightSceneParamsToSave lightSceneRestoreOnlyIfChanged:1,0 sortby structexclude webCmd webCmdLabel:textField-long widgetOverride userattr\", \"Internals\": { \"CHANGED\": \"null\", \"NAME\": \"wifi_steckdose3\", \"NR\": \"270\", \"STATE\": \"off\", \"TYPE\": \"MQTT_DEVICE\", \"retain\": \"*:1 \" }, \"Readings\": { \"state\": { \"Value\":\"OFF\", \"Time\":\"2018-01-01 23:01:21\" }, \"transmission-state\": { \"Value\":\"subscription acknowledged\", \"Time\":\"2018-01-03 22:34:00\" } }, \"Attributes\": { \"IODev\": \"myBroker\", \"alias\": \"Stecki\", \"devStateIcon\": \"on:black_Steckdose.on off:black_Steckdose.off\", \"event-on-change-reading\": \"state\", \"eventMap\": \"ON:on OFF:off\", \"publishSet\": \"on off toggle /SmartHome/az/stecker/cmnd/POWER\", \"retain\": \"1\", \"room\": \"HaBridge,Arbeitszimmer,mqtt\", \"stateFormat\": \"state\", \"subscribeReading_state\": \"/SmartHome/az/stecker/stat/POWER\", \"webCmd\": \"on:off:toggle\" } } ], \"totalResultsReturned\":1 }" +
|
|
||||||
" </pre>\n" +
|
|
||||||
" </div>\n" +
|
|
||||||
" </body>\n" +
|
|
||||||
"</html>";
|
|
||||||
List<FHEMDevice> deviceList = null;
|
|
||||||
FHEMItem theFhemStates;
|
|
||||||
String theUrl = null;
|
|
||||||
String theData;
|
|
||||||
NameValue[] headers = null;
|
|
||||||
if(theFhem.getSecure() != null && theFhem.getSecure())
|
|
||||||
theUrl = "https://";
|
|
||||||
else
|
|
||||||
theUrl = "http://";
|
|
||||||
if(theFhem.getUsername() != null && !theFhem.getUsername().isEmpty() && theFhem.getPassword() != null && !theFhem.getPassword().isEmpty()) {
|
|
||||||
theUrl = theUrl + theFhem.getUsername() + ":" + theFhem.getPassword() + "@";
|
|
||||||
}
|
|
||||||
theUrl = theUrl + theFhem.getIp() + ":" + theFhem.getPort() + "/fhem?cmd=jsonlist2";
|
|
||||||
if(theFhem.getWebhook() != null && !theFhem.getWebhook().trim().isEmpty())
|
|
||||||
theUrl = theUrl + "%20room=" + theFhem.getWebhook().trim();
|
|
||||||
// theData = httpClient.doHttpRequest(theUrl, HttpGet.METHOD_NAME, "application/json", null, headers);
|
|
||||||
theData = TestData;
|
|
||||||
if(theData != null) {
|
|
||||||
log.debug("GET FHEM States - data: " + theData);
|
|
||||||
theData = getJSONData(theData);
|
|
||||||
theFhemStates = new Gson().fromJson(theData, FHEMItem.class);
|
|
||||||
if(theFhemStates == null) {
|
|
||||||
log.warn("Cannot get any devices for FHEM " + theFhem.getName() + " as response is not parsable.");
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
deviceList = new ArrayList<FHEMDevice>();
|
|
||||||
|
|
||||||
for (Result aResult:theFhemStates.getResults()) {
|
|
||||||
FHEMDevice aNewFhemDeviceDevice = new FHEMDevice();
|
FHEMDevice aNewFhemDeviceDevice = new FHEMDevice();
|
||||||
aNewFhemDeviceDevice.setItem(aResult);
|
aNewFhemDeviceDevice.setItem(aResult);
|
||||||
aNewFhemDeviceDevice.setAddress(theFhem.getIp() + ":" + theFhem.getPort());
|
aNewFhemDeviceDevice.setAddress(theFhem.getIp() + ":" + theFhem.getPort());
|
||||||
|
|||||||
@@ -74,7 +74,8 @@ public class FibaroInfo
|
|||||||
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
||||||
connection.setRequestMethod("GET");
|
connection.setRequestMethod("GET");
|
||||||
connection.setRequestProperty("Authorization", fibaroAuth);
|
connection.setRequestProperty("Authorization", fibaroAuth);
|
||||||
connection.getResponseMessage();
|
String aResponse = connection.getResponseMessage();
|
||||||
|
log.debug("sendCommand response: <<<" + aResponse + ">>>");
|
||||||
}
|
}
|
||||||
catch(IOException e)
|
catch(IOException e)
|
||||||
{
|
{
|
||||||
@@ -94,6 +95,7 @@ public class FibaroInfo
|
|||||||
private Room[] getRooms()
|
private Room[] getRooms()
|
||||||
{
|
{
|
||||||
String result = request("/api/rooms");
|
String result = request("/api/rooms");
|
||||||
|
log.debug("getRooms response: <<<" + result + ">>>");
|
||||||
Room[] rooms = result == null ? new Room[0] : gson.fromJson(result, Room[].class);
|
Room[] rooms = result == null ? new Room[0] : gson.fromJson(result, Room[].class);
|
||||||
if(replaceTrash)
|
if(replaceTrash)
|
||||||
for(Room r : rooms)
|
for(Room r : rooms)
|
||||||
@@ -108,6 +110,7 @@ public class FibaroInfo
|
|||||||
log.info("Found: " + rooms.length + " rooms");
|
log.info("Found: " + rooms.length + " rooms");
|
||||||
|
|
||||||
String result = request("/api/devices?enabled=true&visible=true");
|
String result = request("/api/devices?enabled=true&visible=true");
|
||||||
|
log.debug("getDevices response: <<<" + result + ">>>");
|
||||||
Device[] all_devices = result == null ? new Device[0] : gson.fromJson(result, Device[].class);
|
Device[] all_devices = result == null ? new Device[0] : gson.fromJson(result, Device[].class);
|
||||||
|
|
||||||
int count = 0;
|
int count = 0;
|
||||||
@@ -147,6 +150,7 @@ public class FibaroInfo
|
|||||||
Room[] rooms = getRooms();
|
Room[] rooms = getRooms();
|
||||||
|
|
||||||
String result = request("/api/scenes?enabled=true&visible=true");
|
String result = request("/api/scenes?enabled=true&visible=true");
|
||||||
|
log.debug("getScenes response: <<<" + result + ">>>");
|
||||||
Scene[] all_scenes = result == null ? new Scene[0] : gson.fromJson(result, Scene[].class);
|
Scene[] all_scenes = result == null ? new Scene[0] : gson.fromJson(result, Scene[].class);
|
||||||
|
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|||||||
@@ -1499,6 +1499,10 @@ app.controller ('SystemController', function ($scope, $location, bridgeService,
|
|||||||
$scope.bridge.isInControl = false;
|
$scope.bridge.isInControl = false;
|
||||||
$scope.visible = false;
|
$scope.visible = false;
|
||||||
$scope.imgUrl = "glyphicon glyphicon-plus";
|
$scope.imgUrl = "glyphicon glyphicon-plus";
|
||||||
|
$scope.newhassport = "8123";
|
||||||
|
$scope.newdomoticzport = "8080";
|
||||||
|
$scope.newopenhabport = "8080";
|
||||||
|
$scope.newfhemport = "8080";
|
||||||
$scope.addVeratoSettings = function (newveraname, newveraip) {
|
$scope.addVeratoSettings = function (newveraname, newveraip) {
|
||||||
if($scope.bridge.settings.veraaddress === undefined || $scope.bridge.settings.veraaddress === null) {
|
if($scope.bridge.settings.veraaddress === undefined || $scope.bridge.settings.veraaddress === null) {
|
||||||
$scope.bridge.settings.veraaddress = { devices: [] };
|
$scope.bridge.settings.veraaddress = { devices: [] };
|
||||||
@@ -1610,6 +1614,7 @@ app.controller ('SystemController', function ($scope, $location, bridgeService,
|
|||||||
$scope.newhassip = null;
|
$scope.newhassip = null;
|
||||||
$scope.newhassport = null;
|
$scope.newhassport = null;
|
||||||
$scope.newhasspassword = null;
|
$scope.newhasspassword = null;
|
||||||
|
$scope.newhassport = "8123";
|
||||||
};
|
};
|
||||||
$scope.removeHasstoSettings = function (hassname, hassip) {
|
$scope.removeHasstoSettings = function (hassname, hassip) {
|
||||||
for(var i = $scope.bridge.settings.hassaddress.devices.length - 1; i >= 0; i--) {
|
for(var i = $scope.bridge.settings.hassaddress.devices.length - 1; i >= 0; i--) {
|
||||||
@@ -1644,7 +1649,7 @@ app.controller ('SystemController', function ($scope, $location, bridgeService,
|
|||||||
$scope.bridge.settings.domoticzaddress.devices.push(newdomoticz);
|
$scope.bridge.settings.domoticzaddress.devices.push(newdomoticz);
|
||||||
$scope.newdomoticzname = null;
|
$scope.newdomoticzname = null;
|
||||||
$scope.newdomoticzip = null;
|
$scope.newdomoticzip = null;
|
||||||
$scope.newdomoticzport = null;
|
$scope.newdomoticzport = "8080";
|
||||||
$scope.newdomoticzpassword = null;
|
$scope.newdomoticzpassword = null;
|
||||||
};
|
};
|
||||||
$scope.removeDomoticztoSettings = function (domoticzname, domoticzip) {
|
$scope.removeDomoticztoSettings = function (domoticzname, domoticzip) {
|
||||||
@@ -1680,7 +1685,7 @@ app.controller ('SystemController', function ($scope, $location, bridgeService,
|
|||||||
$scope.bridge.settings.openhabaddress.devices.push(newopenhab);
|
$scope.bridge.settings.openhabaddress.devices.push(newopenhab);
|
||||||
$scope.newopenhabname = null;
|
$scope.newopenhabname = null;
|
||||||
$scope.newopenhabip = null;
|
$scope.newopenhabip = null;
|
||||||
$scope.newopenhabport = null;
|
$scope.newopenhabport = "8080";
|
||||||
$scope.newopenhabusername = null;
|
$scope.newopenhabusername = null;
|
||||||
$scope.newopenhabpassword = null;
|
$scope.newopenhabpassword = null;
|
||||||
};
|
};
|
||||||
@@ -1700,7 +1705,7 @@ app.controller ('SystemController', function ($scope, $location, bridgeService,
|
|||||||
$scope.bridge.settings.fhemaddress.devices.push(newfhem);
|
$scope.bridge.settings.fhemaddress.devices.push(newfhem);
|
||||||
$scope.newfhemname = null;
|
$scope.newfhemname = null;
|
||||||
$scope.newfhemip = null;
|
$scope.newfhemip = null;
|
||||||
$scope.newfhemport = null;
|
$scope.newfhemport = "8080";
|
||||||
$scope.newfhemusername = null;
|
$scope.newfhemusername = null;
|
||||||
$scope.newfhempassword = null;
|
$scope.newfhempassword = null;
|
||||||
$scope.newfhemwebhook = null;
|
$scope.newfhemwebhook = null;
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.bwssystems.fhem.test;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import com.bwssystems.HABridge.NamedIP;
|
import com.bwssystems.HABridge.NamedIP;
|
||||||
|
import com.bwssystems.HABridge.plugins.fhem.FHEMDevice;
|
||||||
import com.bwssystems.HABridge.plugins.fhem.FHEMInstance;
|
import com.bwssystems.HABridge.plugins.fhem.FHEMInstance;
|
||||||
import com.bwssystems.HABridge.plugins.fhem.FHEMItem;
|
import com.bwssystems.HABridge.plugins.fhem.FHEMItem;
|
||||||
import com.bwssystems.HABridge.plugins.fhem.Result;
|
import com.bwssystems.HABridge.plugins.fhem.Result;
|
||||||
@@ -237,6 +238,63 @@ public class FHEMInstanceConstructor {
|
|||||||
" </div>\n" +
|
" </div>\n" +
|
||||||
" </body>\n" +
|
" </body>\n" +
|
||||||
"</html>";
|
"</html>";
|
||||||
|
public final static String TestData3 ="DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n" +
|
||||||
|
"<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" +
|
||||||
|
"<head root=\"/fhem\">\n" +
|
||||||
|
"<title>Home, Sweet Home</title>\n" +
|
||||||
|
"<link rel=\"shortcut icon\" href=\"/fhem/icons/favicon\" />\n" +
|
||||||
|
"<meta charset=\"UTF-8\">\n" +
|
||||||
|
"<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\n" +
|
||||||
|
"<link href=\"/fhem/pgm2/style.css?v=1515015198\" rel=\"stylesheet\"/>\n" +
|
||||||
|
"<link href=\"/fhem/pgm2/jquery-ui.min.css\" rel=\"stylesheet\"/>\n" +
|
||||||
|
"<script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/jquery.min.js\"></script>\n" +
|
||||||
|
"<script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/jquery-ui.min.js\"></script>\n" +
|
||||||
|
"<script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/fhemweb.js\"></script>\n" +
|
||||||
|
"<script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/doif.js\"></script>\n" +
|
||||||
|
"<script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/fronthemEditor.js\"></script>\n" +
|
||||||
|
"<script attr='' type=\"text/javascript\" src=\"/fhem/pgm2/fhemweb_readingsGroup.js\"></script>\n" +
|
||||||
|
"</head>\n" +
|
||||||
|
"<body name='Home, Sweet Home' fw_id='1490' generated=\"1515770038\" longpoll=\"websocket\" data-confirmDelete='1' data-confirmJSError='1' data-addHtmlTitle='1' data-availableJs='sortable,iconLabel,readingsHistory,colorpicker,iconButtons,fbcalllist,knob,weekprofile,iconRadio,readingsGroup,iconSwitch,uzsu' data-webName='WEB '>\n" +
|
||||||
|
"<div id=\"menuScrollArea\">\n" +
|
||||||
|
"</div>\n" +
|
||||||
|
"<div id='content' >\n" +
|
||||||
|
"<pre>{\n" +
|
||||||
|
"\"Arg\":\"room=HaBridge\",\n" +
|
||||||
|
"\"Results\": [\n" +
|
||||||
|
"{\n" +
|
||||||
|
"\"Name\":\"<a href='/fhem?detail=wifi_steckdose3'>wifi_steckdose3</a>\",\n" +
|
||||||
|
"\"PossibleSets\":\"on:noArg off:noArg off on toggle\",\n" +
|
||||||
|
"\"PossibleAttrs\":\"alias comment:textField-long eventMap group room suppressReading userReadings:textField-long verbose:0,1,2,3,4,5 IODev qos retain publishSet publishSet_.* subscribeReading_.* autoSubscribeReadings event-on-change-reading event-on-update-reading event-aggregator event-min-interval stateFormat:textField-long timestamp-on-change-reading alarmDevice:Actor,Sensor alarmSettings cmdIcon devStateIcon devStateStyle icon lightSceneParamsToSave lightSceneRestoreOnlyIfChanged:1,0 sortby structexclude webCmd webCmdLabel:textField-long widgetOverride userattr\",\n" +
|
||||||
|
"\"Internals\": {\n" +
|
||||||
|
"\"NAME\": \"<a href='/fhem?detail=wifi_steckdose3'>wifi_steckdose3</a>\",\n" +
|
||||||
|
"\"NR\": \"270\",\n" +
|
||||||
|
"\"STATE\": \"off\",\n" +
|
||||||
|
"\"TYPE\": \"MQTT_DEVICE\",\n" +
|
||||||
|
"\"retain\": \"*:1 \"\n" +
|
||||||
|
"},\n" +
|
||||||
|
"\"Readings\": {\n" +
|
||||||
|
"\"state\": { \"Value\":\"OFF\", \"Time\":\"2018-01-07 05:16:01\" },\n" +
|
||||||
|
"\"transmission-state\": { \"Value\":\"incoming publish received\", \"Time\":\"2018-01-07 05:16:01\" }\n" +
|
||||||
|
"},\n" +
|
||||||
|
"\"Attributes\": {\n" +
|
||||||
|
"\"IODev\": \"<a href='/fhem?detail=myBroker'>myBroker</a>\",\n" +
|
||||||
|
"\"alias\": \"Stecki\",\n" +
|
||||||
|
"\"devStateIcon\": \"on:black_Steckdose.on off:black_Steckdose.off\",\n" +
|
||||||
|
"\"event-on-change-reading\": \"state\",\n" +
|
||||||
|
"\"eventMap\": \"ON:on OFF:off\",\n" +
|
||||||
|
"\"publishSet\": \"on off toggle /SmartHome/az/stecker/cmnd/POWER\",\n" +
|
||||||
|
"\"retain\": \"1\",\n" +
|
||||||
|
"\"room\": \"HaBridge,Arbeitszimmer,mqtt\",\n" +
|
||||||
|
"\"stateFormat\": \"state\",\n" +
|
||||||
|
"\"subscribeReading_state\": \"/SmartHome/az/stecker/stat/POWER\",\n" +
|
||||||
|
"\"webCmd\": \"on:off:toggle\"\n" +
|
||||||
|
"}\n" +
|
||||||
|
"} ],\n" +
|
||||||
|
"\"totalResultsReturned\":1\n" +
|
||||||
|
"}\n" +
|
||||||
|
"</pre>\n" +
|
||||||
|
"</div>\n" +
|
||||||
|
"</body></html>";
|
||||||
public static void main(String[] args){
|
public static void main(String[] args){
|
||||||
FHEMInstanceConstructor aTestService = new FHEMInstanceConstructor();
|
FHEMInstanceConstructor aTestService = new FHEMInstanceConstructor();
|
||||||
if(aTestService.validateStructure())
|
if(aTestService.validateStructure())
|
||||||
@@ -246,21 +304,57 @@ public class FHEMInstanceConstructor {
|
|||||||
public Boolean validateStructure() {
|
public Boolean validateStructure() {
|
||||||
Gson aGson;
|
Gson aGson;
|
||||||
NamedIP anAddress = new NamedIP();
|
NamedIP anAddress = new NamedIP();
|
||||||
anAddress.setName("testName");
|
anAddress.setName("TestData1");
|
||||||
anAddress.setIp("10.0.0.1");
|
anAddress.setIp("10.0.0.1");
|
||||||
FHEMInstance anInstance = new FHEMInstance(anAddress);
|
FHEMInstance anInstance = new FHEMInstance(anAddress);
|
||||||
String decodeData = anInstance.getJSONData(TestData2);
|
HttpTestHandler theHttpTestClient = new HttpTestHandler();
|
||||||
try {
|
List<Result> services = null;
|
||||||
aGson = new GsonBuilder()
|
List<FHEMDevice> deviceList = null;
|
||||||
.create();
|
String decodeData = null;
|
||||||
|
String theTestData = null;
|
||||||
|
|
||||||
FHEMItem aService = aGson.fromJson(decodeData, FHEMItem.class);
|
for(int i = 0; i < 3; i++) {
|
||||||
List<Result> services = aService.getResults();
|
if(i == 0)
|
||||||
|
theTestData = TestData;
|
||||||
|
else if(i == 1) {
|
||||||
|
theTestData = TestData2;
|
||||||
|
anAddress.setName(anAddress.getName().replace("1", "2"));
|
||||||
|
anInstance = new FHEMInstance(anAddress);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
anAddress.setName(anAddress.getName().replace("2", "3"));
|
||||||
|
theTestData = TestData3;
|
||||||
|
}
|
||||||
|
decodeData = anInstance.getJSONData(theTestData);
|
||||||
|
try {
|
||||||
|
aGson = new GsonBuilder()
|
||||||
|
.create();
|
||||||
|
|
||||||
|
FHEMItem aService = aGson.fromJson(decodeData, FHEMItem.class);
|
||||||
|
services = aService.getResults();
|
||||||
for(Result aResult:services) {
|
for(Result aResult:services) {
|
||||||
System.out.println(" " + aResult.getName());
|
System.out.println(anAddress.getName() + " - Json Test:");
|
||||||
|
System.out.println(" " + aResult.getName());
|
||||||
|
System.out.println(" " + aResult.getPossibleSets());
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
System.out.println("----------------------------------");
|
||||||
|
try {
|
||||||
|
theHttpTestClient.setTheData(theTestData);
|
||||||
|
deviceList = anInstance.getDevices(theHttpTestClient);
|
||||||
|
if(deviceList == null)
|
||||||
|
return false;
|
||||||
|
for(FHEMDevice aDevice:deviceList) {
|
||||||
|
System.out.println(aDevice.getName() + " - FHEMDevice Class Test:");
|
||||||
|
System.out.println(" " + aDevice.getItem().getName());
|
||||||
|
System.out.println(" " + aDevice.getItem().getPossibleSets());
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
System.out.println("----------------------------------");
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
20
src/test/java/com/bwssystems/fhem/test/HttpTestHandler.java
Normal file
20
src/test/java/com/bwssystems/fhem/test/HttpTestHandler.java
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
package com.bwssystems.fhem.test;
|
||||||
|
|
||||||
|
import com.bwssystems.HABridge.api.NameValue;
|
||||||
|
import com.bwssystems.HABridge.plugins.http.HTTPHandler;
|
||||||
|
|
||||||
|
public class HttpTestHandler extends HTTPHandler {
|
||||||
|
private String theData;
|
||||||
|
|
||||||
|
public String getTheData() {
|
||||||
|
return theData;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTheData(String theData) {
|
||||||
|
this.theData = theData;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String doHttpRequest(String url, String httpVerb, String contentType, String body, NameValue[] headers) {
|
||||||
|
return theData;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user