Merge pull request #88 from sieunju/develop

[RELEASE] 1.3.5-beta02

Author: sieunju

app/build.gradle

@@ -57,6 +57,7 @@ dependencies {
 //    implementation("com.github.sieunju.httptracking:interceptor:1.3.2")
     implementation(project(':ui'))
     implementation(project(':interceptor'))
+    implementation(project(":hardware"))
 
     /**
      * Android X

app/src/main/java/com/hmju/httptracking/BleTestProvider.kt

@@ -6,6 +6,7 @@ import android.bluetooth.BluetoothDevice
 import android.bluetooth.BluetoothGatt
 import android.bluetooth.BluetoothGattCallback
 import android.bluetooth.BluetoothGattCharacteristic
+import android.bluetooth.BluetoothGattDescriptor
 import android.bluetooth.BluetoothManager
 import android.bluetooth.BluetoothProfile
 import android.bluetooth.le.ScanCallback
@@ -14,20 +15,16 @@ import android.bluetooth.le.ScanResult
 import android.bluetooth.le.ScanSettings
 import android.content.Context
 import android.os.Build
-import android.os.SystemClock
 import androidx.annotation.RequiresPermission
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.util.forEach
-import androidx.core.util.isNotEmpty
 import hmju.http.tracking_interceptor.TrackingDataManager
-import hmju.http.tracking_interceptor.model.ChildModel
-import hmju.http.tracking_interceptor.model.ContentsModel
-import hmju.http.tracking_interceptor.model.SummaryModel
-import hmju.http.tracking_interceptor.model.TitleModel
-import hmju.http.tracking_interceptor.model.TrackingModel
+import hmju.tracking.hardware.HardwareTrackingModel
 import timber.log.Timber
+import java.nio.ByteBuffer
 import java.text.SimpleDateFormat
 import java.util.Locale
+import java.util.UUID
+import java.util.concurrent.Executors
 
 
 class BleTestProvider(
@@ -117,24 +114,23 @@ class BleTestProvider(
 
             override fun onScanResult(callbackType: Int, result: ScanResult?) {
                 if (result == null) return
-//                if (!duplicationSet.contains(result.device.address)) {
-//                    duplicationSet.add(result.device.address)
-//                    TrackingDataManager.getInstance().add(getBleTrackingModel(result, dateFmt))
-//                }
-                TrackingDataManager.getInstance().add(getBleTrackingModel(result, dateFmt))
+                if (!duplicationSet.contains(result.device.address)) {
+                    duplicationSet.add(result.device.address)
+                    TrackingDataManager.getInstance().add(HardwareTrackingModel(result))
+                }
             }
 
             override fun onBatchScanResults(results: MutableList<ScanResult>?) {
                 if (results == null) return
-                results.forEach {result ->
-                    TrackingDataManager.getInstance().add(getBleTrackingModel(result, dateFmt))
+                results.forEach { result ->
+                    TrackingDataManager.getInstance().add(HardwareTrackingModel(result))
                 }
             }
         }
         val setting = ScanSettings.Builder()
             .setNumOfMatches(ScanSettings.MATCH_NUM_MAX_ADVERTISEMENT)
             .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY)
-            .setReportDelay(1000)
+            // .setReportDelay(1000)
             .build()
 
         val filter = ScanFilter.Builder()
@@ -145,18 +141,64 @@ class BleTestProvider(
     }
 
     @SuppressLint("MissingPermission")
-    private fun startConnection(
-        macAddress: String
+    fun startConnection(
+        macAddress: String,
+        findUuid: String
     ) {
         val callback = object : BleGattCallback() {
             override fun onConnected(gatt: BluetoothGatt) {
-                connectionSet.add(macAddress)
-                Timber.d("연결 완료 되었습니다. $macAddress 연결된 개수:${connectionSet.size}")
+                Timber.d("onConnected $gatt")
             }
 
             override fun onDisconnected(gatt: BluetoothGatt) {
-                connectionSet.remove(macAddress)
-                Timber.d("연결 해제 되었습니다. $macAddress 연결된 개수:${connectionSet.size}")
+                Timber.d("onDisconnected $gatt")
+            }
+
+            override fun onServicesDiscovered(gatt: BluetoothGatt) {
+                var characteristic: BluetoothGattCharacteristic? = null
+                for (service in gatt.services) {
+                    for (character in service.characteristics) {
+                        val uuid = character.uuid.toString().uppercase()
+                        if (findUuid.contains(uuid) || uuid.contains(findUuid)) {
+                            characteristic = character
+                            break
+                        }
+                    }
+                }
+                Timber.d("characteristic 찾습니다..$characteristic")
+                if (characteristic == null) return
+                val writeBytes = ByteBuffer.allocate(2)
+                    .putShort(10000.toShort())
+                    .array() + ByteBuffer.allocate(2)
+                    .putShort(10387.toShort()).array()
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    Timber.d("데이터 사용합니다. ${writeBytes.contentToString()}")
+                    gatt.writeCharacteristic(
+                        characteristic,
+                        writeBytes,
+                        BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT
+                    )
+                    Executors.newSingleThreadExecutor().submit {
+                        Thread.sleep(300)
+                        gatt.setCharacteristicNotification(characteristic, true)
+                        val descriptor = characteristic.getDescriptor(
+                            UUID.fromString("00002902-0000-1000-8000-00805f9b34fb")
+                        )
+                        gatt.writeDescriptor(
+                            descriptor,
+                            BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE
+                        )
+                    }
+                }
+            }
+
+            override fun onCharacteristicRead(gatt: BluetoothGatt, value: ByteArray) {
+                TrackingDataManager.getInstance().add(HardwareTrackingModel(gatt, value))
+            }
+
+            override fun onCharacteristicChanged(gatt: BluetoothGatt, value: ByteArray) {
+                Timber.d("onCharacteristicChanged ${value.contentToString()}")
+                TrackingDataManager.getInstance().add(HardwareTrackingModel(gatt, value))
             }
         }
         val device = adapter.getRemoteDevice(macAddress)
@@ -167,78 +209,4 @@ class BleTestProvider(
             BluetoothDevice.TRANSPORT_LE
         ).also { it.requestMtu(300) }
     }
-
-    @SuppressLint("MissingPermission")
-    private fun getBleTrackingModel(
-        data: ScanResult,
-        dateFmt: SimpleDateFormat
-    ): TrackingModel {
-        val bootTimeMillis = System.currentTimeMillis() - SystemClock.elapsedRealtime()
-        val scanTime = bootTimeMillis + (data.timestampNanos / 1_000_000L)
-        val device = data.device
-        val summary = SummaryModel(
-            colorHexCode = "#367CEE",
-            titleList = listOf(
-                "🛜BLE",
-                "Advertising",
-                dateFmt.format(scanTime)
-            ),
-            contentsList = listOf(
-                if (!device.name.isNullOrEmpty()) device.name else "Unknown",
-                device.address,
-                "${data.rssi}dBm"
-            )
-        )
-        val req = mutableSetOf<ChildModel>()
-        req.add(TitleModel("#C62828", "[Device]"))
-        if (!device.name.isNullOrEmpty()) {
-            req.add(ContentsModel(text = "Name:${device.name}"))
-        }
-        req.add(ContentsModel(hexCode = "#222222", text = device.address))
-        when (device.type) {
-            BluetoothDevice.DEVICE_TYPE_LE -> "Low Energy"
-            BluetoothDevice.DEVICE_TYPE_DUAL -> "Dual Mode"
-            BluetoothDevice.DEVICE_TYPE_CLASSIC -> "Classic"
-            BluetoothDevice.DEVICE_TYPE_UNKNOWN -> "Unknown"
-            else -> "Invalid"
-        }.run { req.add(ContentsModel(hexCode = "#222222", text = "Device type:${this}")) }
-        req.add(ContentsModel(hexCode = "#222222", text = "📶${data.rssi}dBm"))
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val phy = when (data.primaryPhy) {
-                BluetoothDevice.PHY_LE_1M -> "LE 1M"
-                BluetoothDevice.PHY_LE_2M -> "LE 2M"
-                BluetoothDevice.PHY_LE_CODED -> "LE Coded"
-                else -> "Unknown"
-            }
-            req.add(ContentsModel(hexCode = "#222222", text = "Phy:${phy}"))
-            req.add(ContentsModel(text = "Connectable:${data.isConnectable}"))
-        }
-        val scanRecord = data.scanRecord
-        if (scanRecord != null) {
-            req.add(TitleModel("#C62828", "[UUID]"))
-            if (!scanRecord.serviceUuids.isNullOrEmpty()) {
-                scanRecord.serviceUuids.forEach {
-                    req.add(ContentsModel(hexCode = "#222222", text = it.uuid.toString()))
-                }
-            }
-            if (scanRecord.manufacturerSpecificData.isNotEmpty()) {
-                req.add(TitleModel("#C62828", "[Manufacture]"))
-                scanRecord.manufacturerSpecificData.forEach { key, value ->
-                    ContentsModel(
-                        hexCode = "#222222",
-                        text = "ID:${String.format("0x%04X", key)}"
-                    ).run { req.add(this) }
-                    ContentsModel(
-                        hexCode = "#222222",
-                        text = value.joinToString { String.format("%02X", it) }
-                    ).run { req.add(this) }
-                }
-            }
-        }
-        return TrackingModel(
-            req = req.toList(),
-            res = listOf(),
-            summary = summary
-        )
-    }
 }

app/src/main/java/com/hmju/httptracking/MainActivity.kt

@@ -12,6 +12,7 @@ internal class MainActivity : AppCompatActivity() {
 
     private lateinit var httpTest: HttpTestProvider
     private lateinit var bleTest: BleTestProvider
+    private lateinit var nfcTest: NfcTestProvider
 
     private val permissionsLauncher = registerForActivityResult(
         ActivityResultContracts.RequestMultiplePermissions()
@@ -32,13 +33,21 @@ internal class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
         httpTest = HttpTestProvider(this).onInit()
         bleTest = BleTestProvider(this)
+        nfcTest = NfcTestProvider(this)
 
         findViewById<Button>(R.id.bFileUpload).setOnClickListener {
             httpTest.startFileUpload()
         }
+        findViewById<Button>(R.id.bNfc).setOnClickListener { nfcTest.startTag() }
 
         findViewById<Button>(R.id.bHttp).setOnClickListener { httpTest.startHttpTest() }
-        findViewById<Button>(R.id.bBle).setOnClickListener { bleTest.startBleAdv() }
+        findViewById<Button>(R.id.bBleAdv).setOnClickListener { bleTest.startBleAdv() }
+        findViewById<Button>(R.id.bBleConnect).setOnClickListener {
+            bleTest.startConnection(
+                macAddress = "01:A1:02:14:89:27",
+                findUuid = "02001201-4202-EAB5-ED11"
+            )
+        }
 
         permissionsLauncher.launch(getPermissions())
         onBackPressedDispatcher.addCallback(this, backPressCallback)

app/src/main/java/com/hmju/httptracking/NfcTestProvider.kt

@@ -0,0 +1,38 @@
+package com.hmju.httptracking
+
+import android.nfc.NfcAdapter
+import android.nfc.tech.Ndef
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import hmju.http.tracking_interceptor.TrackingDataManager
+import hmju.tracking.hardware.HardwareTrackingModel
+
+class NfcTestProvider(
+    private val activity: AppCompatActivity
+) {
+
+    private val adapter: NfcAdapter by lazy { NfcAdapter.getDefaultAdapter(activity) }
+
+    private val callback = NfcAdapter.ReaderCallback { tag ->
+        if (tag == null) return@ReaderCallback
+        try {
+            val ndef = Ndef.get(tag) ?: throw NullPointerException("Ndef is Null")
+            if (!ndef.isConnected) {
+                ndef.connect()
+            }
+            TrackingDataManager.getInstance().add(HardwareTrackingModel(ndef))
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+        }
+    }
+
+    fun startTag() {
+        val flags = NfcAdapter.FLAG_READER_NFC_A or
+                NfcAdapter.FLAG_READER_NFC_B or
+                NfcAdapter.FLAG_READER_NFC_F or
+                NfcAdapter.FLAG_READER_NFC_V
+        val config = Bundle()
+        config.putInt(NfcAdapter.EXTRA_READER_PRESENCE_CHECK_DELAY, 20)
+        adapter.enableReaderMode(activity, callback, flags, config)
+    }
+}

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

@@ -21,10 +21,17 @@
         android:text="NFC 테스트" />
 
     <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/bBle"
+        android:id="@+id/bBleAdv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="BLE 테스트" />
+        android:text="BLE ADV 테스트" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/bBleConnect"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="BLE Connect 테스트" />
+
 
     <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/bFileUpload"

hardware/.gitignore

@@ -0,0 +1 @@
+/build

hardware/build.gradle

@@ -0,0 +1,51 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
+    id 'maven-publish'
+}
+
+android {
+    namespace 'hmju.tracking.hardware'
+    compileSdk 34
+
+    defaultConfig {
+        minSdk 23
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+dependencies {
+    api(project(":model"))
+
+    implementation 'androidx.core:core-ktx:1.6.0'
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            deploy(MavenPublication) {
+                from components.release
+                groupId = 'com.github.sieunju.httptracking'
+                artifactId = 'hardware'
+                version = deps.release
+            }
+        }
+    }
+}

hardware/consumer-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile