diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js
index 8eea24e5a..5b3e76834 100644
--- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js
@@ -29,8 +29,6 @@ $('body').on('hidden.bs.modal', '.modal', function () {
/*Map layer configurations*/
var map;
-initialLoad();
-
function initialLoad() {
if (document.getElementById('map') == null) {
setTimeout(initialLoad, 500); // give everything some time to render
@@ -47,17 +45,18 @@ function initialLoad() {
}
function setPageTitle() {
- var hash = window.parent.location.hash;
- if(hash) {
- var startIdx = hash.indexOf("/") + 1;
- var lastIdx = hash.length;
- var deviceInfoString = hash.substring(startIdx,lastIdx);
- var deviceInfo = JSON.parse(deviceInfoString);
- if(deviceInfo) {
- var newTitle = "[ " + deviceInfo.device.id + "]" + " - Geo Dashboard [" + deviceInfo.device.type + "]";
- window.parent.document.title = newTitle;
- }
- }
+ var hash = window.parent.location.hash;
+ if(hash) {
+ var startIdx = hash.indexOf("/") + 1;
+ var lastIdx = hash.length;
+ var deviceInfoString = hash.substring(startIdx,lastIdx);
+ var deviceInfo = JSON.parse(deviceInfoString);
+ if(deviceInfo) {
+ var newTitle = "[ " + deviceInfo.device.id + "]" + " - Geo Dashboard [" + deviceInfo.device.type + "]";
+ window.parent.document.title = newTitle;
+ $("#title").val(newTitle)
+ }
+ }
}
//function success(position) {
@@ -98,12 +97,12 @@ function initializeMap() {
zoom: 14,
center: [6.927078, 79.861243],
layers: [defaultOSM, defaultTFL],
- zoomControl: false,
+ zoomControl: true,
attributionControl: false,
maxZoom: 20,
maxNativeZoom: 18
});
-
+ map.zoomControl.setPosition('bottomleft');
map.on('click', function (e) {
$.UIkit.offcanvas.hide();//[force = false] no animation
});
@@ -354,6 +353,66 @@ function enableRealTime() {
isBatchModeOn = false;
}
+function InitSpatialObject() {
+ var fromDate = new Date();
+ fromDate.setHours(fromDate.getHours() - 2);
+ var toDate = new Date();
+ console.log(fromDate + " " + toDate);
+ var tableData = getProviderData(fromDate.valueOf(), toDate.valueOf());
+ for (var i = 0; i < tableData.length; i++) {
+ var data = tableData[i];
+ var geoMessage = {
+ "messageType": "Point",
+ "type": "Feature",
+ "id": data.id,
+ "deviceId": data.id,
+ "deviceType": data.type,
+ "properties": {
+ "speed": data.speed,
+ "heading": data.heading,
+ "state": data.state,
+ "information": data.information,
+ "notify": data.notify,
+ "type": data.type
+ },
+ "geometry": {
+ "type": "Point",
+ "coordinates": [data.longitude, data.latitude]
+ }
+ };
+ processPointMessage(geoMessage);
+ }
+ var spatialObject = currentSpatialObjects[deviceId];// (local)
+ if (!spatialObject) {
+ $.UIkit.notify({
+ message: "Spatial Object
" + deviceId + " not in the Map!!",
+ status: 'warning',
+ timeout: ApplicationOptions.constance.NOTIFY_WARNING_TIMEOUT,
+ pos: 'top-center'
+ });
+ return false;
+ }
+ selectedSpatialObject = deviceId;
+ if (spatialObject.type == "area") {
+ spatialObject.focusOn(map);
+ return true;
+ }
+
+ map.setView(spatialObject.marker.getLatLng(), 15, {animate: true}); // TODO: check the map._layersMaxZoom and set the zoom level accordingly
+
+ $('#objectInfo').find('#objectInfoId').html(selectedSpatialObject);
+ spatialObject.marker.openPopup();
+ if (!toggled) {
+ $('#objectInfo').animate({width: 'toggle'}, 100);
+ toggled = true;
+ }
+ spatialObject.drawPath();
+ setTimeout(function () {
+ createChart();
+ chart.load({columns: [spatialObject.speedHistory.getArray()]});
+ }, 100);
+}
+
function focusOnHistorySpatialObject(objectId, timeFrom, timeTo) {
if (!timeFrom) {
notifyError('No start time provided to show history. Please provide a suitable value' + timeFrom);
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js
index ced06d049..8f10a9334 100644
--- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js
@@ -602,6 +602,8 @@ var webSocketOnAlertError = function (e) {
var webSocketOnOpen = function () {
websocket.set_opened();
+ initialLoad();
+ InitSpatialObject();
$.UIkit.notify({
message: 'You Are Connected to Spatial Stream !!',
status: 'success',
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataReceiverManager.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataReceiverManager.java
index 9b6c2f15b..e74362b4e 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataReceiverManager.java
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataReceiverManager.java
@@ -101,6 +101,7 @@ public class SenseDataReceiverManager {
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED);
intentFilter.addAction(Intent.ACTION_NEW_OUTGOING_CALL);
+ intentFilter.setPriority(1000);
context.registerReceiver(callDataReceiver, intentFilter);
}
@@ -149,6 +150,7 @@ public class SenseDataReceiverManager {
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(Telephony.Sms.Intents.SMS_RECEIVED_ACTION);
intentFilter.addAction(Telephony.Sms.Intents.SMS_DELIVER_ACTION);
+ intentFilter.setPriority(1000);
context.registerReceiver(smsDataReceiver, intentFilter);
}
}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json
index 41eaafb20..58a1b2718 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json
@@ -56,13 +56,6 @@
"ishidden": false,
"subordinates": [],
"title": "Communication"
- },
- {
- "id": "test",
- "isanon": false,
- "ishidden": false,
- "title": "Test",
- "subordinates": []
}
],
"pages": [
@@ -1299,151 +1292,6 @@
"fluidLayout": false
},
"title": "Communication"
- },
- {
- "id": "test",
- "title": "Test",
- "layout": {
- "content": {
- "loggedIn": {
- "blocks": [
- {
- "id": "49cada6f023f237c953761b597752212",
- "x": 0,
- "y": 1,
- "width": 5,
- "height": 1,
- "banner": false
- },
- {
- "id": "a26d2f62dbb0011edf13371a2eb3cdd1",
- "x": 0,
- "y": 0,
- "width": 3,
- "height": 1,
- "banner": false
- }
- ]
- }
- },
- "fluidLayout": false
- },
- "isanon": false,
- "content": {
- "default": {
- "49cada6f023f237c953761b597752212": [
- {
- "id": "date-picker-widget-0",
- "content": {
- "id": "date-picker-widget",
- "title": "Date Picker Widget",
- "type": "widget",
- "category": "Widgets",
- "thumbnail": "fs://gadget/date-picker-widget/index.png",
- "data": {
- "url": "fs://gadget/date-picker-widget/index.xml"
- },
- "options": {},
- "styles": {
- "no_heading": true,
- "hide_gadget": false,
- "titlePosition": "left",
- "title": "Date Picker Widget"
- },
- "notify": {
- "date-selected": {
- "type": "message",
- "description": "This notifies selected date"
- }
- },
- "locale_titles": {
- "en-US": "Date Picker Widget"
- },
- "settings": {
- "priority": "5",
- "timeoutInterval": "60000"
- }
- }
- }
- ],
- "33faa57accead8af549c70f111face99": [
- {
- "id": "EsbAnalytics-Gadget-Search_Box-0",
- "content": {
- "id": "EsbAnalytics-Gadget-Search_Box",
- "title": "Search Box",
- "type": "widget",
- "category": "Widgets",
- "thumbnail": "fs://gadget/usa-business-revenue/index.png",
- "data": {
- "url": "fs://gadget/EsbAnalytics-Gadget-Search_Box/index.xml"
- },
- "styles": {
- "no_heading": true,
- "hide_gadget": false,
- "titlePosition": "left",
- "title": "Search Box"
- },
- "toolbarButtons": {
- "default": {
- "maximize": false,
- "configurations": false
- },
- "custom": [],
- "isDropdownView": false
- },
- "options": {},
- "locale_titles": {
- "en-US": "Search Box"
- },
- "settings": {
- "priority": "5",
- "timeoutInterval": "60000"
- }
- }
- }
- ],
- "be290fcc084ff118decc23588febc2ed": [],
- "a26d2f62dbb0011edf13371a2eb3cdd1": [
- {
- "id": "Android_Device_SearchBox-0",
- "content": {
- "id": "Android_Device_SearchBox",
- "title": "Search Box",
- "type": "gadget",
- "category": "Gadgets",
- "thumbnail": "fs://gadget/usa-business-revenue/index.png",
- "data": {
- "url": "fs://gadget/Android_Device_SearchBox/index.xml"
- },
- "styles": {
- "no_heading": true,
- "hide_gadget": false,
- "titlePosition": "left",
- "title": "Search Box"
- },
- "toolbarButtons": {
- "default": {
- "maximize": false,
- "configurations": false
- },
- "custom": [],
- "isDropdownView": false
- },
- "options": {},
- "locale_titles": {
- "en-US": "Search Box"
- },
- "settings": {
- "priority": "5",
- "timeoutInterval": "60000"
- }
- }
- }
- ]
- },
- "anon": {}
- }
}
],
"permissions": {
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
index b259eb6b5..aca23b632 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
@@ -69,6 +69,8 @@ import javax.ws.rs.core.Response;
)
}
)
+@Api(value = "Android Sense Device Management",
+ description = "This carries all the resources related to the Android sense device management functionalities.")
public interface AndroidSenseService {
/**
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
index e23f3c0c1..628f5fc11 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.device-view/device-view.hbs
@@ -44,7 +44,7 @@
Operations Log
Map
+ aria-controls="geo_dashboard">Geo Fencing
{{/zone}}
{{#zone "device-view-tab-contents"}}
@@ -77,18 +77,18 @@