162 prepare on device training

app/build.gradle

@@ -77,8 +77,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.4.1'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'androidx.preference:preference-ktx:1.2.0'
@@ -96,7 +96,7 @@ dependencies {
     implementation project(path: ':Xsens_DOT_Core')
     implementation "androidx.core:core-ktx:1.7.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.10")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21")
     implementation("com.android.volley:volley:1.2.1")
     testImplementation("junit:junit:4.13.2")
     testImplementation('androidx.test:core:1.4.0')
@@ -106,20 +106,21 @@ dependencies {
     implementation("androidx.cardview:cardview:1.0.0")
     implementation 'com.google.android.material:material:1.5.0'
 
-    def camerax_version = "1.1.0-beta02"
+    def camerax_version = "1.1.0-beta03"
     implementation("androidx.camera:camera-camera2:${camerax_version}")
     implementation("androidx.camera:camera-video:${camerax_version}")
     implementation("androidx.camera:camera-view:${camerax_version}")
 
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
+
     implementation("org.jcodec:jcodec:0.2.3")
     implementation("org.jcodec:jcodec-android:0.2.2")
     implementation("com.opencsv:opencsv:4.6")
 }
 repositories {
     mavenCentral()
     maven {
-        name 'ossrh-snapshot'
-        url 'https://oss.sonatype.org/content/repositories/snapshots'
+        url 'https://jitpack.io'
     }
 
 }

app/src/androidTest/java/sensors_in_paradise/sonar/CategoryLabelsStorageTest.kt

@@ -0,0 +1,69 @@
+package sensors_in_paradise.sonar
+
+import android.content.Context
+import android.util.Log
+import androidx.test.platform.app.InstrumentationRegistry
+import junit.framework.TestCase.*
+import org.junit.Before
+import org.junit.Test
+import sensors_in_paradise.sonar.screen_recording.CategoryItemStorage
+import java.io.File
+
+class CategoryLabelsStorageTest {
+    private val appContext: Context = InstrumentationRegistry.getInstrumentation().targetContext
+    private val baseDir = File(appContext.cacheDir, "RecordingsTest")
+
+    @Before
+    fun init() {
+        baseDir.mkdir()
+    }
+
+    @Test
+    fun testLoadDefaultData() {
+        val file = baseDir.resolve("categoryLabels1.json")
+        file.delete()
+        val storage = CategoryItemStorage(file)
+        Log.d(
+            "CategoryLabelsStorageTest-testLoadDefaultData",
+            "Storage after creation: ${storage.getJsonString(1)}"
+        )
+
+        for ((activity, category) in CategoryItemStorage.DEFAULT_ACTIVITIES) {
+            Log.d(
+                "CategoryLabelsStorageTest-testLoadDefaultData",
+                "Asserting that activity $activity is added in category $category"
+            )
+            assertFalse(storage.isCategoryDeletable(category))
+            assertTrue(storage.isEntryAdded(activity, category))
+            assertTrue(storage.isEntryAdded(activity))
+        }
+        file.delete()
+    }
+
+    @Test
+    fun testSave() {
+        val file = baseDir.resolve("categoryLabels2.json")
+        file.delete()
+        val storage = CategoryItemStorage(file)
+        Log.d("CategoryLabelsStorageTest", "Storage after creation: ${storage.getJsonString(1)}")
+        storage.addCategoryIfNotAdded("reinigung")
+        Log.d(
+            "CategoryLabelsStorageTest",
+            "Storage after adding category: ${storage.getJsonString(1)}"
+        )
+        storage.addEntry("wischen", "reinigung", save = true)
+        Log.d(
+            "CategoryLabelsStorageTest",
+            "Storage after adding entry: ${storage.getJsonString(1)}"
+        )
+        assertTrue(storage.isEntryAdded("wischen", "reinigung"))
+        val storage2 = CategoryItemStorage(file)
+        Log.d(
+            "CategoryLabelsStorageTest",
+            "Storage2 after loading from file: ${storage2.getJsonString(1)}"
+        )
+        assertTrue(storage2.isEntryAdded("wischen", "reinigung"))
+
+        file.delete()
+    }
+}

app/src/main/java/sensors_in_paradise/sonar/GlobalValues.kt

@@ -3,36 +3,18 @@ package sensors_in_paradise.sonar
 import android.Manifest
 import android.content.Context
 import android.os.Build
+import android.util.Log
 import com.xsens.dot.android.sdk.models.XsensDotPayload
 import java.io.File
