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

Merge branch 'IoTS-1.0.0-M1' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0-M1

Browse Source
charithag 9 years ago
parent 44c1faf9af 1d245e0f40
commit f036472212
10 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File

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

@ -211,7 +211,8 @@ public class AndroidSenseService {
@GET
@Consumes("application/json")
@Produces("application/json")
@Feature(code = "readbattery", name = "Battery", description = "Read Battery data from the device", type = "monitor")
@Feature(code = "readbattery", name = "Battery", description = "Read Battery data from the device",
type = "monitor")
public SensorRecord readBattery(
@HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
@Context HttpServletResponse response) {
@ -251,7 +252,8 @@ public class AndroidSenseService {
@GET
@Consumes("application/json")
@Produces("application/json")
@Feature(code = "readmagnetic", name = "Magnetic", description = "Read Magnetic data from the device", type = "monitor")
@Feature(code = "readmagnetic", name = "Magnetic", description = "Read Magnetic data from the device",
type = "monitor")
public SensorRecord readMagnetic(
@HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
@Context HttpServletResponse response) {
@ -271,7 +273,8 @@ public class AndroidSenseService {
@GET
@Consumes("application/json")
@Produces("application/json")
@Feature(code = "readaccelerometer", name = "Accelerometer", description = "Read Accelerometer data from the device", type = "monitor")
@Feature(code = "readaccelerometer", name = "Accelerometer", description = "Read Accelerometer data from the " +
"device", type = "monitor")
public SensorRecord readAccelerometer(
@HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
@Context HttpServletResponse response) {
@ -291,7 +294,8 @@ public class AndroidSenseService {
@GET
@Consumes("application/json")
@Produces("application/json")
@Feature(code = "readrotation", name = "Rotation", description = "Read Rotational Vector data from the device", type = "monitor")
@Feature(code = "readrotation", name = "Rotation", description = "Read Rotational Vector data from the device",
type = "monitor")
public SensorRecord readRotation(
@HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
@Context HttpServletResponse response) {
@ -311,7 +315,8 @@ public class AndroidSenseService {
@GET
@Consumes("application/json")
@Produces("application/json")
@Feature(code = "readproximity", name = "Proximity", description = "Read Proximity data from the device", type = "monitor")
@Feature(code = "readproximity", name = "Proximity", description = "Read Proximity data from the device",
type = "monitor")
public SensorRecord readProximity(
@HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
@Context HttpServletResponse response) {
@ -331,7 +336,8 @@ public class AndroidSenseService {
@GET
@Consumes("application/json")
@Produces("application/json")
@Feature(code = "readgyroscope", name = "Gyroscope", description = "Read Gyroscope data from the device", type = "monitor")
@Feature(code = "readgyroscope", name = "Gyroscope", description = "Read Gyroscope data from the device",
type = "monitor")
public SensorRecord readGyroscope(
@HeaderParam("owner") String owner, @HeaderParam("deviceId") String deviceId,
@Context HttpServletResponse response) {

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

@ -71,7 +71,8 @@ public class AndroidSenseService {
public boolean register(@FormParam("username") String username,
@FormParam("password") String password,
@FormParam("deviceId") String deviceId,
@FormParam("owner") String owner) {
@FormParam("owner") String owner,
@FormParam("deviceName") String deviceName) {
DeviceManagement deviceManagement = new DeviceManagement(SUPER_TENANT);
@ -114,8 +115,7 @@ public class AndroidSenseService {
enrolmentInfo.setDateOfLastUpdate(new Date().getTime());
enrolmentInfo.setStatus(EnrolmentInfo.Status.ACTIVE);
enrolmentInfo.setOwnership(EnrolmentInfo.OwnerShip.BYOD);
String name = owner + " android " + deviceId;
device.setName(name);
device.setName(deviceName);
device.setType(AndroidSenseConstants.DEVICE_TYPE);
enrolmentInfo.setOwner(owner);
device.setEnrolmentInfo(enrolmentInfo);

2
components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.mgt.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/VirtualFireAlarmService.java
Unescape View File

@ -343,7 +343,7 @@ public class VirtualFireAlarmService {
KeyGenerationUtil.createApplicationKeys("virtual_firealarm");
TokenClient accessTokenClient = new TokenClient(VirtualFireAlarmConstants.DEVICE_TYPE);
AccessTokenInfo accessTokenInfo = accessTokenClient.getAccessToken(owner, deviceId);
AccessTokenInfo A = accessTokenClient.getAccessToken(owner, deviceId);
//create token
String accessToken = accessTokenInfo.getAccess_token();

BIN
features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/images/myDevices_analytics.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 742 KiB

After

Width:  |  Height:  |  Size: 162 KiB

6
features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs
Unescape View File

@ -1,7 +1,6 @@
<div class="col-lg-12 margin-top-double">
<h1 class="grey ">Android Sense</h1>
<hr>
<p class="margin-bottom-double light-grey ">Connect your Android device to the WSO2 IoT Server.</p>
</div>
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
@ -10,6 +9,11 @@
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
<h3 class="uppercase">What it Does</h3>
<hr>
<p class="grey margin-top">Enables users to connect an Android device to WSO2 IoT Server and visualize sensor data.</p>
<br>
<h3 class="uppercase">What You Need</h3>
<hr>
<p class="grey margin-top">You've got to just have an Android Device to get started.</p>

9
features/device-mgt-iot-arduino-feature/org.wso2.carbon.device.mgt.iot.arduino.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs
Unescape View File

@ -1,7 +1,6 @@
<div class="col-lg-12 margin-top-double">
<h1 class="grey ">Arduino</h1>
<hr>
<p class="margin-bottom-double light-grey ">Connect your Arduino device to the WSO2 IoT Server.</p>
</div>
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
@ -10,6 +9,11 @@
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
<h3 class="uppercase">What it Does</h3>
<hr>
<p class="grey margin-top">Enables users to connect devices built around Arduino Boards to WSO2 IoT Server and visualize sensor data.</p>
<br>
<h3 class="uppercase">What You Need</h3>
<hr>
<p class="grey margin-top">You'll need the following "Hardware":</p>
@ -23,7 +27,8 @@
13. <i>(If not available, will use the one on
the board.)</i>
</li>
<li class="padding-top-double"><span class="circle">GO-TO PREPARE</span></li>
<li class="padding-top-double"><span class="circle">STEP 04</span>&nbsp;&nbsp;&nbsp;Proceed to the [Prepare]
section.
</ul>
<br>

9
features/device-mgt-iot-digitaldisplay-feature/org.wso2.carbon.device.mgt.iot.digitaldisplay.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs
Unescape View File

@ -1,7 +1,6 @@
<div class="col-lg-12 margin-top-double">
<h1 class="grey ">Digital Display</h1>
<hr>
<p class="margin-bottom-double light-grey ">Connect your Digital Display to the WSO2 IoT Server.</p>
</div>
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
@ -10,6 +9,11 @@
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
<h3 class="uppercase">What it Does</h3>
<hr>
<p class="grey margin-top">Enables users to connect a Digital Displays built around RaspberryPi Boards to WSO2 IoT Server and manage content.</p>
<br>
<h3 class="uppercase">What You Need</h3>
<hr>
<p class="grey margin-top">You'll need the following "Hardware":</p>
@ -20,7 +24,8 @@
<li class="padding-top-double"><span class="circle">ITEM 02</span>&nbsp;&nbsp;&nbsp;A Digital Display with HDMI
Cable.
</li>
<li class="padding-top-double"><span class="circle">GO-TO PREPARE</span></li>
<li class="padding-top-double"><span class="circle">STEP 03</span>&nbsp;&nbsp;&nbsp;Proceed to the [Prepare]
section.
</ul>
<br>

11
features/device-mgt-iot-droneanalyzer-feature/org.wso2.carbon.device.mgt.iot.droneanalyzer.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone_analyzer.type-view/type-view.hbs
Unescape View File

@ -1,7 +1,6 @@
<div class="col-lg-12 margin-top-double">
<h1 class="grey ">Drone Analyzer</h1>
<hr>
<p class="margin-bottom-double light-grey ">Connect your Drone to the WSO2 IoT Server.</p>
</div>
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
@ -10,6 +9,11 @@
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
<h3 class="uppercase">What it Does</h3>
<hr>
<p class="grey margin-top">Enables users to connect a IRIS+ Drones to WSO2 IoT Server and visualize statistics.</p>
<br>
<h3 class="uppercase">What You Need</h3>
<hr>
<p class="grey margin-top">You'll need the following "Hardware":</p>
@ -19,7 +23,8 @@
<li class="padding-top-double"><span class="circle">ITEM 02</span>&nbsp;&nbsp;&nbsp;USB to Micro USB cable or
Telemetry Radio receiver.
</li>
<li class="padding-top-double"><span class="circle">GO-TO PREPARE</span></li>
<li class="padding-top-double"><span class="circle">STEP 03</span>&nbsp;&nbsp;&nbsp;Proceed to the [Prepare]
section.
</ul>
<br>
@ -157,7 +162,7 @@
<li class="padding-top-double"><span class="circle">02</span>&nbsp;&nbsp;&nbsp;Click on the [Download] button
above to get the IRIS+ Drone setup files.
</li>
<li class="padding-top-double"><span class="circle">04</span>&nbsp;&nbsp;&nbsp;Connecting the drone:</li>
<li class="padding-top-double"><span class="circle">03</span>&nbsp;&nbsp;&nbsp;Connecting the drone:</li>
<div class="padding-top-double">
<table class="table table-bordered ">

9
features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
Unescape View File

@ -1,7 +1,6 @@
<div class="col-lg-12 margin-top-double">
<h1 class="grey ">Raspberry Pi</h1>
<hr>
<p class="margin-bottom-double light-grey ">Connect your Raspberry Pi device to the WSO2 IoT Server.</p>
</div>
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
@ -10,6 +9,11 @@
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
<h3 class="uppercase">What it Does</h3>
<hr>
<p class="grey margin-top">Enables users to connect a RaspberryPi based device to WSO2 IoT Server.</p>
<br>
<h3 class="uppercase">What You Need</h3>
<hr>
<p class="grey margin-top">You'll need the following "Hardware":</p>
@ -22,7 +26,8 @@
</li>
<li class="padding-top-double"><span class="circle">ITEM 03</span>&nbsp;&nbsp;&nbsp;An LED Bulb.
</li>
<li class="padding-top-double"><span class="circle">GO-TO PREPARE</span></li>
<li class="padding-top-double"><span class="circle">STEP 04</span>&nbsp;&nbsp;&nbsp;Proceed to the [Prepare]
section.
</ul>
<br>

12
features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
Unescape View File

@ -1,8 +1,6 @@
<div class="col-lg-12 margin-top-double">
<h1 class="grey ">Virtual Firealrm</h1>
<h1 class="grey ">Virtual Firealarm</h1>
<hr>
<p class="margin-bottom-double light-grey ">Use our Virtual Instance of a FireAlarm and connect to the WSO2-IoT
Server.</p>
</div>
<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
@ -10,6 +8,12 @@
</div>
<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
<h3 class="uppercase">What it Does</h3>
<hr>
<p class="grey margin-top">Provides users with a Virtual Agent that mimics the functionality of a Firealarm. Once run, the Virtual Firealarm will connect to WSO2 IoTServer and push Temperature readings.</p>
<br>
<h3 class="uppercase">What You Need</h3>
<hr>
<p class="grey margin-top">VirtualFireAlarm is a "Virtual" Device for you to try-out our server.</p>
@ -261,4 +265,4 @@
{{#zone "bottomJs"}}
{{js "/js/download.js"}}
{{js "/js/jquery.validate.js"}}
{{/zone}}
{{/zone}}

Write Preview
Loading…
Cancel
Save