Ranged iBeacons

revert-dabc3590
Waruna Samarsinghe 9 years ago
parent f3f28c544f
commit 32c4a34283

@ -9,6 +9,7 @@ android {
targetSdkVersion 22 targetSdkVersion 22
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
} }
buildTypes { buildTypes {
release { release {
@ -31,10 +32,14 @@ android {
} }
productFlavors { productFlavors {
} }
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
} }
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:22.2.1' compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:design:22.2.1' compile 'com.android.support:design:22.2.1'
compile 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2' compile 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2'
@ -42,5 +47,5 @@ dependencies {
compile 'commons-codec:commons-codec:1.4' compile 'commons-codec:commons-codec:1.4'
compile 'com.netflix.feign:feign-jaxrs:8.16.0' compile 'com.netflix.feign:feign-jaxrs:8.16.0'
compile 'com.netflix.feign:feign-jackson:8.16.0' compile 'com.netflix.feign:feign-jackson:8.16.0'
compile 'org.altbeacon:android-beacon-library:2.8.1'
} }

@ -13,6 +13,10 @@
<uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-sdk android:minSdkVersion="19" /> <uses-sdk android:minSdkVersion="19" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<application <application
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/wso2logo" android:icon="@mipmap/wso2logo"
@ -68,6 +72,12 @@
android:label="Speech Recongnizer" android:label="Speech Recongnizer"
android:theme="@style/AppTheme.NoActionBar" > android:theme="@style/AppTheme.NoActionBar" >
</activity> </activity>
<activity
android:name="org.wso2.carbon.iot.android.sense.beacon.MonitoringActivity"
android:label="Beacon Monitor"
android:theme="@style/AppTheme.NoActionBar" >
</activity>
</application> </application>
</manifest> </manifest>

@ -0,0 +1,105 @@
package org.wso2.carbon.iot.android.sense.beacon;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.Service;
import android.content.Context;
import android.content.Intent;
import android.os.Handler;
import android.os.IBinder;
import android.os.RemoteException;
import android.support.v4.app.NotificationCompat;
import android.util.Log;
import agent.sense.android.iot.carbon.wso2.org.wso2_senseagent.R;
import org.altbeacon.beacon.BeaconConsumer;
import org.altbeacon.beacon.BeaconManager;
import org.altbeacon.beacon.MonitorNotifier;
import org.altbeacon.beacon.Region;
public class BeaconDetactorService extends Service implements BeaconConsumer {
private BeaconManager iBeaconManager = BeaconManager.getInstanceForApplication(this);
@Override
public IBinder onBind(Intent arg0) {
return null;
}
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
return START_STICKY;
}
@Override
public void onCreate() {
super.onCreate();
iBeaconManager.bind(this);
final Handler handler = new Handler();
final Runnable runnable = new Runnable() {
@Override
public void run() {
stopSelf();
}
};
handler.postDelayed(runnable, 10000);
}
@Override
public void onDestroy() {
iBeaconManager.unbind(this);
super.onDestroy();
}
@Override
public void onBeaconServiceConnect() {
iBeaconManager.setMonitorNotifier(new MonitorNotifier() {
@Override
public void didEnterRegion(Region region) {
Log.e("BeaconDetactorService", "didEnterRegion");
generateNotification(BeaconDetactorService.this, region.getUniqueId()
+ ": just saw this iBeacon for the first time");
}
@Override
public void didExitRegion(Region region) {
Log.e("BeaconDetactorService", "didExitRegion");
generateNotification(BeaconDetactorService.this, region.getUniqueId() + ": is no longer visible");
}
@Override
public void didDetermineStateForRegion(int state, Region region) {
Log.e("BeaconDetactorService", "didDetermineStateForRegion:" + state);
}
});
try {
iBeaconManager.startMonitoringBeaconsInRegion(new Region("myMonitoringUniqueId", null, null, null));
} catch (RemoteException e) {
e.printStackTrace();
}
}
/**
* Issues a notification to inform the user that server has sent a message.
*/
private static void generateNotification(Context context, String message) {
Intent launchIntent = new Intent(context, MonitoringActivity.class).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP
| Intent.FLAG_ACTIVITY_SINGLE_TOP);
((NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE)).notify(
0,
new NotificationCompat.Builder(context).setWhen(System.currentTimeMillis())
.setSmallIcon(R.drawable.beacon).setTicker(message)
.setContentTitle(context.getString(R.string.app_name)).setContentText(message)
.setContentIntent(PendingIntent.getActivity(context, 0, launchIntent, 0)).setAutoCancel(true)
.build());
}
}

@ -0,0 +1,55 @@
package org.wso2.carbon.iot.android.sense.beacon;
import java.util.Calendar;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import org.altbeacon.beacon.BeaconConsumer;
import org.altbeacon.beacon.BeaconManager;
public class BeaconServiceUtility {
private Context context;
private PendingIntent pintent;
private AlarmManager alarm;
private Intent iService;
public BeaconServiceUtility(Context context) {
super();
this.context = context;
iService = new Intent(context, BeaconDetactorService.class);
alarm = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
pintent = PendingIntent.getService(context, 0, iService, 0);
}
public void onStart(BeaconManager iBeaconManager, BeaconConsumer consumer) {
stopBackgroundScan();
iBeaconManager.bind(consumer);
}
public void onStop(BeaconManager iBeaconManager, BeaconConsumer consumer) {
iBeaconManager.unbind(consumer);
startBackgroundScan();
}
private void stopBackgroundScan() {
alarm.cancel(pintent);
context.stopService(iService);
}
private void startBackgroundScan() {
Calendar cal = Calendar.getInstance();
cal.add(Calendar.SECOND, 2);
alarm.setRepeating(AlarmManager.RTC_WAKEUP, cal.getTimeInMillis(), 360000, pintent); // 6*60 * 1000
context.startService(iService);
}
}

@ -0,0 +1,212 @@
/*
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and limitations under the License.
*
*/
package org.wso2.carbon.iot.android.sense.beacon;
import android.Manifest;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
import android.os.RemoteException;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import android.view.LayoutInflater;
import android.widget.BaseAdapter;
import org.altbeacon.beacon.BeaconConsumer;
import org.altbeacon.beacon.BeaconManager;
import org.altbeacon.beacon.Beacon;
import org.altbeacon.beacon.RangeNotifier;
import android.widget.ListView;
import android.widget.TextView;
import org.altbeacon.beacon.BeaconParser;
import org.altbeacon.beacon.MonitorNotifier;
import org.altbeacon.beacon.Region;
import java.util.ArrayList;
import java.util.Collection;
import agent.sense.android.iot.carbon.wso2.org.wso2_senseagent.R;
public class MonitoringActivity extends Activity implements BeaconConsumer {
protected static final String TAG = MonitoringActivity.class.getName();
private static final int PERMISSION_REQUEST_COARSE_LOCATION = 1;
private ListView list = null;
private BeaconAdapter adapter = null;
private ArrayList<Beacon> arrayL = new ArrayList<>();
private LayoutInflater inflater;
private BeaconServiceUtility beaconUtill = null;
private BeaconManager iBeaconManager = BeaconManager.getInstanceForApplication(this);
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_monitor);
beaconUtill = new BeaconServiceUtility(this);
list = (ListView) findViewById(R.id.list);
adapter = new BeaconAdapter();
list.setAdapter(adapter);
inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
}
@Override
protected void onDestroy() {
super.onDestroy();
}
@Override
protected void onStart() {
super.onStart();
beaconUtill.onStart(iBeaconManager, this);
}
@Override
protected void onStop() {
beaconUtill.onStop(iBeaconManager, this);
super.onStop();
}
@Override
public void onBeaconServiceConnect() {
iBeaconManager.setRangeNotifier(new RangeNotifier() {
@Override
public void didRangeBeaconsInRegion(Collection<Beacon> iBeacons, Region region) {
arrayL.clear();
arrayL.addAll((ArrayList<Beacon>) iBeacons);
// adapter.notifyDataSetChanged();
}
});
iBeaconManager.setMonitorNotifier(new MonitorNotifier() {
@Override
public void didEnterRegion(Region region) {
Log.e("BeaconDetactorService", "didEnterRegion");
// logStatus("I just saw an iBeacon for the first time!");
}
@Override
public void didExitRegion(Region region) {
Log.e("BeaconDetactorService", "didExitRegion");
// logStatus("I no longer see an iBeacon");
}
@Override
public void didDetermineStateForRegion(int state, Region region) {
Log.e("BeaconDetactorService", "didDetermineStateForRegion");
// logStatus("I have just switched from seeing/not seeing iBeacons: " + state);
}
});
try {
iBeaconManager.startRangingBeaconsInRegion(new Region("myRangingUniqueId", null, null, null));
} catch (RemoteException e) {
e.printStackTrace();
}
try {
iBeaconManager.startMonitoringBeaconsInRegion(new Region("myMonitoringUniqueId", null, null, null));
} catch (RemoteException e) {
e.printStackTrace();
}
}
private class BeaconAdapter extends BaseAdapter {
@Override
public int getCount() {
if (arrayL != null && arrayL.size() > 0)
return arrayL.size();
else
return 0;
}
@Override
public Beacon getItem(int arg0) {
return arrayL.get(arg0);
}
@Override
public long getItemId(int arg0) {
return arg0;
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
try {
ViewHolder holder;
if (convertView != null) {
holder = (ViewHolder) convertView.getTag();
} else {
holder = new ViewHolder(convertView = inflater.inflate(R.layout.tupple_monitoring, null));
}
if (arrayL.get(position).getId1() != null)
holder.beacon_uuid.setText("UUID: " + arrayL.get(position).getServiceUuid());
holder.beacon_major.setText("Major: " + arrayL.get(position).getId1());
holder.beacon_minor.setText(", Minor: " + arrayL.get(position).getId2());
holder.beacon_proximity.setText("Proximity: " + arrayL.get(position).getId3());
holder.beacon_rssi.setText(", Rssi: " + arrayL.get(position).getRssi());
holder.beacon_txpower.setText(", TxPower: " + arrayL.get(position).getTxPower());
holder.beacon_range.setText("" + arrayL.get(position).getDistance());
} catch (Exception e) {
e.printStackTrace();
}
return convertView;
}
private class ViewHolder {
private TextView beacon_uuid;
private TextView beacon_major;
private TextView beacon_minor;
private TextView beacon_proximity;
private TextView beacon_rssi;
private TextView beacon_txpower;
private TextView beacon_range;
public ViewHolder(View view) {
beacon_uuid = (TextView) view.findViewById(R.id.BEACON_uuid);
beacon_major = (TextView) view.findViewById(R.id.BEACON_major);
beacon_minor = (TextView) view.findViewById(R.id.BEACON_minor);
beacon_proximity = (TextView) view.findViewById(R.id.BEACON_proximity);
beacon_rssi = (TextView) view.findViewById(R.id.BEACON_rssi);
beacon_txpower = (TextView) view.findViewById(R.id.BEACON_txpower);
beacon_range = (TextView) view.findViewById(R.id.BEACON_range);
view.setTag(this);
}
}
}
}

