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

fixed android setup

Browse Source 
added missing c++11 methods
This commit is contained in:
kazu
2016-07-15 15:49:58 +02:00
parent b188cb992c
commit 719a66937e
12 changed files with 86 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sensors/SensorFactory.h
View File

@@ -30,7 +30,7 @@ public:
/** get the Accelerometer sensor */
static AccelerometerSensor& getAccelerometer() {
#ifdef ANDROID
return AccelerometerSensor::get();
return AccelerometerSensorAndroid::get();
#else
return AccelerometerSensorDummy::get();
#endif

15
sensors/android/AccelerometerSensorAndroid.h
View File

@@ -1,5 +1,5 @@
#ifndef ACCELEROMETERSENSOR_H
#define ACCELEROMETERSENSOR_H
#ifndef ACCELEROMETERSENSORANDROID_H
#define ACCELEROMETERSENSORANDROID_H
#ifdef ANDROID
@@ -10,7 +10,7 @@
#include <QtSensors/QAccelerometer>
#include "../AccelerometerSensor.h"
class AccelerometerSensorAndroid : public AccelerometerSensor {
@@ -26,8 +26,8 @@ private:
public:
/** singleton access */
static AccelerometerSensor& get() {
static AccelerometerSensor acc;
static AccelerometerSensorAndroid& get() {
static AccelerometerSensorAndroid acc;
return acc;
}
@@ -44,12 +44,13 @@ public:
}
void stop() override {
throw "todo";
throw "TODO";
}
};
#endif ANDROID
#endif // ACCELEROMETERSENSOR_H
#endif // ACCELEROMETERSENSORANDROID_H

12
sensors/android/WiFiSensorAndroid.h
View File

@@ -6,8 +6,8 @@
#include <QAndroidJniObject>
#include "Debug.h"
#include "WiFiSensor.h"
#include "../../misc/Debug.h"
#include "../WiFiSensor.h"
class WiFiSensorAndroid : public WiFiSensor {
@@ -27,11 +27,15 @@ public:
void start() override {
// start scanning
int res = QAndroidJniObject::callStaticMethod<int>("java/indoor/WiFi", "start", "()I");
int res = QAndroidJniObject::callStaticMethod<int>("indoor/java/WiFi", "start", "()I");
(void) res;
}
void stop() override {
throw "todo";
}
/** called from java. handle the given incoming scan result */
void handle(const std::string& data) {
@@ -59,7 +63,7 @@ public:
extern "C" {
/** called after each successful WiFi scan */
JNIEXPORT void JNICALL Java_java_indoor_WiFi_onScanComplete(JNIEnv* env, jobject jobj, jbyteArray arrayID) {
JNIEXPORT void JNICALL Java_indoor_java_WiFi_onScanComplete(JNIEnv* env, jobject jobj, jbyteArray arrayID) {
(void) env; (void) jobj;
jsize length = env->GetArrayLength(arrayID);
jboolean isCopy;