add signal strength monitor

johnnzhou · johnnzhou · commit 96ad964223de · 2023-02-06T15:18:09.000-08:00
diff --git a/app/src/main/java/com/lcl/lclmeasurementtool/MainActivityViewModel.kt b/app/src/main/java/com/lcl/lclmeasurementtool/MainActivityViewModel.kt
@@ -1,8 +1,9 @@
 package com.lcl.lclmeasurementtool
 
 import android.content.Context
+import android.os.Build
+import android.telephony.CellSignalStrength
 import android.util.Log
-import androidx.compose.runtime.MutableState
 import androidx.compose.ui.graphics.Color
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -13,8 +14,8 @@ import com.kongzue.dialogx.dialogs.TipDialog
 import com.lcl.lclmeasurementtool.Utils.ECDSA
 import com.lcl.lclmeasurementtool.Utils.Hex
 import com.lcl.lclmeasurementtool.Utils.SecurityUtils
+import com.lcl.lclmeasurementtool.Utils.SignalStrengthLevel
 import com.lcl.lclmeasurementtool.constants.NetworkConstants
-import com.lcl.lclmeasurementtool.datasource.LocationDataSource
 import com.lcl.lclmeasurementtool.features.iperf.IperfRunner
 import com.lcl.lclmeasurementtool.features.iperf.IperfStatus
 import com.lcl.lclmeasurementtool.features.ping.Ping
@@ -27,8 +28,9 @@ import com.lcl.lclmeasurementtool.model.datamodel.RegistrationModel
 import com.lcl.lclmeasurementtool.model.datamodel.UserData
 import com.lcl.lclmeasurementtool.model.repository.NetworkApiRepository
 import com.lcl.lclmeasurementtool.model.repository.UserDataRepository
+import com.lcl.lclmeasurementtool.telephony.SignalStrengthLevelEnum
+import com.lcl.lclmeasurementtool.telephony.SignalStrengthMonitor
 import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import java.io.ByteArrayOutputStream