@ -140,8 +140,9 @@ public class DataPublisherService extends Service {
for (SpeedData speedData : speedDataMap) { for (SpeedData speedData : speedDataMap) {
Event event = new Event(); Event event = new Event();
event.setTimestamp(speedData.getTimeStamp()); event.setTimestamp(speedData.getTimeStamp());
event.setSpeed(speedData.getSpeed());
event.setTurns(speedData.getTurns()); event.setTurns(speedData.getTurns());
event.setSpeed(speedData.getSpeed());
events.add(event); events.add(event);
} }
} }

@ -174,9 +174,7 @@ public class Event {
} }
public float getSpeed() { public float getSpeed() {
this.type = "speed"; this.type = "speed";
return speed; return speed;
} }
@ -209,14 +207,13 @@ public class Event {
double gpsEvents[] = getGps(); double gpsEvents[] = getGps();
jsonPayloadData.put("gps_lat", gpsEvents[0]); jsonPayloadData.put("gps_lat", gpsEvents[0]);
jsonPayloadData.put("gps_long", gpsEvents[1]); jsonPayloadData.put("gps_long", gpsEvents[1]);
//acceleromter //accelerometer
float events[] = getAccelerometer(); float events[] = getAccelerometer();
jsonPayloadData.put("accelerometer_x", events[0]); jsonPayloadData.put("accelerometer_x", events[0]);
jsonPayloadData.put("accelerometer_y", events[1]); jsonPayloadData.put("accelerometer_y", events[1]);
jsonPayloadData.put("accelerometer_z", events[2]); jsonPayloadData.put("accelerometer_z", events[2]);
//speed //speed
//if (getSpeed()>SPEED_LIMIT) { //if (getSpeed()>SPEED_LIMIT) {
jsonPayloadData.put("speed_limit", getSpeed()); jsonPayloadData.put("speed_limit", getSpeed());
//} //}

@ -40,7 +40,6 @@ public class LocationDataReader extends DataReader implements LocationListener {
static final Double EARTH_RADIUS = 6371.00; static final Double EARTH_RADIUS = 6371.00;
// flag for GPS status // flag for GPS status
private boolean isGPSEnabled = false; private boolean isGPSEnabled = false;
@ -176,8 +175,6 @@ public class LocationDataReader extends DataReader implements LocationListener {
time=c.get(Calendar.HOUR); time=c.get(Calendar.HOUR);
locationManager.removeUpdates(LocationDataReader.this); locationManager.removeUpdates(LocationDataReader.this);
//String Speed = "Device Speed: " +location.getSpeed(); //String Speed = "Device Speed: " +location.getSpeed();
latitude=location.getLongitude(); latitude=location.getLongitude();
@ -185,7 +182,6 @@ public class LocationDataReader extends DataReader implements LocationListener {
double distance =CalculationByDistance(latitude, longitude, lat_old, lon_old)/1000; double distance =CalculationByDistance(latitude, longitude, lat_old, lon_old)/1000;
speed = (float)distance/(float)time; speed = (float)distance/(float)time;
Toast.makeText(mContext, longitude+"\n"+latitude+"\nDistance is: " Toast.makeText(mContext, longitude+"\n"+latitude+"\nDistance is: "
+distance+"\nSpeed is: "+speed , Toast.LENGTH_SHORT).show(); +distance+"\nSpeed is: "+speed , Toast.LENGTH_SHORT).show();
@ -219,7 +215,6 @@ public class LocationDataReader extends DataReader implements LocationListener {
} }
@Override @Override
public void run() { public void run() {
Log.d(TAG, "running -Location"); Log.d(TAG, "running -Location");

@ -35,7 +35,8 @@ import android.view.View;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ListView; import android.widget.ListView;
import android.widget.Toast; import android.widget.Toast;
import android.app.AlertDialog;
import android.content.DialogInterface;
import org.wso2.carbon.iot.android.sense.RegisterActivity; import org.wso2.carbon.iot.android.sense.RegisterActivity;
import org.wso2.carbon.iot.android.sense.data.publisher.DataPublisherReceiver; import org.wso2.carbon.iot.android.sense.data.publisher.DataPublisherReceiver;
import org.wso2.carbon.iot.android.sense.data.publisher.DataPublisherService; import org.wso2.carbon.iot.android.sense.data.publisher.DataPublisherService;
@ -48,11 +49,13 @@ import org.wso2.carbon.iot.android.sense.realtimeviewer.sensorlisting.SupportedS
import org.wso2.carbon.iot.android.sense.realtimeviewer.view.adaptor.SensorViewAdaptor; import org.wso2.carbon.iot.android.sense.realtimeviewer.view.adaptor.SensorViewAdaptor;
import org.wso2.carbon.iot.android.sense.realtimeviewer.view.sensor.selector.SelectSensorDialog; import org.wso2.carbon.iot.android.sense.realtimeviewer.view.sensor.selector.SelectSensorDialog;
import org.wso2.carbon.iot.android.sense.speech.detector.WordRecognitionActivity; import org.wso2.carbon.iot.android.sense.speech.detector.WordRecognitionActivity;
import org.wso2.carbon.iot.android.sense.util.LocalRegistry; import org.wso2.carbon.iot.android.sense.beacon.MonitoringActivity;
import org.wso2.carbon.iot.android.sense.util.LocalRegistry;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.altbeacon.beacon.BeaconManager;
import agent.sense.android.iot.carbon.wso2.org.wso2_senseagent.R; import agent.sense.android.iot.carbon.wso2.org.wso2_senseagent.R;
@ -73,6 +76,8 @@ public class ActivitySelectSensor extends AppCompatActivity
private RealTimeSensorReader sensorReader = null; private RealTimeSensorReader sensorReader = null;
private RealTimeSensorChangeReceiver realTimeSensorChangeReceiver = new RealTimeSensorChangeReceiver(); private RealTimeSensorChangeReceiver realTimeSensorChangeReceiver = new RealTimeSensorChangeReceiver();
private SupportedSensors supportedSensors = SupportedSensors.getInstance(); private SupportedSensors supportedSensors = SupportedSensors.getInstance();
protected static final String TAG = ActivitySelectSensor.class.getName();
private static final int PERMISSION_REQUEST_COARSE_LOCATION = 1;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -85,6 +90,7 @@ public class ActivitySelectSensor extends AppCompatActivity
sessionIdText.setCursorVisible(false); sessionIdText.setCursorVisible(false);
listView = (ListView) findViewById(R.id.senseListContainer); listView = (ListView) findViewById(R.id.senseListContainer);
verifyBluetooth();
registerReceiver(realTimeSensorChangeReceiver, new IntentFilter("sensorDataMap")); registerReceiver(realTimeSensorChangeReceiver, new IntentFilter("sensorDataMap"));
@ -136,6 +142,18 @@ public class ActivitySelectSensor extends AppCompatActivity
} }
}); });
FloatingActionButton fbtnBeaconMonitor = (FloatingActionButton) findViewById(R.id.beacon);
fbtnBeaconMonitor.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(getApplicationContext(), MonitoringActivity.class);
startActivity(intent);
}
});
sharedPreferences = getSharedPreferences(SupportedSensors.SELECTED_SENSORS, 0); sharedPreferences = getSharedPreferences(SupportedSensors.SELECTED_SENSORS, 0);
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
@ -293,4 +311,44 @@ public class ActivitySelectSensor extends AppCompatActivity
public void unregisterReceivers() { public void unregisterReceivers() {
unregisterReceiver(realTimeSensorChangeReceiver); unregisterReceiver(realTimeSensorChangeReceiver);
} }
private void verifyBluetooth() {
try {
if (!BeaconManager.getInstanceForApplication(this).checkAvailability()) {
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Bluetooth not enabled");
builder.setMessage("Please enable bluetooth in settings and restart this application.");
builder.setPositiveButton(android.R.string.ok, null);
builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
finish();
System.exit(0);
}
});
builder.show();
}
} catch (RuntimeException e) {
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Bluetooth LE not available");
builder.setMessage("Sorry, this device does not support Bluetooth LE.");
builder.setPositiveButton(android.R.string.ok, null);
builder.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
finish();
System.exit(0);
}
});
builder.show();
}
}
} }

