mirror of
https://github.com/bwssytems/ha-bridge.git
synced 2025-12-16 18:24:36 +00:00
Mozilla IOT changed Thing JSON object already for name to title
This commit is contained in:
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.3.0RC7</version>
|
<version>5.3.0RC8</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>HA Bridge</name>
|
<name>HA Bridge</name>
|
||||||
|
|||||||
@@ -7,9 +7,9 @@ import com.google.gson.annotations.SerializedName;
|
|||||||
|
|
||||||
public class MozillaThing {
|
public class MozillaThing {
|
||||||
|
|
||||||
@SerializedName("name")
|
@SerializedName("title")
|
||||||
@Expose
|
@Expose
|
||||||
private String name;
|
private String title;
|
||||||
@SerializedName("type")
|
@SerializedName("type")
|
||||||
@Expose
|
@Expose
|
||||||
private String type;
|
private String type;
|
||||||
@@ -47,14 +47,6 @@ public class MozillaThing {
|
|||||||
@Expose
|
@Expose
|
||||||
private Object iconHref;
|
private Object iconHref;
|
||||||
|
|
||||||
public String getName() {
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setName(String name) {
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getType() {
|
public String getType() {
|
||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
@@ -151,4 +143,12 @@ public class MozillaThing {
|
|||||||
this.iconHref = iconHref;
|
this.iconHref = iconHref;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getTitle() {
|
||||||
|
return title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTitle(String title) {
|
||||||
|
this.title = title;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h2 class="panel-title">HomeGenie show Device List
|
<h2 class="panel-title">HomeGenie show device List
|
||||||
({{bridge.homegeniedevices.length}})</h2>
|
({{bridge.homegeniedevices.length}})</h2>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
@@ -96,7 +96,7 @@
|
|||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h2 class="panel-title">
|
<h2 class="panel-title">
|
||||||
Already Configured OpenHAB Devices <a ng-click="toggleButtons()"><span class={{imgButtonsUrl}}
|
Already Configured HomeGenie Devices <a ng-click="toggleButtons()"><span class={{imgButtonsUrl}}
|
||||||
aria-hidden="true"></span></a></a>
|
aria-hidden="true"></span></a></a>
|
||||||
</h2>
|
</h2>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -75,7 +75,7 @@
|
|||||||
<td><input type="checkbox" name="bulk.devices[]" value="{{moziotdevice.deviceDetail.name}}"
|
<td><input type="checkbox" name="bulk.devices[]" value="{{moziotdevice.deviceDetail.name}}"
|
||||||
ng-checked="bulk.devices.indexOf(moziotdevice.deviceDetail.name) > -1"
|
ng-checked="bulk.devices.indexOf(moziotdevice.deviceDetail.name) > -1"
|
||||||
ng-click="toggleSelection(moziotdevice.deviceDetail.name)">
|
ng-click="toggleSelection(moziotdevice.deviceDetail.name)">
|
||||||
{{moziotdevice.deviceDetail.name}}</td>
|
{{moziotdevice.deviceDetail.title}}</td>
|
||||||
<td>{{moziotdevice.deviceDetail.type}}</td>
|
<td>{{moziotdevice.deviceDetail.type}}</td>
|
||||||
<td>{{moziotdevice.gatewayName}}</td>
|
<td>{{moziotdevice.gatewayName}}</td>
|
||||||
<td>
|
<td>
|
||||||
@@ -104,7 +104,7 @@
|
|||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h2 class="panel-title">
|
<h2 class="panel-title">
|
||||||
Already Configured OpenHAB Devices <a ng-click="toggleButtons()"><span class={{imgButtonsUrl}}
|
Already Configured Mozilla IOT Devices <a ng-click="toggleButtons()"><span class={{imgButtonsUrl}}
|
||||||
aria-hidden="true"></span></a></a>
|
aria-hidden="true"></span></a></a>
|
||||||
</h2>
|
</h2>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user