Merge remote-tracking branch 'origin/dev-server-2.1.130-review-retryUsb' into dev-server-2.1.130-review-retryUsb
This commit is contained in:
@@ -30,6 +30,7 @@ android {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
signingConfig signingConfigs.debug
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
|
||||
@@ -38,6 +38,7 @@ import com.example.hpostesting.domain.SaveRawDataTest
|
||||
import com.example.hpostesting.firebase.FirebaseManager
|
||||
import com.example.hpostesting.presentation.utils.UsbServiceListener
|
||||
import com.example.hpostesting.presentation.utils.UsbServiceListenerImpl
|
||||
import com.example.hpostesting.util.NetworkMonitor
|
||||
import com.example.hpostesting.util.PropertyProvider
|
||||
import com.example.hpostesting.util.PropertyProviderImpl
|
||||
import com.google.firebase.firestore.FirebaseFirestore
|
||||
@@ -240,8 +241,11 @@ object AppModule {
|
||||
return UsbServiceListenerImpl(context)
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
fun provideNetworkMonitor(@ApplicationContext context: Context): NetworkMonitor {
|
||||
return NetworkMonitor(context)
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
package com.example.hpostesting.util
|
||||
|
||||
import android.content.Context
|
||||
import android.net.ConnectivityManager
|
||||
import android.net.Network
|
||||
import android.net.NetworkCapabilities
|
||||
import android.net.NetworkRequest
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import dagger.hilt.android.qualifiers.ApplicationContext
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.SupervisorJob
|
||||
import kotlinx.coroutines.cancel
|
||||
import kotlinx.coroutines.launch
|
||||
import java.net.HttpURLConnection
|
||||
import java.net.URL
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
|
||||
|
||||
@Singleton
|
||||
class NetworkMonitor @Inject constructor(
|
||||
@ApplicationContext private val context: Context
|
||||
) {
|
||||
|
||||
private val connectivityManager =
|
||||
context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
|
||||
|
||||
private val _isConnected = MutableLiveData(false)
|
||||
val isConnected: LiveData<Boolean> get() = _isConnected
|
||||
|
||||
private val networkScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
|
||||
|
||||
private val networkCallback = object : ConnectivityManager.NetworkCallback() {
|
||||
override fun onAvailable(network: Network) {
|
||||
performPingCheck()
|
||||
}
|
||||
override fun onLost(network: Network) {
|
||||
_isConnected.postValue(false)
|
||||
}
|
||||
}
|
||||
|
||||
fun startMonitoring() {
|
||||
val network = connectivityManager.activeNetwork
|
||||
if (network != null) {
|
||||
performPingCheck()
|
||||
}
|
||||
val networkRequest = NetworkRequest.Builder()
|
||||
.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
|
||||
.build()
|
||||
|
||||
connectivityManager.registerNetworkCallback(networkRequest, networkCallback)
|
||||
}
|
||||
|
||||
fun stopMonitoring() {
|
||||
try {
|
||||
connectivityManager.unregisterNetworkCallback(networkCallback)
|
||||
} catch (_: IllegalArgumentException) {
|
||||
}
|
||||
networkScope.cancel()
|
||||
}
|
||||
|
||||
private fun performPingCheck() {
|
||||
networkScope.launch {
|
||||
try {
|
||||
val url = URL("https://www.google.com")
|
||||
val connection = url.openConnection() as HttpURLConnection
|
||||
connection.connectTimeout = 2000
|
||||
connection.connect()
|
||||
val isReachable = connection.responseCode == 200
|
||||
_isConnected.postValue(isReachable)
|
||||
connection.disconnect()
|
||||
} catch (e: Exception) {
|
||||
_isConnected.postValue(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user