@ -51,7 +51,7 @@ public class SenseClient {
String responseStatus = response.get("status"); String responseStatus = response.get("status");
RegisterInfo registerInfo = new RegisterInfo(); RegisterInfo registerInfo = new RegisterInfo();
if (responseStatus.trim().contains(SenseConstants.Request.REQUEST_SUCCESSFUL)) { if (responseStatus.trim().contains(SenseConstants.Request.REQUEST_SUCCESSFUL)) {
registerInfo.setMsg("Login Succesful"); registerInfo.setMsg("Login Successful");
registerInfo.setIsRegistered(true); registerInfo.setIsRegistered(true);
return registerInfo; return registerInfo;
} else { } else {

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false">
<shape android:shape="oval">
<solid android:color="#fa09ad"/>
</shape>
</item>
<item android:state_pressed="true">
<shape android:shape="oval">
<solid android:color="#c20586"/>
</shape>
</item>
</selector>

@ -0,0 +1,22 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="5dip"
tools:context=".RangingActivity" >
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:gravity="center_horizontal"
android:text="Scanning..." />
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:divider="@android:color/darker_gray"
android:dividerHeight="1dip" />
</RelativeLayout>

@ -6,7 +6,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
tools:context="org.wso2.carbon.iot.android.sense.realtimeviewer.ActivitySelectSensor"> tools:context="org.wso2.carbon.iot.android.sense.realtimeviewer.ActivitySelectSensor"
android:touchscreenBlocksFocus="false">
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -24,30 +25,40 @@
<include layout="@layout/content_activity_select_sensor"/> <include layout="@layout/content_activity_select_sensor"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_gravity="bottom|center"
android:layout_height="wrap_content" >
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/publish" android:id="@+id/addSensors"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin" android:layout_margin="@dimen/fab_margin"
android:adjustViewBounds="false" android:src="@android:drawable/ic_input_add"/>
android:src="@drawable/pushtoserver"/>
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/speech" android:id="@+id/speech"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_margin="@dimen/fab_margin" android:layout_margin="@dimen/fab_margin"
android:src="@drawable/mic"/> android:src="@drawable/mic"/>
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/addSensors" android:id="@+id/beacon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|start"
android:layout_margin="@dimen/fab_margin" android:layout_margin="@dimen/fab_margin"
android:src="@android:drawable/ic_input_add"/> android:src="@drawable/beacon"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/publish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/fab_margin"
android:adjustViewBounds="false"
android:src="@drawable/pushtoserver"/>
</LinearLayout>
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<Button
android:layout_width="100dp"
android:layout_height="100dp"
android:background="@drawable/round_button"
android:gravity="center"
android:layout_marginTop="20dp"
android:layout_marginStart="20dp"/>
<Button
android:layout_width="100dp"
android:layout_height="100dp"
android:background="@drawable/round_button"
android:layout_marginTop="20dp"
android:layout_marginStart="20dp"
android:gravity="center" />
<Button
android:layout_width="100dp"
android:layout_height="100dp"
android:background="@drawable/round_button"
android:layout_marginTop="20dp"
android:layout_marginStart="20dp"
android:gravity="center" />
<Button
android:layout_width="100dp"
android:layout_height="100dp"
android:background="@drawable/round_button"
android:layout_marginTop="20dp"
android:layout_marginStart="20dp"
android:gravity="center" />
</LinearLayout>

@ -0,0 +1,80 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingBottom="10dip"
android:paddingTop="10dip" >
<TextView
android:id="@+id/BEACON_uuid"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="left|top" >
</TextView>
<TextView
android:id="@+id/BEACON_major"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/BEACON_uuid"
android:layout_marginTop="5dp"
android:gravity="left|top" >
</TextView>
<TextView
android:id="@+id/BEACON_minor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/BEACON_uuid"
android:layout_marginLeft="10dip"
android:layout_marginTop="5dp"
android:layout_toRightOf="@+id/BEACON_major"
android:gravity="left|top" >
</TextView>
<TextView
android:id="@+id/BEACON_proximity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@+id/BEACON_major"
android:layout_marginTop="5dp"
android:gravity="left|top" >
</TextView>
<TextView
android:id="@+id/BEACON_rssi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/BEACON_major"
android:layout_marginLeft="10dip"
android:layout_marginTop="5dp"
android:layout_toRightOf="@+id/BEACON_proximity"
android:gravity="left|top" >
</TextView>
<TextView
android:id="@+id/BEACON_txpower"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/BEACON_major"
android:layout_marginLeft="10dip"
android:layout_marginTop="5dp"
android:layout_toRightOf="@+id/BEACON_rssi"
android:gravity="left|top" >
</TextView>
<TextView
android:id="@+id/BEACON_range"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/BEACON_proximity"
android:layout_marginLeft="10dip"
android:layout_marginTop="5dp"
android:gravity="left|top" >
</TextView>
</RelativeLayout>

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<WebView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/webView1"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
/>

@ -5,5 +5,5 @@
<!-- Default screen margins, per the Android Design guidelines. --> <!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="nav_header_vertical_spacing">16dp</dimen> <dimen name="nav_header_vertical_spacing">16dp</dimen>
<dimen name="nav_header_height">160dp</dimen> <dimen name="nav_header_height">160dp</dimen>
<dimen name="fab_margin">16dp</dimen> <dimen name="fab_margin">40dp</dimen>
</resources> </resources>

@ -21,7 +21,7 @@
<mapping customMapping="disable" type="text"/> <mapping customMapping="disable" type="text"/>
<to eventAdapterType="email"> <to eventAdapterType="email">
<property name="email.subject">Email Alerts Speed</property> <property name="email.subject">Email Alerts Speed</property>
<property name="email.address"></property> <property name="email.address">pacificcontrolsapps@gmail.com</property>
<property name="email.type">text/html</property> <property name="email.type">text/html</property>
</to> </to>
</eventPublisher> </eventPublisher>

@ -21,7 +21,7 @@
<mapping customMapping="disable" type="text"/> <mapping customMapping="disable" type="text"/>
<to eventAdapterType="email"> <to eventAdapterType="email">
<property name="email.subject">Email Alerts Turn</property> <property name="email.subject">Email Alerts Turn</property>
<property name="email.address"></property> <property name="email.address">pacificcontrolsapps@gmail.com</property>
<property name="email.type">text/html</property> <property name="email.type">text/html</property>
</to> </to>
</eventPublisher> </eventPublisher>

Loading…
Cancel
Save