Feature/versions

fivegmag_5GMSdAwareApplication/app/build.gradle

@@ -51,4 +51,17 @@ dependencies {
     def retrofit_version = "2.9.0"
     implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
     implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
+}
+
+task CaptureLibraryVersion {
+    def libDef = project.configurations.getByName('implementation').allDependencies.matching {
+        it.group.equals("com.fivegmag")
+    }
+    if (libDef.size() > 0) {
+        android.buildTypes.each {
+            libDef.forEach { item ->
+                it.buildConfigField 'String', "LIB_VERSION_" + item.name, "\"${item.version}\""
+            }
+        }
+    }
 }

fivegmag_5GMSdAwareApplication/app/src/main/assets/config.properties.xml

@@ -5,6 +5,6 @@
     <!--<entry key="m8LocalAfAndAs">m8/config_local_af.json</entry>-->
     <entry key="m85GMAGHost">https://rt.5g-mag.com/</entry>
     <!-- <entry key="m8LocalDummyHost">http://10.147.67.179:3003/m8/</entry>-->
-    <entry key="m8LocalDummyHost">http://192.168.178.78:3003/m8/</entry>
+    <entry key="m8LocalDummyHost">http://192.168.2.1:3003/m8/</entry>
     <!-- <entry key="m8LocalDummyHost">http://194.95.175.90:3003/m8/</entry> -->
 </properties>

fivegmag_5GMSdAwareApplication/app/src/main/java/com/fivegmag/a5gmsdawareapplication/MainActivity.kt

@@ -9,7 +9,9 @@ https://drive.google.com/file/d/1cinCiA778IErENZ3JN52VFW-1ffHpx7Z/view
 
 package com.fivegmag.a5gmsdawareapplication
 
+import android.content.pm.PackageManager
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
@@ -38,7 +40,7 @@ import java.net.URI
 import java.util.*
 
 
-const val TAG = "5GMS Aware Application"
+const val TAG_AWARE_APPLICATION = "5GMS Aware Application"
 
 @UnstableApi
 class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {
@@ -61,6 +63,8 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {
             loadConfiguration()
             populateM8SelectionSpinner()
             exoPlayerView = findViewById(R.id.idExoPlayerVIew)
+            setApplicationVersionNumber()
+            printDependenciesVersionNumbers()
             registerButtonListener()
             mediaSessionHandlerAdapter.initialize(
                 this,
@@ -75,15 +79,32 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {
     }
 
     override fun onStop() {
-        EventBus.getDefault().unregister(mediaStreamHandlerEventHandler);
+        EventBus.getDefault().unregister(mediaStreamHandlerEventHandler)
         super.onStop()
         // Unbind from the service
         mediaSessionHandlerAdapter.reset(this)
     }
 
     override fun onStart() {
         super.onStart()
-        EventBus.getDefault().register(mediaStreamHandlerEventHandler);
+        EventBus.getDefault().register(mediaStreamHandlerEventHandler)
+    }
+
+    private fun setApplicationVersionNumber() {
+        try {
+            val packageInfo = packageManager.getPackageInfo(packageName, 0)
+            val versionName = packageInfo.versionName
+            val versionTextView = findViewById<TextView>(R.id.versionNumber)
+            val versionText = getString(R.string.versionTextField, versionName)
+            versionTextView.text = versionText
+        } catch (e: PackageManager.NameNotFoundException) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun printDependenciesVersionNumbers() {
+        Log.d(TAG_AWARE_APPLICATION, "5GMS Common Library Version: ${BuildConfig.LIB_VERSION_a5gmscommonlibrary}")
+        Log.d(TAG_AWARE_APPLICATION, "5GMS Media Stream Handler Version: ${BuildConfig.LIB_VERSION_a5gmsmediastreamhandler}")
     }
 
     private fun loadConfiguration() {
@@ -171,7 +192,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {
     }
 
     private fun replaceDoubleTicks(value: String): String {
-        return value.replace("\"", "");
+        return value.replace("\"", "")
     }
 
     override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
@@ -248,9 +269,9 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener {
 
         for (serviceListEntry in jsonServiceList) {
             val itemAsJsonObject = Json.parseToJsonElement(serviceListEntry.toString()).jsonObject
-            var name: String =
+            val name: String =
                 replaceDoubleTicks(itemAsJsonObject["name"].toString())
-            var provisioningSessionId =
+            val provisioningSessionId =
                 replaceDoubleTicks(itemAsJsonObject["provisioningSessionId"].toString())
 
             val entryPoints = ArrayList<EntryPoint>()

fivegmag_5GMSdAwareApplication/app/src/main/res/layout-land/activity_main.xml

@@ -94,5 +94,15 @@
         app:layout_constraintStart_toStartOf="@+id/idExoPlayerVIew"
         app:layout_constraintTop_toTopOf="@+id/idExoPlayerVIew" />
 
+    <TextView
+        android:id="@+id/versionNumber"
+        android:layout_width="146dp"
+        android:layout_height="20dp"
+        android:layout_marginBottom="16dp"
+        android:text="@string/versionTextField"
+        android:textAlignment="textEnd"
+        app:layout_constraintBottom_toTopOf="@+id/idExoPlayerVIew"
+        app:layout_constraintEnd_toEndOf="@+id/idExoPlayerVIew" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>

fivegmag_5GMSdAwareApplication/app/src/main/res/layout/activity_main.xml

@@ -95,5 +95,15 @@
         app:layout_constraintStart_toStartOf="@+id/idExoPlayerVIew"
         app:layout_constraintTop_toTopOf="@+id/idExoPlayerVIew" />
 
+    <TextView
+        android:id="@+id/versionNumber"
+        android:layout_width="162dp"
+        android:layout_height="23dp"
+        android:layout_marginBottom="20dp"
+        android:text="@string/versionTextField"
+        android:textAlignment="textEnd"
+        app:layout_constraintBottom_toTopOf="@+id/representationInfo"
+        app:layout_constraintEnd_toEndOf="@+id/idExoPlayerVIew" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>

fivegmag_5GMSdAwareApplication/app/src/main/res/values/strings.xml

@@ -5,4 +5,5 @@
     <string name="labelStreamSelection">Select a Stream</string>
     <string name="startPlaybackButton">Start Playback</string>
     <string name="representationInfo">%1$s kbit/s - Rep ID: %2$s</string>
+    <string name="versionTextField">Version: %s</string>
 </resources>