turcy
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #80 from menaka121/IoTS-1.0.0-M1

Browse Source 
Fixed light proximity and pressure data sending problem
Ruwan 9 years ago
parent 6c3b60998a d31b91df28
commit 6d59d930c3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File

11
components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/AndroidSenseService.java
Unescape View File

@ -285,7 +285,6 @@ public class AndroidSenseService {
switch (androidSensorId){ switch (androidSensorId){
case 1: case 1:
streamDef = ACCELEROMETER_STREAM_DEFINITION; streamDef = ACCELEROMETER_STREAM_DEFINITION;
gValuesF[0] = Float.parseFloat(valuesM[0]) * Float.parseFloat(valuesM[0]) * Float gValuesF[0] = Float.parseFloat(valuesM[0]) * Float.parseFloat(valuesM[0]) * Float
.parseFloat(valuesM[0]); .parseFloat(valuesM[0]);
payloadData = gValuesF; payloadData = gValuesF;
@ -308,17 +307,17 @@ public class AndroidSenseService {
case 5: case 5:
streamDef = LIGHT_STREAM_DEFINITION; streamDef = LIGHT_STREAM_DEFINITION;
sensorName = SENSOR_LIGHT; sensorName = SENSOR_LIGHT;
payloadData = new Float[]{Float.parseFloat(sensor.value)}; payloadData = new Float[]{Float.parseFloat(valuesM[0])};
break; break;
case 6: case 6:
streamDef = PRESSURE_STREAM_DEFINITION; streamDef = PRESSURE_STREAM_DEFINITION;
sensorName = SENSOR_PRESSURE; sensorName = SENSOR_PRESSURE;
payloadData = new Float[]{Float.parseFloat(sensor.value)}; payloadData = new Float[]{Float.parseFloat(valuesM[0])};
break; break;
case 8: case 8:
streamDef = PROXIMITY_STREAM_DEFINITION; streamDef = PROXIMITY_STREAM_DEFINITION;
sensorName = SENSOR_PROXIMITY; sensorName = SENSOR_PROXIMITY;
payloadData = new Float[]{Float.parseFloat(sensor.value)}; payloadData = new Float[]{Float.parseFloat(valuesM[0])};
break; break;
case 9: case 9:
streamDef = GRAVITY_STREAM_DEFINITION; streamDef = GRAVITY_STREAM_DEFINITION;
@ -341,13 +340,13 @@ public class AndroidSenseService {
} }
} }
Object metdaData[] = {dataMsg.owner, AndroidSenseConstants.DEVICE_TYPE, dataMsg.deviceId, sensor.time}; Object metaData[] = {dataMsg.owner, AndroidSenseConstants.DEVICE_TYPE, dataMsg.deviceId, sensor.time};
if (streamDef != null && payloadData != null && payloadData.length > 0) { if (streamDef != null && payloadData != null && payloadData.length > 0) {
try { try {
SensorDataManager.getInstance() SensorDataManager.getInstance()
.setSensorRecord(dataMsg.deviceId, sensorName, sensor.value, sensor.time); .setSensorRecord(dataMsg.deviceId, sensorName, sensor.value, sensor.time);
deviceAnalyticsService.publishEvent(streamDef, "1.0.0", metdaData, new Object[0], payloadData); deviceAnalyticsService.publishEvent(streamDef, "1.0.0", metaData, new Object[0], payloadData);
} catch (DataPublisherConfigurationException e) { } catch (DataPublisherConfigurationException e) {
response.setStatus(Response.Status.UNSUPPORTED_MEDIA_TYPE.getStatusCode()); response.setStatus(Response.Status.UNSUPPORTED_MEDIA_TYPE.getStatusCode());
} }

Write Preview
Loading…
Cancel
Save