Update with device-cloud changes

merge-requests/1/head
charithag 9 years ago
parent 115f4ce0ea
commit 220b25a4ef

@ -314,6 +314,7 @@
</outputDirectory>
<excludes>
<exclude>store/extensions/app/store-device/*</exclude>
<exclude>store/themes/store/partials/product-title.hbs</exclude>
<exclude>publisher/config/publisher-tenant.json</exclude>
</excludes>
</fileSet>

@ -117,9 +117,9 @@ if (uriMatcher.match("/{context}/api/device/sketch/download/{downloadId}")) {
exit();//stop execution
}
//URL: https://localhost:9443/devicecloud/manager/devices/username/{username}
//URL: https://localhost:9443/devicecloud/device_manager/device/user/{username}/all
deviceCloudService = carbonHttpsServletTransport + "/common/device_manager";
listAllDevicesEndPoint = deviceCloudService + "/devices/username/" + user.username;
listAllDevicesEndPoint = deviceCloudService + "/device/user/" + user.username + "/all";
result = get(listAllDevicesEndPoint, {}, "json");
var ownDevices = result.data;
@ -160,9 +160,9 @@ if (uriMatcher.match("/{context}/api/device/sketch/download/{downloadId}")) {
exit();//stop execution
}
//URL: https://localhost:9443/devicecloud/manager/devices/username/{username}
//URL: https://localhost:9443/devicecloud/device_manager/device/user/{username}/all/count
deviceCloudService = carbonHttpsServletTransport + "/common/device_manager";
listAllDevicesEndPoint = deviceCloudService + "/devices/username/" + user.username;
listAllDevicesEndPoint = deviceCloudService + "/device/user/" + user.username + "/all/count";
result = get(listAllDevicesEndPoint, {}, "json");
var ownDevices = result.data;

@ -74,8 +74,8 @@ if (!user) {
}
function getDeviceData(deviceType, deviceId) {
//URL: GET https://localhost:9443/devicecloud/group_manager/group/id/{groupId}/device/all
var endPoint = deviceCloudDeviceService + "/devices/" + deviceType + "/" + deviceId;
//URL: GET https://localhost:9443/devicecloud/device_manager/device/type/{type}/identifier/{identifier}
var endPoint = deviceCloudDeviceService + "/device/type/" + deviceType + "/identifier/" + deviceId;
var data = {"username": user.username};
var device = get(endPoint, data, "json").data;
if (!device) {

@ -0,0 +1,2 @@
<h2 class="app-title hidden-xs-320" style="text-transform: none !important;">{{t "IoT Server"}}</h2>
<h2 class="app-title visible-xs-320">{{t "ES"}}</h2>
Loading…
Cancel
Save