1.4 integrate with master

build.gradle

@@ -1,7 +1,7 @@
 ext.oshCoreVersion = '1.4.0'
-ext.compileSdkVersion = 21
-ext.minSdkVersion = 21
-ext.targetSdkVersion = 21
+ext.compileSdkVersion = 31
+ext.minSdkVersion = 26
+ext.targetSdkVersion = 26
 ext.buildToolsVersion = "30.0.2"
 version = oshCoreVersion
 

sensorhub-android-app/AndroidManifest.xml

@@ -6,37 +6,57 @@
     <uses-feature android:name="android.hardware.location" />
     <uses-feature android:name="android.hardware.sensor.compass" />
     <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.usb.accessory" android:required="true" />
+    <uses-feature
+        android:name="android.hardware.usb.accessory"
+        android:required="true" />
+    <uses-feature
+        android:name="android.hardware.bluetooth_le"
+        android:required="true" />
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+
+    <uses-feature android:name="android.hardware.camera2.full" />
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:largeHeap="true"
+        android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize"
-            android:screenOrientation="portrait"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
             android:name=".UserSettingsActivity"
-            android:label="@string/title_activity_user_settings" >
-        </activity>
-        <service
-            android:enabled="true"
-            android:name=".SensorHubService">            
-        </service>
+            android:label="@string/title_activity_user_settings" />
+        <activity
+            android:name=".AppStatusActivity"
+            android:label="App Status"
+            android:theme="@style/Theme.AppCompat.DayNight"/>
+        <!-- <activity android:name=".spotreport.SpotReportActivity" -->
+        <!-- android:configChanges="orientation|screenSize"> -->
+
+    <service
+            android:name=".SensorHubService"
+            android:enabled="true" />
     </application>
 
-</manifest>
+</manifest>

sensorhub-android-app/build.gradle

@@ -3,8 +3,25 @@ apply plugin: 'com.android.application'
 description = 'OSH Demo Android App'
 ext.details = 'OSH demo app for Android'
 
+repositories {
+  maven {
+    url "https://repo.eclipse.org/content/repositories/paho-releases/"
+  }
+}
+
 dependencies {
   api project(':sensorhub-android-lib')
+
+  implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.1.0'
+  implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.0'
+    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:design:26.1.0'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+    implementation 'android.arch.navigation:navigation-fragment:1.0.0'
+    implementation 'android.arch.navigation:navigation-ui:1.0.0'
+    implementation 'com.android.support:support-v4:26.1.0'
+//    implementation project(path: ':sensorhub-android-sos-ipc')
+//    implementation project(path: ':sensorhub-storage-h2')
 }
 
 android {
@@ -41,5 +58,8 @@ android {
   lintOptions {
     abortOnError false
   }
+    buildFeatures {
+        viewBinding true
+    }
 }
 

sensorhub-android-app/res/layout/activity_app_status.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".AppStatusActivity">
+
+    <TextView
+        android:id="@+id/sos_service_status_label"
+        android:layout_width="215dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:padding="10dp"
+        android:text="@string/sosServiceStatusLabel"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/sos_service_state"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:padding="10dp"
+        android:text="TextView"
+        android:textAlignment="center"
+        app:layout_constraintBottom_toBottomOf="@+id/sos_service_status_label"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/sos_service_status_label"
+        app:layout_constraintTop_toTopOf="@+id/sos_service_status_label" />
+
+    <TextView
+        android:id="@+id/http_server_status_label"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:padding="10dp"
+        android:text="@string/httpServerStatusLabel"
+        app:layout_constraintEnd_toEndOf="@+id/sos_service_status_label"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sos_service_status_label" />
+
+    <TextView
+        android:id="@+id/http_service_state"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:padding="10dp"
+        android:text="TextView"
+        android:textAlignment="center"
+        app:layout_constraintBottom_toBottomOf="@+id/http_server_status_label"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/http_server_status_label"
+        app:layout_constraintTop_toTopOf="@+id/http_server_status_label" />
+
+    <TextView
+        android:id="@+id/android_sensor_status_label"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/http_server_status_label"
+        android:layout_marginStart="8dp"
+        android:padding="10dp"
+        android:text="@string/sensorServiceStatusLabel"
+        app:layout_constraintEnd_toEndOf="@+id/http_server_status_label"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/http_server_status_label" />
+
+    <TextView
+        android:id="@+id/sensor_service_state"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:padding="10dp"
+        android:text="TextView"
+        android:textAlignment="center"
+        app:layout_constraintBottom_toBottomOf="@+id/android_sensor_status_label"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/android_sensor_status_label"
+        app:layout_constraintTop_toTopOf="@+id/android_sensor_status_label" />
+
+    <TextView
+        android:id="@+id/storage_service_status_label"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/android_sensor_status_label"
+        android:layout_marginStart="8dp"
+        android:padding="10dp"
+        android:text="@string/storageServiceStatusLabel"
+        app:layout_constraintEnd_toEndOf="@+id/android_sensor_status_label"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/android_sensor_status_label" />
+
+    <TextView
+        android:id="@+id/storage_service_state"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:padding="10dp"
+        android:text="TextView"
+        android:textAlignment="center"
+        app:layout_constraintBottom_toBottomOf="@+id/storage_service_status_label"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/storage_service_status_label"
+        app:layout_constraintTop_toTopOf="@+id/storage_service_status_label" />
+
+
+</android.support.constraint.ConstraintLayout>

sensorhub-android-app/res/menu/main.xml

@@ -21,9 +21,15 @@
         android:title="@string/action_stop"/>
 
     <item
-        android:id="@+id/action_about"
+        android:id="@+id/action_status"
         android:orderInCategory="103"
         android:showAsAction="never"
+        android:title="@string/action_status"/>
+
+    <item
+        android:id="@+id/action_about"
+        android:orderInCategory="110"
+        android:showAsAction="never"
         android:title="@string/action_about"/>
 
 </menu>