FHWS/SensorReadout
Archived
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added device list without smartwatches

Browse Source
This commit is contained in:
toni
2016-06-03 18:26:06 +02:00
parent 41fb03799c
commit 69ad4c2272
5 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -6,7 +6,7 @@ android {
defaultConfig {
applicationId "de.fhws.indoor.sensorreadout"
minSdkVersion 18
minSdkVersion 21
targetSdkVersion 23
versionCode 1
versionName "1.0"
@@ -25,5 +25,5 @@ dependencies {
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.google.android.support:wearable:1.3.0'
compile 'com.google.android.gms:play-services-wearable:8.4.0'
provided 'com.google.android.wearable:wearable:1.0.0'
//provided 'com.google.android.wearable:wearable:1.0.0'
}

2
app/src/main/AndroidManifest.xml
View File

@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.fhws.indoor.sensorreadout">>
<!--<uses-feature android:name="android.hardware.type.watch" /> -->
<uses-feature android:name="android.hardware.type.watch" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.BLUETOOTH" />

20
app/src/main/java/de/fhws/indoor/sensorreadout/MainActivity.java
View File

@@ -9,6 +9,7 @@ import android.os.Bundle;
import android.provider.Settings;
import android.support.v4.app.ActivityCompat;
import android.support.v7.app.AppCompatActivity;
import android.support.wearable.activity.WearableActivity;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.Button;
@@ -31,7 +32,7 @@ import de.fhws.indoor.sensorreadout.sensors.mySensor;
import de.fhws.indoor.sensorreadout.sensors.SensorType;
public class MainActivity extends AppCompatActivity {
public class MainActivity extends WearableActivity {
private final ArrayList<mySensor> sensors = new ArrayList<mySensor>();
private final ArrayList<TextView> txtFields = new ArrayList<TextView>();
@@ -43,7 +44,8 @@ public class MainActivity extends AppCompatActivity {
private int loadCounterWifi = 0;
private int loadCounterBeacon = 0;
private boolean isInitialized = false;
final private int MY_PERMISSIONS_REQUEST_READ_CONTACTS = 123;
final private int MY_PERMISSIONS_REQUEST_READ_BT = 123;
final private int MY_PERMISSIONS_REQUEST_READ_HEART = 321;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -206,13 +208,25 @@ public class MainActivity extends AppCompatActivity {
txtFields.add(tv);
}
// bluetooth permission
if(ActivityCompat.shouldShowRequestPermissionRationale(this,
Manifest.permission.ACCESS_FINE_LOCATION)) {
} else {
ActivityCompat.requestPermissions(this,
new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
MY_PERMISSIONS_REQUEST_READ_CONTACTS);
MY_PERMISSIONS_REQUEST_READ_BT);
}
// heartbeat permission
/* if(ActivityCompat.shouldShowRequestPermissionRationale(this,
Manifest.permission.BODY_SENSORS)) {
} else {
ActivityCompat.requestPermissions(this,
new String[]{Manifest.permission.BODY_SENSORS},
MY_PERMISSIONS_REQUEST_READ_HEART);
}*/
}

7
app/src/main/java/de/fhws/indoor/sensorreadout/sensors/PhoneSensors.java
View File

@@ -8,6 +8,9 @@ import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
import android.os.Build;
import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.wearable.Wearable;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
@@ -32,6 +35,8 @@ public class PhoneSensors extends mySensor implements SensorEventListener{
private Sensor light;
private Sensor temperature;
private static final int SENSOR_TYPE_HEARTRATE = 65562;
private float[] mGravity = new float[3];
private float[] mGeomagnetic = new float[3];
@@ -397,6 +402,8 @@ public class PhoneSensors extends mySensor implements SensorEventListener{
sensorManager.registerListener(this, magnet, SensorManager.SENSOR_DELAY_FASTEST);
sensorManager.registerListener(this, press, SensorManager.SENSOR_DELAY_FASTEST); // speed OK
sensorManager.registerListener(this, ori, SensorManager.SENSOR_DELAY_FASTEST); // speed OK
sensorManager.unregisterListener(this, heart);
sensorManager.registerListener(this, heart, SensorManager.SENSOR_DELAY_FASTEST);
sensorManager.registerListener(this, humidity, SensorManager.SENSOR_DELAY_FASTEST);
sensorManager.registerListener(this, rotationVector, SensorManager.SENSOR_DELAY_FASTEST);