+import java.net.NetworkInterface
+import java.net.SocketException
+import java.util.*
+import kotlin.collections.ArrayList
 
 class GlobalValues private constructor() {
     companion object {
         const val NULL_ACTIVITY = "null - activity"
         const val OTHERS_CATEGORY = "Others"
-        val DEFINED_ACTIVITIES = linkedMapOf<String, String>(
-            NULL_ACTIVITY to OTHERS_CATEGORY,
-            "aufräumen" to OTHERS_CATEGORY,
-            "aufwischen (Staub)" to OTHERS_CATEGORY,
-            "Accessoires (Parfüm) anlegen" to "Morgenpflege",
-            "Bett machen" to "Morgenpflege",
-            "Bett beziehen" to "Morgenpflege",
-            "Haare kämmen" to "Morgenpflege",
-            "Hautpflege" to "Morgenpflege",
-            "Medikamente geben" to "Morgenpflege",
-            "Mundpflege" to "Morgenpflege",
-            "Umkleiden" to "Morgenpflege",
-            "Gesamtwaschen im Bett" to "Morgenpflege",
-            "Essen auf Teller geben" to "Mahlzeiten",
-            "Essen reichen" to "Mahlzeiten",
-            "Getränke ausschenken" to "Mahlzeiten",
-            "Getränk geben" to "Mahlzeiten",
-            "Assistieren - aufstehen" to "Assistieren",
-            "Patient umlagern (Lagerung)" to "Assistieren",
-            "Rollstuhl Transfer" to "Assistieren",
-            "Dokumentation" to "Organisation",
-            "Medikamente stellen" to "Organisation",
-        )
         const val UNKNOWN_PERSON = "unknown"
         const val METADATA_JSON_FILENAME = "metadata.json"
         const val MEASUREMENT_MODE = XsensDotPayload.PAYLOAD_TYPE_CUSTOM_MODE_4
@@ -50,14 +32,6 @@ class GlobalValues private constructor() {
             return context.dataDir.resolve("poseTemp")
         }
 
-        fun getActivityLabelsJSONFile(context: Context): File {
-            return File(context.getExternalFilesDir(null) ?: context.dataDir, "labels.json")
-        }
-
-        fun getPeopleJSONFile(context: Context): File {
-            return File(context.getExternalFilesDir(null) ?: context.dataDir, "people.json")
-        }
-
         fun getRequiredPermissions(): ArrayList<String> {
             val result = arrayListOf(
                 Manifest.permission.BLUETOOTH,
@@ -90,5 +64,29 @@ class GlobalValues private constructor() {
 
             return minutes.toString().padStart(2, '0') + ":" + seconds.toString().padStart(2, '0')
         }
+        fun getMacAddress(): String {
+            try {
+                val all = Collections.list(NetworkInterface.getNetworkInterfaces())
+                for (nif in all) {
+                    if (!nif.name.equals("wlan0", ignoreCase=true)) continue
+
+                    val macBytes = nif.hardwareAddress ?: return ""
+
+                    val res1 = StringBuilder()
+                    for (b in macBytes) {
+                        res1.append(String.format(Locale.US, "%02X:", b))
+                    }
+
+                    if (res1.isNotEmpty()) {
+                        res1.deleteCharAt(res1.length - 1)
+                    }
+                    return res1.toString()
+                }
+            } catch (ex: SocketException) {
+                ex.message?.let { Log.e("GlobalValues", it) }
+            }
+
+            return "02:00:00:00:00:00"
+        }
     }
 }

app/src/main/java/sensors_in_paradise/sonar/HeadingResetHandler.kt

@@ -7,7 +7,7 @@ import androidx.annotation.UiThread
 import com.xsens.dot.android.sdk.events.XsensDotData
 import com.xsens.dot.android.sdk.interfaces.XsensDotMeasurementCallback
 import com.xsens.dot.android.sdk.models.XsensDotDevice
-import sensors_in_paradise.sonar.page1.ConnectionInterface
+import sensors_in_paradise.sonar.screen_connection.ConnectionInterface
 
 class HeadingResetHandler(
     private val context: Context,

app/src/main/java/sensors_in_paradise/sonar/JSONStorage.kt

@@ -16,7 +16,7 @@ abstract class JSONStorage @Throws(
     constructor(file: File) : this(file, null)
 
     @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
-    lateinit var json: JSONObject
+    var json: JSONObject
 
     init {
         if (initialJson == null) {
@@ -57,4 +57,8 @@ abstract class JSONStorage @Throws(
 
     /** */
     abstract fun onJSONInitialized()
+
+    fun getJsonString(indentSpaces: Int = 4): String {
+        return json.toString(indentSpaces)
+    }
 }