From 7534db5d8d3da49757442830bf41d847c36a24c3 Mon Sep 17 00:00:00 2001 From: Daniel Silhavy Date: Thu, 24 Aug 2023 11:50:21 +0200 Subject: [PATCH 1/2] Show the 5GMS Aware Application version number in the UI --- fivegmag_5GMSdAwareApplication/.idea/compiler.xml | 2 +- fivegmag_5GMSdAwareApplication/.idea/misc.xml | 3 +-- .../app/src/main/assets/config.properties.xml | 2 +- .../a5gmsdawareapplication/MainActivity.kt | 14 ++++++++++++++ .../app/src/main/res/layout-land/activity_main.xml | 10 ++++++++++ .../app/src/main/res/layout/activity_main.xml | 10 ++++++++++ .../app/src/main/res/values/strings.xml | 1 + 7 files changed, 38 insertions(+), 4 deletions(-) diff --git a/fivegmag_5GMSdAwareApplication/.idea/compiler.xml b/fivegmag_5GMSdAwareApplication/.idea/compiler.xml index fb7f4a8a..b589d56e 100644 --- a/fivegmag_5GMSdAwareApplication/.idea/compiler.xml +++ b/fivegmag_5GMSdAwareApplication/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/fivegmag_5GMSdAwareApplication/.idea/misc.xml b/fivegmag_5GMSdAwareApplication/.idea/misc.xml index bdd92780..8978d23d 100644 --- a/fivegmag_5GMSdAwareApplication/.idea/misc.xml +++ b/fivegmag_5GMSdAwareApplication/.idea/misc.xml @@ -1,7 +1,6 @@ - - + diff --git a/fivegmag_5GMSdAwareApplication/app/src/main/assets/config.properties.xml b/fivegmag_5GMSdAwareApplication/app/src/main/assets/config.properties.xml index 3e17ff9d..d5cae691 100644 --- a/fivegmag_5GMSdAwareApplication/app/src/main/assets/config.properties.xml +++ b/fivegmag_5GMSdAwareApplication/app/src/main/assets/config.properties.xml @@ -5,6 +5,6 @@ https://rt.5g-mag.com/ - http://192.168.178.78:3003/m8/ + http://192.168.2.1:3003/m8/ \ No newline at end of file diff --git a/fivegmag_5GMSdAwareApplication/app/src/main/java/com/fivegmag/a5gmsdawareapplication/MainActivity.kt b/fivegmag_5GMSdAwareApplication/app/src/main/java/com/fivegmag/a5gmsdawareapplication/MainActivity.kt index 58010a6a..fa17df67 100644 --- a/fivegmag_5GMSdAwareApplication/app/src/main/java/com/fivegmag/a5gmsdawareapplication/MainActivity.kt +++ b/fivegmag_5GMSdAwareApplication/app/src/main/java/com/fivegmag/a5gmsdawareapplication/MainActivity.kt @@ -9,6 +9,7 @@ https://drive.google.com/file/d/1cinCiA778IErENZ3JN52VFW-1ffHpx7Z/view package com.fivegmag.a5gmsdawareapplication +import android.content.pm.PackageManager import android.os.Bundle import android.view.View import android.widget.AdapterView @@ -61,6 +62,7 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener { loadConfiguration() populateM8SelectionSpinner() exoPlayerView = findViewById(R.id.idExoPlayerVIew) + setVersionNumber() registerButtonListener() mediaSessionHandlerAdapter.initialize( this, @@ -86,6 +88,18 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener { EventBus.getDefault().register(mediaStreamHandlerEventHandler); } + private fun setVersionNumber() { + try { + val packageInfo = packageManager.getPackageInfo(packageName, 0) + val versionName = packageInfo.versionName + val versionTextView = findViewById(R.id.versionNumber) + val versionText = getString(R.string.versionTextField, versionName) + versionTextView.text = versionText + } catch (e: PackageManager.NameNotFoundException) { + e.printStackTrace() + } + } + private fun loadConfiguration() { try { val inputStream: InputStream = this.assets.open("config.properties.xml") diff --git a/fivegmag_5GMSdAwareApplication/app/src/main/res/layout-land/activity_main.xml b/fivegmag_5GMSdAwareApplication/app/src/main/res/layout-land/activity_main.xml index d4b059c9..e3d601a4 100644 --- a/fivegmag_5GMSdAwareApplication/app/src/main/res/layout-land/activity_main.xml +++ b/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" /> + + \ No newline at end of file diff --git a/fivegmag_5GMSdAwareApplication/app/src/main/res/layout/activity_main.xml b/fivegmag_5GMSdAwareApplication/app/src/main/res/layout/activity_main.xml index 0424e65b..cc9087f7 100644 --- a/fivegmag_5GMSdAwareApplication/app/src/main/res/layout/activity_main.xml +++ b/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" /> + + \ No newline at end of file diff --git a/fivegmag_5GMSdAwareApplication/app/src/main/res/values/strings.xml b/fivegmag_5GMSdAwareApplication/app/src/main/res/values/strings.xml index d938136b..c840c777 100644 --- a/fivegmag_5GMSdAwareApplication/app/src/main/res/values/strings.xml +++ b/fivegmag_5GMSdAwareApplication/app/src/main/res/values/strings.xml @@ -5,4 +5,5 @@ Select a Stream Start Playback %1$s kbit/s - Rep ID: %2$s + Version: %s \ No newline at end of file From 270946220fa33ca1e25f41f41906330b35849349 Mon Sep 17 00:00:00 2001 From: Daniel Silhavy Date: Fri, 25 Aug 2023 09:19:45 +0200 Subject: [PATCH 2/2] Add version number of the application to the UI. Output version number of the 5G-MAG dependencies in the log. --- fivegmag_5GMSdAwareApplication/.idea/misc.xml | 3 ++- .../app/build.gradle | 13 +++++++++++ .../a5gmsdawareapplication/MainActivity.kt | 23 ++++++++++++------- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/fivegmag_5GMSdAwareApplication/.idea/misc.xml b/fivegmag_5GMSdAwareApplication/.idea/misc.xml index 8978d23d..9f71c83d 100644 --- a/fivegmag_5GMSdAwareApplication/.idea/misc.xml +++ b/fivegmag_5GMSdAwareApplication/.idea/misc.xml @@ -1,6 +1,7 @@ + - + diff --git a/fivegmag_5GMSdAwareApplication/app/build.gradle b/fivegmag_5GMSdAwareApplication/app/build.gradle index 6328bd71..e41bd909 100644 --- a/fivegmag_5GMSdAwareApplication/app/build.gradle +++ b/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}\"" + } + } + } } \ No newline at end of file diff --git a/fivegmag_5GMSdAwareApplication/app/src/main/java/com/fivegmag/a5gmsdawareapplication/MainActivity.kt b/fivegmag_5GMSdAwareApplication/app/src/main/java/com/fivegmag/a5gmsdawareapplication/MainActivity.kt index fa17df67..aeb08369 100644 --- a/fivegmag_5GMSdAwareApplication/app/src/main/java/com/fivegmag/a5gmsdawareapplication/MainActivity.kt +++ b/fivegmag_5GMSdAwareApplication/app/src/main/java/com/fivegmag/a5gmsdawareapplication/MainActivity.kt @@ -11,6 +11,7 @@ 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 @@ -39,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 { @@ -62,7 +63,8 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener { loadConfiguration() populateM8SelectionSpinner() exoPlayerView = findViewById(R.id.idExoPlayerVIew) - setVersionNumber() + setApplicationVersionNumber() + printDependenciesVersionNumbers() registerButtonListener() mediaSessionHandlerAdapter.initialize( this, @@ -77,7 +79,7 @@ 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) @@ -85,10 +87,10 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener { override fun onStart() { super.onStart() - EventBus.getDefault().register(mediaStreamHandlerEventHandler); + EventBus.getDefault().register(mediaStreamHandlerEventHandler) } - private fun setVersionNumber() { + private fun setApplicationVersionNumber() { try { val packageInfo = packageManager.getPackageInfo(packageName, 0) val versionName = packageInfo.versionName @@ -100,6 +102,11 @@ class MainActivity : AppCompatActivity(), AdapterView.OnItemSelectedListener { } } + 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() { try { val inputStream: InputStream = this.assets.open("config.properties.xml") @@ -185,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) { @@ -262,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()