v0.0.2

wh201906 · Jun 15, 2023 · 88a3403 · 88a3403
1 parent fd66ea8
commit 88a3403
Show file tree

Hide file tree

Showing 13 changed files with 222 additions and 106 deletions.
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "priv.wh201906.medifier"
         minSdk 19
         targetSdk 31
-        versionCode 1
-        versionName "0.0.1"
+        versionCode 2
+        versionName "0.0.2"
     }
 
     buildTypes {

diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml
@@ -2,7 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 
     <application
         android:allowBackup="true"

diff --git a/Qt/android/AndroidManifest.xml b/Qt/android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<manifest package="priv.wh201906.medifier.qt" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="V0.0.2" android:versionCode="2" android:installLocation="auto">
+<manifest package="priv.wh201906.medifier.qt" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="v0.0.2" android:versionCode="2" android:installLocation="auto">
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
          Remove the comment if you do not require these default permissions. -->
-    <!-- %%INSERT_PERMISSIONS -->
+
 
     <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
          Remove the comment if you do not require these default features. -->
@@ -74,4 +74,11 @@
 
     </application>
 
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+
 </manifest>
diff --git a/Qt/commrfcomm.h b/Qt/commrfcomm.h
@@ -7,6 +7,7 @@
 
 class CommRFCOMM : public Comm
 {
+    Q_OBJECT
 public:
     explicit CommRFCOMM(QObject *parent = nullptr);
     void open(const QString& address) override;

diff --git a/Qt/deviceform.ui b/Qt/deviceform.ui
@@ -10,9 +10,6 @@
     <height>300</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">

diff --git a/Qt/mEDIFIER.pro b/Qt/mEDIFIER.pro
@@ -43,3 +43,10 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
 
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+DISTFILES += \
+    android/AndroidManifest.xml
+
+# Remember to change version in AndroidManifest.xml
+VERSION = 0.0.2
+# Expose VERSION to the source files.
+DEFINES += APP_VERSION=\\\"$$VERSION\\\"