Starting updating to ST BLE Sensor V5.1.0

Signed-off-by: Luca Pezzoni <luca.pezzoni@st.com>

Author: PezzoniL

README.md

@@ -5,7 +5,7 @@ Application ST BLE Sensors
 
 # Compilation
 
-Code compiled using gradle 8.1.1 and JDK 11
+Code compiled using gradle  8.2.1 and JDK jbr-17
 
 set on Gradle properties the Github Login name and SSO authentication
 Example:
@@ -16,24 +16,28 @@ GPR_API_KEY=XXXXXXXXXXXXXXXXXXXXXXXX
 For using this application is necessary to downlaod the Android BlueST-SDK from:
 https://github.com/STMicroelectronics/BlueSTSDK_Android
 
-tag BlueST-SDK_V1.0.0
+tag BlueST-SDK_V1.0.10
 
 and follow the instruction for compiling and publish on local maven repository the 2 libraries necessary for this application:
 * st-blue-sdk
 * st-opus
 
 
 
-## Install Bash4 on Mac
+brew install gnu-sed 
 
-brew install bash
+Set the PATH (first on Intel, second on Apple Silicon)
+    PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"  
 
-## Using the script for creating a new demo
+    PATH="/opt/homebrew/opt/gnu-sed/libexec/gnubin:$PATH"  
 
-brew install gnu-sed  
-PATH="/usr/local/opt/gnu-sed/libexec/gnubin:$PATH"  
-cd extra
-/usr/local/bin/bash ./createStDemoModule.sh binary_content xml "Binary Content"
+cd extra 
+
+Run the command (first on Intel, second on Apple Silicon)
+
+    /usr/local/bin/bash ./createStDemoModule.sh binary_content xml "Binary Content"
+
+    /opt/homebrew/bin/bash ./createStDemoModule.sh binary_content xml "Binary Content"
 
 ## License
 

app/build.gradle

@@ -25,8 +25,8 @@ android {
         applicationId "com.st.bluems"
         minSdk rootProject.minSdk
         targetSdk rootProject.targetSdk
-        versionCode 154
-        versionName "5.0.0"
+        versionCode 168
+        versionName "5.1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -120,5 +120,5 @@ dependencies {
 
     // Debug
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakcanary_version"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_reflect"
 }

app/src/main/AndroidManifest.xml

@@ -47,6 +47,17 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <!-- Accepts URIs that begin with "stapplication://connect” -->
+                <data android:scheme="stapplication"
+                    android:host="connect" />
+            </intent-filter>
+
         </activity>
     </application>
 

app/src/main/java/com/st/bluems/MainActivity.kt

@@ -8,7 +8,6 @@
 package com.st.bluems
 
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
@@ -28,11 +27,13 @@ import com.st.welcome.StWelcomeConfig
 import com.st.welcome.WelcomeFragmentDirections
 import com.st.welcome.model.WelcomePage
 import dagger.hilt.android.AndroidEntryPoint
+import java.nio.charset.StandardCharsets
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
     private val viewModel: MainViewModel by viewModels()
+    private val nfcViewModel: NFCConnectionViewModel  by viewModels()
     private lateinit var navController: NavController
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -52,6 +53,20 @@ class MainActivity : AppCompatActivity() {
             )
         }
 
+        //for using NFC deep Link node autoconnect
+        val nfcIntent = intent
+        val appLinkData = nfcIntent.data
+        if (appLinkData != null) {
+
+            val sPairingPin: ByteArray? = appLinkData.getQueryParameter("Pin")?.toByteArray(
+                    StandardCharsets.UTF_8
+                )
+            nfcViewModel.setNFCPairingPin(sPairingPin)
+
+            val mNodeTag: String? = appLinkData.getQueryParameter("Add")
+            nfcViewModel.setNFCNodeId(mNodeTag)
+        }
+
         viewModel.reportApplicationAnalytics(applicationContext)
 
         installSplashScreen()

app/src/main/java/com/st/bluems/NFCConnectionViewModel.kt

@@ -0,0 +1,30 @@
+package com.st.bluems
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+
+class NFCConnectionViewModel: ViewModel() {
+
+    private val _nfcNodeId = MutableStateFlow<String?>(null)
+    val nfcNodeId = _nfcNodeId.asStateFlow()
+
+    private val _pairingPin= MutableStateFlow<ByteArray?>(null)
+    val pairingPin = _pairingPin.asStateFlow()
+
+
+    fun setNFCPairingPin(pin: ByteArray?) {
+        _pairingPin.value = pin
+        if(pin!=null) {
+            Log.i("NFC", "NFC PairingPin = ${String(pin)}")
+        }
+    }
+
+    fun setNFCNodeId(nodeTag: String?) {
+        _nfcNodeId.value = nodeTag
+        if(nodeTag!=null) {
+            Log.i("NFC", "NFC NodeId = $nodeTag")
+        }
+    }
+}