just goto version to

jchodev · jchodev · commit b4b9e325678b · 2023-11-17T12:33:42.000Z
diff --git a/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/data/mapper/BleDeviceServiceMapper.kt b/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/data/mapper/BleDeviceServiceMapper.kt
@@ -10,6 +10,20 @@ import com.jerry.blescanner.features.bluetooth.domain.BleDeviceCharacteristic
 import com.jerry.blescanner.features.bluetooth.domain.BleDeviceDescriptor
 import com.jerry.blescanner.features.bluetooth.domain.BleDeviceService
 
+/*
+BluetoothGattService（藍牙 GATT 服務）：它代表著藍牙裝置中的一個服務。服務是藍牙設備上的一個功能單元，通常包含一個或多個特徵（BluetoothGattCharacteristic）。服務可以提供設備的不同功能，例如心率監測、電池狀態等等。每個服務都有一個唯一的識別符號（UUID）來區分不同的服務。
+
+BluetoothGattCharacteristic（藍牙 GATT 特徵）：它代表著藍牙裝置服務中的一個特徵。特徵是服務的一個特定功能，例如傳感器數據、設備配置等。特徵可以包含數據值，並且可以進行讀取和寫入操作。每個特徵也有一個唯一的 UUID 來識別它。
+
+BluetoothGattDescriptor（藍牙 GATT 描述符）：它代表著藍牙特徵中的一個描述符。描述符提供了特徵的額外信息，例如特徵的配置設置、單位、格式等。描述符通常用於特徵的讀取和寫入操作之外的其他操作。
+ */
+/*
+BluetoothGattService 代表一個 BLE 服務，它可以提供一個或多個特性。服務通常用於表示一個功能或設備的組件。例如，一個心率監測器可能會有一個名為 "Heart Rate" 的服務，它可以提供一個名為 "Heart Rate Measurement" 的特性。
+
+BluetoothGattCharacteristic 代表一個 BLE 特性，它可以用來存儲數據或提供一個功能。特性通常用於表示一個設備的狀態或配置。例如，一個心率監測器可能會有一個名為 "Heart Rate Measurement" 的特性，它可以用來存儲心率數據。
+
+BluetoothGattDescriptor 代表一個 BLE 描述符，它可以用來提供有關特性的附加信息。描述符通常用於配置特性的行為或提供有關特性的額外信息。例如，一個心率監測器可能會有一個名為 "Client Characteristic Configuration" 的描述符，它可以用來配置客戶端是否可以讀取或寫入特性。
+ */
 fun BluetoothGattService.toBleDeviceService(): BleDeviceService {
     return BleDeviceService(
         uuid = uuid,
@@ -20,6 +34,7 @@ fun BluetoothGattService.toBleDeviceService(): BleDeviceService {
 }
 
 fun BluetoothGattCharacteristic.toBleDeviceCharacteristic(): BleDeviceCharacteristic {
+    val aaa = this.value
     return BleDeviceCharacteristic(
         uuid = uuid,
         name = AllGattCharacteristics.lookup(uuid),
diff --git a/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/domain/BleConnectManager.kt b/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/domain/BleConnectManager.kt
@@ -5,19 +5,41 @@ import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothDevice.TRANSPORT_LE
 import android.bluetooth.BluetoothGatt
 import android.bluetooth.BluetoothGattCallback
+import android.bluetooth.BluetoothGattCharacteristic
 import android.bluetooth.BluetoothProfile
 import android.content.Context
-import androidx.compose.runtime.MutableIntState
-import com.jerry.blescanner.basemodule.presentation.UiDataState
+import android.util.Log
 import com.jerry.blescanner.features.bluetooth.data.mapper.toBleDeviceService
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import timber.log.Timber
 import javax.inject.Inject
 
+
 //https://medium.com/@martijn.van.welie/making-android-ble-work-part-2-47a3cdaade07
+
+// for getValue was @Deprecated in BluetoothGattCharacteristic
 //https://stackoverflow.com/questions/25330938/android-bluetoothgatt-status-133-register-callback
+
+
+//example got the value from BLE
+/*
+1
+如果要接受 Bluetooth device 的 byebalue，您應該從 BluetoothGattCharacteristic 來取得。BluetoothGattCharacteristic 是用來存儲數據的，而 BluetoothGattService 和 BluetoothGattDescriptor 都是 GATT 模型的組成部分，不直接存儲數據。
+
+具體來說，您可以使用 BluetoothGattCharacteristic 的 getValue() 方法來取得它的值。該方法返回一個 byte[] 數組，其中包含特徵的值。您可以使用該數組來解析數據。
+
+例如，如果您要取得心率監測器的當前心率，您可以使用以下代碼：
+
+BluetoothGattCharacteristic characteristic = service.getCharacteristic(UUID.fromString("00002a37-0000-1000-8000-00805f9b34fb"));
+
+int heartRate = characteristic.getValue()[0];
+
+這段代碼會取得心率監測器的 GATT 服務中的 00002a37-0000-1000-8000-00805f9b34fb 特徵。該特徵用來存儲當前心率。代碼會使用 getValue() 方法來取得特徵的值，並將其存儲在 heartRate 變量中。
+ */
+//https://github.com/marcolivierarsenault/PolarHeartRateApplication/blob/master/app/src/main/java/org/marco45/polarheartmonitor/H7ConnectThread.java
+
 @SuppressLint("MissingPermission")
 class BleConnectManager @Inject constructor(
     private val bluetoothAdapter: BluetoothAdapter,
@@ -59,6 +81,19 @@ class BleConnectManager @Inject constructor(
 
         }
 
+        override fun onCharacteristicRead(
+            gatt: BluetoothGatt?,
+            characteristic: BluetoothGattCharacteristic,
+            status: Int
+        ) {
+            if (status == BluetoothGatt.GATT_SUCCESS) {
+            }
+
+            val value = characteristic.value
+            Timber.d("onCharacteristicRead::status: $value")
+        }
+
+
         override fun onServicesDiscovered(gatt: BluetoothGatt?, status: Int) {
             super.onServicesDiscovered(gatt, status)
 
diff --git a/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/domain/BleDeviceService.kt b/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/domain/BleDeviceService.kt
@@ -6,21 +6,21 @@ import android.bluetooth.BluetoothGattService
 import java.util.UUID
 
 data class BleDeviceService(
-    val service: BluetoothGattService,
+    val service: BluetoothGattService? = null,
     val uuid: UUID,
     val name: String,
     val characteristics: List<BleDeviceCharacteristic>
 )
 
 data class BleDeviceCharacteristic(
-    val characteristic: BluetoothGattCharacteristic,
+    val characteristic: BluetoothGattCharacteristic? = null,
     val uuid:UUID,
     val name: String,
     val bleDeviceDescriptors: List<BleDeviceDescriptor>
 )
 
 data class BleDeviceDescriptor(
-    val descriptor: BluetoothGattDescriptor,
+    val descriptor: BluetoothGattDescriptor? = null,
     val uuid:UUID,
     val name: String
 )
diff --git a/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/presentation/BluetoothActivity.kt b/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/presentation/BluetoothActivity.kt
@@ -26,7 +26,7 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
-import com.jerry.blescanner.features.bluetooth.presentation.components.BleConnectPage
+import com.jerry.blescanner.features.bluetooth.presentation.components.connect.BleConnectPage
 import com.jerry.blescanner.features.bluetooth.presentation.components.BleScanPage
 import com.jerry.blescanner.features.bluetooth.presentation.mvi.BluetoothPageIntent
 import com.jerry.blescanner.features.bluetooth.presentation.viewmodel.BluetoothConnectViewModel
@@ -36,7 +36,6 @@ import com.jerry.blescanner.features.bluetooth.utils.BluetoothStopSource
 import com.jerry.blescanner.jetpack_design_lib.theme.MyTheme
 import com.polidea.rxandroidble3.RxBleClient
 import dagger.hilt.android.AndroidEntryPoint
-import io.reactivex.rxjava3.disposables.Disposable
 import timber.log.Timber
 import javax.inject.Inject
 
diff --git a/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/presentation/components/connect/BleConnectPage.kt b/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/presentation/components/connect/BleConnectPage.kt
@@ -1,21 +1,26 @@
-package com.jerry.blescanner.features.bluetooth.presentation.components
+package com.jerry.blescanner.features.bluetooth.presentation.components.connect
 
+
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
+
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+
 import androidx.compose.ui.Modifier
+
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.viewmodel.compose.viewModel
-import com.jerry.blescanner.basemodule.presentation.UiDataState
 import com.jerry.blescanner.features.bluetooth.domain.BleDeviceService
 import com.jerry.blescanner.features.bluetooth.presentation.viewmodel.BluetoothConnectViewModel
 import com.jerry.blescanner.jetpack_design_lib.common.loading.CommonLoading
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun BleConnectPage(
     address: String,
@@ -47,27 +52,25 @@ fun BleConnectPage(
 
         //UI
         if (serviceListState.value?.isNotEmpty() == true){
-
-            LazyColumn(modifier = Modifier.fillMaxSize()) {
-                items(serviceListState.value!!){
-                    ServiceItem(bleDeviceService = it)
-                }
-            }
-
+            BleConnectServiceViewPager(
+                serviceListState = serviceListState
+            )
         }
         else {
             CommonLoading()
         }
     }
 }
 
+
 @Composable
 fun ServiceItem(
     bleDeviceService: BleDeviceService
 ) {
     Column {
         Text(text = "Service: ${bleDeviceService.name} (${bleDeviceService.uuid}" )
     }
+
     bleDeviceService.characteristics.forEach { char->
         Column {
             Text(text = " Characteristic: ${char.name} (${char.uuid}" )
diff --git a/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/presentation/components/connect/BleConnectServiceViewPager.kt b/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/presentation/components/connect/BleConnectServiceViewPager.kt
@@ -0,0 +1,89 @@
+package com.jerry.blescanner.features.bluetooth.presentation.components.connect
+
+import android.annotation.SuppressLint
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.jerry.blescanner.features.bluetooth.domain.BleDeviceCharacteristic
+import com.jerry.blescanner.features.bluetooth.domain.BleDeviceDescriptor
+import com.jerry.blescanner.features.bluetooth.domain.BleDeviceService
+import com.jerry.blescanner.jetpack_design_lib.common.indicator.DotsIndicator
+import com.jerry.blescanner.jetpack_design_lib.theme.MyTheme
+import java.util.UUID
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun BleConnectServiceViewPager(
+    serviceListState: State<List<BleDeviceService>?>
+) {
+    serviceListState.value?.let {
+        val pageCount = it.size
+        val pagerState = rememberPagerState { pageCount }
+
+        Column(
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            HorizontalPager(state = pagerState) {
+                BleConnectTable(
+                    bleDeviceService = serviceListState.value!![it]
+                )
+            }
+
+            Spacer(modifier = Modifier.height(10.dp))
+
+            DotsIndicator(
+                totalDots = pageCount,
+                selectedIndex = pagerState.currentPage,
+                selectedColor = MaterialTheme.colorScheme.onSurfaceVariant,
+                unSelectedColor = MaterialTheme.colorScheme.surfaceVariant
+            )
+
+        }
+
+
+    }
+}
+
+@SuppressLint("UnrememberedMutableState")
+@Preview(showBackground = true)
+@Composable
+private fun BleConnectServiceViewPagerPreview() {
+    val listState = mutableStateOf<List<BleDeviceService>?>(null)
+
+    listState.value = listOf(
+        BleDeviceService(
+            name = "this is name",
+            uuid = UUID.fromString("this is UUID"),
+            characteristics = listOf(
+                BleDeviceCharacteristic(
+                    name = "this is char 1",
+                    uuid = UUID.fromString("this is char UUID 1"),
+                    bleDeviceDescriptors = listOf(
+                        BleDeviceDescriptor(
+                            name = "this is desc 1",
+                            uuid = UUID.fromString("this is desc UUID 1"),
+                        )
+                    )
+                )
+            )
+        )
+    )
+    MyTheme {
+        BleConnectServiceViewPager(
+            serviceListState = listState
+        )
+    }
+
+}
diff --git a/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/presentation/components/connect/BleConnectTable.kt b/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/presentation/components/connect/BleConnectTable.kt
@@ -0,0 +1,68 @@
+package com.jerry.blescanner.features.bluetooth.presentation.components.connect
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedCard
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.jerry.blescanner.features.bluetooth.domain.BleDeviceService
+
+@Composable
+fun BleConnectTable(
+    bleDeviceService : BleDeviceService
+) {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .border(1.dp, MaterialTheme.colorScheme.onBackground)
+    ) {
+        //title
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(color = MaterialTheme.colorScheme.primary)
+                .padding(5.dp),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Text(
+                text = bleDeviceService.name,
+                color = MaterialTheme.colorScheme.onPrimary
+            )
+            Text(
+                text = bleDeviceService.uuid.toString(),
+                color = MaterialTheme.colorScheme.onPrimary
+            )
+        }
+
+        Column(
+            modifier = Modifier.padding(10.dp)
+        ) {
+            bleDeviceService.characteristics.forEachIndexed { index, char->
+
+                ExpandableCharacteristicCard(
+                    bleDeviceCharacteristic = char
+                )
+                Spacer(modifier = Modifier.height(10.dp))
+
+            }
+        }
+
+    }
+
+
+}
diff --git a/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/presentation/components/connect/ExpandableCharacteristicCard.kt b/features/bluetooth/src/main/java/com/jerry/blescanner/features/bluetooth/presentation/components/connect/ExpandableCharacteristicCard.kt
diff --git a/jetpack-design-lib/src/main/java/com/jerry/blescanner/jetpack_design_lib/common/indicator/DotsIndicator.kt b/jetpack-design-lib/src/main/java/com/jerry/blescanner/jetpack_design_lib/common/indicator/DotsIndicator.kt
