markusb/RTT
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added vibration

Browse Source
This commit is contained in:
Markus Bullmann
2019-11-12 16:23:29 +01:00
parent be29abac6b
commit 4558d134e0
6 changed files with 133 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RTT.pro
View File

@@ -20,7 +20,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
SOURCES += \ SOURCES += \
histogramchart.cpp \ histogramchart.cpp \
main.cpp \ main.cpp \
Manager.cpp Manager.cpp \
vibration.cpp
RESOURCES += qml.qrc RESOURCES += qml.qrc
@@ -50,7 +51,8 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
HEADERS += \ HEADERS += \
Manager.h \ Manager.h \
histogramchart.h \ histogramchart.h \
uwb.h uwb.h \
vibration.h
DISTFILES += \ DISTFILES += \
_android/src/UWB.java \ _android/src/UWB.java \

73
_android/AndroidManifest.xml
View File

@@ -1,49 +1,50 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<manifest package="indoor.java" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto"> <manifest package="indoor.java" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
<uses-sdk android:minSdkVersion="28"/> <uses-sdk android:minSdkVersion="28"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/> <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
<uses-permission android:name="android.permission.BLUETOOTH"/> <uses-permission android:name="android.permission.BLUETOOTH"/>
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.BODY_SENSORS"/> <uses-permission android:name="android.permission.BODY_SENSORS"/>
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
<application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name"> <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="indoor.java.MyActivity" android:label="TEST" android:screenOrientation="unspecified"> <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="indoor.java.MyActivity" android:label="TEST" android:screenOrientation="unspecified">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
<meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/> <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/> <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
<meta-data android:name="android.app.repository" android:value="default"/> <meta-data android:name="android.app.repository" android:value="default"/>
<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/> <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/> <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/> <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
<meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/> <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
<meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/> <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
<meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/> <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/> <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
<meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/> <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
<meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/> <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
<meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/> <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
<meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/> <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
<meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/> <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
<meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/> <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
</activity> </activity>
</application> </application>
<uses-permission android:name="android.permission.VIBRATE"/>
</manifest> </manifest>

6
main.cpp
View File

@@ -5,6 +5,7 @@
#include <QQuickItem> #include <QQuickItem>
#include "histogramchart.h" #include "histogramchart.h"
#include "vibration.h"
#include "Manager.h" #include "Manager.h"
extern Manager mgmt; extern Manager mgmt;
@@ -18,10 +19,15 @@ int main(int argc, char *argv[]) {
qmlRegisterType<HistogramChart>("Test", 1, 0, "HistogramChart"); qmlRegisterType<HistogramChart>("Test", 1, 0, "HistogramChart");
QQmlApplicationEngine engine; QQmlApplicationEngine engine;
engine.rootContext()->setContextProperty("mgmt", &mgmt); engine.rootContext()->setContextProperty("mgmt", &mgmt);
Vibration vibration;
engine.rootContext()->setContextProperty("Vibration", &vibration);
engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
engine.rootObjects().first()->dumpObjectTree(); engine.rootObjects().first()->dumpObjectTree();

4
main.qml
View File

@@ -39,6 +39,10 @@ Window {
cbNUC.enabled = true; cbNUC.enabled = true;
cbLogToDisk.enabled = true; cbLogToDisk.enabled = true;
cbMeasTime.enabled = true; cbMeasTime.enabled = true;
if (cbMeasTime.currentIndex != 0) {
Vibration.vibrate(1000);
}
} }
} }
} }

53
vibration.cpp Normal file
View File

@@ -0,0 +1,53 @@
#include "vibration.h"
#include <QDebug>
Vibration::Vibration(QObject *parent) : QObject(parent)
{
#ifdef ANDROID
activity = QAndroidJniObject::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", "activity", "()Landroid/app/Activity;");
QAndroidJniObject vibroString = QAndroidJniObject::fromString("vibrator");
QAndroidJniObject appctx = activity.callObjectMethod("getApplicationContext","()Landroid/content/Context;");
vibratorService = appctx.callObjectMethod("getSystemService", "(Ljava/lang/String;)Ljava/lang/Object;", vibroString.object<jstring>());
#endif
}
void Vibration::vibrate(int milliseconds)
{
#ifdef ANDROID
if (vibratorService.isValid()) {
jlong ms = milliseconds;
jboolean hasvibro = vibratorService.callMethod<jboolean>("hasVibrator", "()Z");
if (hasvibro) {
vibratorService.callMethod<void>("vibrate", "(J)V", ms);
}
} else {
qDebug() << "No vibrator service available";
}
jint notifcationType = QAndroidJniObject::getStaticField<jint>("android/media/RingtoneManager", "TYPE_NOTIFICATION");
QAndroidJniObject notification = QAndroidJniObject::callStaticObjectMethod("android/media/RingtoneManager", "getDefaultUri", "(I)Landroid/net/Uri;", notifcationType);
if ( notification.isValid() )
{
// Note that package and class names needs to be separated with '/' and not '.'
QAndroidJniObject ring = QAndroidJniObject::callStaticObjectMethod("android/media/RingtoneManager",
"getRingtone",
"(Landroid/content/Context;Landroid/net/Uri;)Landroid/media/Ringtone;",
activity.object<jobject>(),
notification.object<jobject>());
if ( ring.isValid() )
{
ring.callMethod<void>("play", "()V");
}
}
#else
Q_UNUSED(milliseconds);
#endif
}

29
vibration.h Normal file
View File

@@ -0,0 +1,29 @@
#ifndef VIBRATION_H
#define VIBRATION_H
#include <QObject>
#ifdef ANDROID
#include <QAndroidJniEnvironment>
#include <QAndroidJniObject>
#endif
class Vibration : public QObject
{
Q_OBJECT
public:
explicit Vibration(QObject *parent = nullptr);
signals:
public slots:
void vibrate(int milliseconds);
private:
#ifdef ANDROID
QAndroidJniObject activity;
QAndroidJniObject vibratorService;
#endif
};
#endif // VIBRATION_H