@@ -41,7 +43,8 @@ import javax.inject.Inject
 class MainActivityViewModel @Inject constructor(
     private val userDataRepository: UserDataRepository,
     private val networkApi: NetworkApiRepository,
-    private val locationService: LocationService
+    private val locationService: LocationService,
+    private val signalStrengthMonitor: SignalStrengthMonitor
 ) : ViewModel() {
 
     companion object {
@@ -199,7 +202,7 @@ class MainActivityViewModel @Inject constructor(
 
 
     // Network Testing
-    private val jobs = mutableListOf<Job>()
+    private val _jobs = mutableListOf<Job>()
     private var _pingResult = MutableStateFlow(PingResultState())
     private var _downloadResult = MutableStateFlow(ConnectivityTestResult())
     private var _uploadResult = MutableStateFlow(ConnectivityTestResult())
@@ -209,7 +212,25 @@ class MainActivityViewModel @Inject constructor(
     val pingResult: StateFlow<PingResultState> = _pingResult.asStateFlow()
     var downloadResult: StateFlow<ConnectivityTestResult> = _downloadResult.asStateFlow()
     var uploadResult: StateFlow<ConnectivityTestResult> = _uploadResult.asStateFlow()
-
+    var signalStrengthResult = signalStrengthMonitor.signalStrength.map {s ->
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            val report = s.getCellSignalStrengths(CellSignalStrength::class.java)
+            if (report.isEmpty()) {
+                SignalStrengthResult(0, SignalStrengthLevelEnum.POOR)
+            } else {
+                val data = report[0]
+                SignalStrengthResult(data.dbm, SignalStrengthLevelEnum.init(data.level))
+            }
+        } else {
+            val dBm = s.getGsmSignalStrength()
+            val level = SignalStrengthLevelEnum.init(s.level)
+            SignalStrengthResult(dBm, level)
+        }
+    }.stateIn(
+        scope = viewModelScope,
+        initialValue = SignalStrengthResult(0, SignalStrengthLevelEnum.POOR),
+        started = SharingStarted.WhileSubscribed(5_000)
+    )
 
     val isTestActive = _isTestActive.asStateFlow()
 
@@ -269,10 +290,10 @@ class MainActivityViewModel @Inject constructor(
 
     fun doIperf(context: Context) = viewModelScope.launch {
         val uploadJob = getUploadResult(context = context)
-        jobs.add(uploadJob)
+        _jobs.add(uploadJob)
         uploadJob.join()
         val downloadJob = getDownloadResult(context = context)
-        jobs.add(downloadJob)
+        _jobs.add(downloadJob)
     }
 }
 
@@ -289,4 +310,6 @@ open class ConnectivityTestResult {
 open class PingResultState {
     data class Success(val result: PingResult): PingResultState()
     data class Error(val error: PingError): PingResultState()
-}
+}
+
+data class SignalStrengthResult(val dbm: Int, val level: SignalStrengthLevelEnum)
diff --git a/app/src/main/java/com/lcl/lclmeasurementtool/Managers/CellularManager.java b/app/src/main/java/com/lcl/lclmeasurementtool/Managers/CellularManager.java
@@ -299,7 +299,7 @@ public void onSignalStrengthsChanged(SignalStrength signalStrength) {
                                 dBm = report.getDbm();
                             } else {
                                 level = SignalStrengthLevel.POOR;
-                                dBm = level.getLevelCode();
+                                dBm = report.getDbm();
                             }
                         } else {
                             dBm = signalStrength.getGsmSignalStrength();
diff --git a/app/src/main/java/com/lcl/lclmeasurementtool/datasource/SignalStrengthDataSource.kt b/app/src/main/java/com/lcl/lclmeasurementtool/datasource/SignalStrengthDataSource.kt
@@ -9,6 +9,7 @@ import android.telephony.TelephonyCallback
 import android.telephony.TelephonyManager
 import androidx.annotation.RequiresApi
 import androidx.core.content.getSystemService
+import com.lcl.lclmeasurementtool.telephony.SignalStrengthMonitor
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.channels.awaitClose
@@ -19,9 +20,9 @@ import javax.inject.Inject
 
 class SignalStrengthDataSource @Inject constructor(
     @ApplicationContext private val context: Context
-) {
+): SignalStrengthMonitor {
     @OptIn(FlowPreview::class)
-    val signalStrength = callbackFlow {
+    override val signalStrength = callbackFlow<SignalStrength> {
         val telephonyManager = context.getSystemService<TelephonyManager>()
         val executor = Executors.newSingleThreadExecutor()
 
@@ -41,7 +42,7 @@ class SignalStrengthDataSource @Inject constructor(
         } else {
             @Suppress("OVERRIDE_DEPRECATION")
             val callback = object : PhoneStateListener(executor) {
-                override fun onSignalStrengthsChanged(s: SignalStrength?) {
+                override fun onSignalStrengthsChanged(s: SignalStrength) {
                     super.onSignalStrengthsChanged(s)
                     channel.trySend(s)
                 }
diff --git a/app/src/main/java/com/lcl/lclmeasurementtool/modules/DataModule.kt b/app/src/main/java/com/lcl/lclmeasurementtool/modules/DataModule.kt
@@ -2,13 +2,15 @@ package com.lcl.lclmeasurementtool.modules
 
 import com.lcl.lclmeasurementtool.datasource.ConnectivityMonitorDataSource
 import com.lcl.lclmeasurementtool.datasource.LocationDataSource
+import com.lcl.lclmeasurementtool.datasource.SignalStrengthDataSource
 import com.lcl.lclmeasurementtool.datasource.SimStateMonitorDataSource
 import com.lcl.lclmeasurementtool.location.LocationService
 import com.lcl.lclmeasurementtool.model.datamodel.ConnectivityReportModel
 import com.lcl.lclmeasurementtool.model.datamodel.SignalStrengthReportModel
 import com.lcl.lclmeasurementtool.model.repository.*
 import com.lcl.lclmeasurementtool.networking.NetworkMonitor
 import com.lcl.lclmeasurementtool.networking.SimStateMonitor
+import com.lcl.lclmeasurementtool.telephony.SignalStrengthMonitor
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -37,6 +39,11 @@ interface DataModule {
         locationService: LocationDataSource
     ): LocationService
 
+    @Binds
+    fun bindsSignalStrengthMonitor(
+        signalStrengthDataSource: SignalStrengthDataSource
+    ): SignalStrengthMonitor
+
     @Binds
     fun bindsNetworkAPI(
         lclApiRepository: LCLApiRepository
diff --git a/app/src/main/java/com/lcl/lclmeasurementtool/telephony/SignalStrengthLevel.kt b/app/src/main/java/com/lcl/lclmeasurementtool/telephony/SignalStrengthLevel.kt
@@ -0,0 +1,49 @@
+package com.lcl.lclmeasurementtool.telephony
+
+import androidx.compose.ui.graphics.Color
+
+
+enum class SignalStrengthLevelEnum(val level: Int) {
+
+    NONE(0) {
+        override fun color(): Color {
+            return Color.LightGray
+        }
+    },
+
+    // the signal strength is poor or unknown
+    POOR(1) {
+        override fun color(): Color {
+            return Color.Red
+        }
+    },
+
+    // the signal strength is weak
+    MODERATE(2) {
+        override fun color(): Color {
+            return Color(0xFFF47E4C) // orange
+        }
+    },
+
+    // the signal strength is moderate
+    GOOD(3) {
+        override fun color(): Color {
+            return Color(0xFF81FF50) // light green
+        }
+    },
+
+    // the signal strength is good
+    GREAT(4) {
+        override fun color(): Color {
+            return Color.Green
+        }
+    };
+
+    abstract fun color(): Color
+
+    companion object {
+        fun init(value: Int): SignalStrengthLevelEnum {
+            return SignalStrengthLevelEnum.values().first { it.level == value }
+        }
+    }
+}
diff --git a/app/src/main/java/com/lcl/lclmeasurementtool/telephony/SignalStrengthMonitor.kt b/app/src/main/java/com/lcl/lclmeasurementtool/telephony/SignalStrengthMonitor.kt
@@ -0,0 +1,8 @@
+package com.lcl.lclmeasurementtool.telephony
+
+import android.telephony.SignalStrength
+import kotlinx.coroutines.flow.Flow
+
+interface SignalStrengthMonitor {
+    val signalStrength: Flow<SignalStrength>
+}
diff --git a/app/src/main/java/com/lcl/lclmeasurementtool/ui/HomeScreen.kt b/app/src/main/java/com/lcl/lclmeasurementtool/ui/HomeScreen.kt
@@ -30,6 +30,7 @@ import com.lcl.lclmeasurementtool.ConnectivityTestResult
 import com.lcl.lclmeasurementtool.MainActivityViewModel
 import com.lcl.lclmeasurementtool.MainActivityViewModel.Companion.TAG
 import com.lcl.lclmeasurementtool.PingResultState
+import com.lcl.lclmeasurementtool.SignalStrengthResult
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelAndJoin
 
@@ -47,13 +48,14 @@ fun HomeScreen(modifier: Modifier = Modifier, isOffline: Boolean, mainActivityVi
     val pingResult = mainActivityViewModel.pingResult.collectAsStateWithLifecycle()
     val uploadResult = mainActivityViewModel.uploadResult.collectAsStateWithLifecycle()
     val downloadResult = mainActivityViewModel.downloadResult.collectAsStateWithLifecycle()
+    val signalStrength = mainActivityViewModel.signalStrengthResult.collectAsStateWithLifecycle()
 
     val jobs = mutableListOf<Job>()
     val context = LocalContext.current
     
     Box(modifier = Modifier.fillMaxSize()) {
         Column(modifier = modifier.fillMaxHeight()) {
-            SignalStrengthCard(modifier = modifier)
+            SignalStrengthCard(modifier = modifier, signalStrengthResult = signalStrength.value)
             ConnectivityCard(
                 modifier = modifier,
                 pingResult = pingResult.value,
@@ -95,9 +97,11 @@ fun ShowMessage(isOffline: Boolean, msg: String, snackbarHostState: SnackbarHost
 @Composable
 private fun SignalStrengthCard(
     modifier: Modifier = Modifier,
+    signalStrengthResult: SignalStrengthResult
 ) {
     val fontSize = 18.sp
 
+    val (dbm, level) = signalStrengthResult
 
     Card(colors = CardDefaults.cardColors(MaterialTheme.colorScheme.surfaceVariant),
         modifier = Modifier
@@ -115,7 +119,7 @@ private fun SignalStrengthCard(
             Spacer(modifier = Modifier.width(12.dp))
             Text(text = "Signal Strength:", fontSize = fontSize)
             Spacer(modifier = Modifier.width(4.dp))
-            Text(text = "val", fontWeight = FontWeight.Bold, fontSize = fontSize)
+            Text(text = "$dbm", fontWeight = FontWeight.Bold, fontSize = fontSize)
             Spacer(modifier = Modifier.width(4.dp))
             Text(text = "dBm", fontSize = fontSize)
             Spacer(modifier = Modifier.width(20.dp))
@@ -124,7 +128,7 @@ private fun SignalStrengthCard(
                 .clip(
                     CircleShape
                 )
-                .background(Color.Green))
+                .background(level.color()))
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ public void onSignalStrengthsChanged(SignalStrength signalStrength) {`
`299`	`299`	`dBm = report.getDbm();`
`300`	`300`	`} else {`
`301`	`301`	`level = SignalStrengthLevel.POOR;`
`302`		`- dBm = level.getLevelCode();`
	`302`	`+ dBm = report.getDbm();`
`303`	`303`	`}`
`304`	`304`	`} else {`
`305`	`305`	`dBm = signalStrength.getGsmSignalStrength();`