diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 58992cc..cfe4315 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -12,12 +12,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index fbb6828..5d19981 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 0511738..3c0d7ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion '23.0.2' + buildToolsVersion '25.0.0' defaultConfig { applicationId "de.fhws.indoor.sensorreadout" @@ -23,7 +23,7 @@ dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:23.4.0' - compile 'com.google.android.support:wearable:1.3.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' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fbdcffd..e9f7c56 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,9 +3,6 @@ package="de.fhws.indoor.sensorreadout">> - - - diff --git a/app/src/main/java/de/fhws/indoor/sensorreadout/MainActivity.java b/app/src/main/java/de/fhws/indoor/sensorreadout/MainActivity.java index ae127b1..fd18a0a 100644 --- a/app/src/main/java/de/fhws/indoor/sensorreadout/MainActivity.java +++ b/app/src/main/java/de/fhws/indoor/sensorreadout/MainActivity.java @@ -11,7 +11,7 @@ import android.os.Build; import android.os.Bundle; import android.support.v4.app.ActivityCompat; import android.support.v4.content.pm.ActivityInfoCompat; -import android.support.wearable.activity.WearableActivity; +//import android.support.wearable.activity.WearableActivity; import android.util.Log; import android.view.View; import android.widget.ArrayAdapter; @@ -35,7 +35,7 @@ import de.fhws.indoor.sensorreadout.sensors.mySensor; import de.fhws.indoor.sensorreadout.sensors.SensorType; -public class MainActivity extends WearableActivity { +public class MainActivity extends Activity { private final ArrayList sensors = new ArrayList(); private final Logger logger = new Logger(this); diff --git a/app/src/main/java/de/fhws/indoor/sensorreadout/sensors/WiFi.java b/app/src/main/java/de/fhws/indoor/sensorreadout/sensors/WiFi.java index 834614d..cce8c67 100644 --- a/app/src/main/java/de/fhws/indoor/sensorreadout/sensors/WiFi.java +++ b/app/src/main/java/de/fhws/indoor/sensorreadout/sensors/WiFi.java @@ -10,6 +10,7 @@ import android.net.wifi.WifiManager; import android.os.Debug; import android.util.Log; +import java.lang.reflect.Method; import java.util.List; @@ -29,9 +30,8 @@ public class WiFi extends mySensor { this.wifi = (WifiManager) act.getSystemService(Context.WIFI_SERVICE); isReceiverRegistered = true; - - this.wifi.setWifiEnabled(false); - this.wifi.setWifiEnabled(true); + //this.wifi.setWifiEnabled(false); + //this.wifi.setWifiEnabled(true); if (wifi == null) { throw new MyException("WIFI not supported!"); @@ -82,6 +82,21 @@ public class WiFi extends mySensor { isReceiverRegistered = true; wifi.createWifiLock(wifi.WIFI_MODE_SCAN_ONLY, "ipin"); //wifi.disconnect(); + + + //this is a very nice hack. do not try this at home. + Method m = null; + try { + m = this.wifi.getClass().getDeclaredMethod("setFrequencyBand", int.class, boolean.class); + m.setAccessible(true); + m.invoke(this.wifi, 2, true); + m.invoke(this.wifi, 2, true); + m.invoke(this.wifi, 2, true); + Log.d("ok", "ok"); + } catch (Exception e) { + e.printStackTrace(); + } + startScan(); } diff --git a/build.gradle b/build.gradle index de8bb4d..c2eea8e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-alpha2' + classpath 'com.android.tools.build:gradle:2.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9829f78..4a8b402 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jun 02 19:04:18 CEST 2016 +#Tue Oct 10 15:36:44 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip