Compare commits
10 Commits
dev-server
...
dev-server
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e9c8a9a887 | ||
|
|
e7ecf7eedf | ||
|
|
e3435f2182 | ||
|
|
f6cdd64ef6 | ||
|
|
7ad21ea5a9 | ||
|
|
6c89efeb5e | ||
|
|
63eaf1cadc | ||
|
|
c180f7be31 | ||
|
|
c243ec6c8f | ||
|
|
7c9238591b |
@@ -20,8 +20,8 @@ android {
|
||||
applicationId "in.sminnovations.hpostesting.server"
|
||||
minSdk 30
|
||||
targetSdk 34
|
||||
versionCode 134
|
||||
versionName "2.1.131"
|
||||
versionCode 136
|
||||
versionName "2.1.133"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
|
||||
@@ -24,13 +24,12 @@
|
||||
<uses-feature android:name="android.hardware.usb.host" />
|
||||
|
||||
<uses-permission android:name="android.permission.USB_PERMISSION" />
|
||||
|
||||
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
||||
<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
|
||||
<uses-permission android:name="android.permission.ACCOUNT_MANAGER"
|
||||
<uses-permission
|
||||
android:name="android.permission.ACCOUNT_MANAGER"
|
||||
tools:ignore="ProtectedPermissions" />
|
||||
|
||||
|
||||
<application
|
||||
android:name="com.example.hpostesting.HPOSTestingApplication"
|
||||
android:allowBackup="true"
|
||||
@@ -43,10 +42,13 @@
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.HPOSTesting"
|
||||
tools:targetApi="31">
|
||||
<activity
|
||||
android:name="com.example.hpostesting.presentation.randd.RandDActivity"
|
||||
android:exported="false" />
|
||||
<activity
|
||||
android:name="com.example.hpostesting.presentation.main_base.UpdateValuesActivity"
|
||||
android:exported="false"
|
||||
android:screenOrientation="portrait"/>
|
||||
android:screenOrientation="portrait" />
|
||||
|
||||
<service
|
||||
android:name="com.example.hpostesting.util.MyAuthenticatorService"
|
||||
|
||||
@@ -28,8 +28,8 @@ object Constants {
|
||||
const val DOCUMENT_ID_FOR_UPDATE ="2o71vBKLqdgEKYtFG8Lb"
|
||||
const val ABHA_APP_PACKAGE = "in.ndhm.phr"
|
||||
|
||||
const val MOLBIO_INTEGRATION = false
|
||||
const val FIREBASE_INTEGRATION = true
|
||||
var MOLBIO_INTEGRATION = true
|
||||
var FIREBASE_INTEGRATION = false
|
||||
const val deviceProvisionEmail = "HPOS_provisioner@bigtec.co.in"
|
||||
const val deviceProvisionPassword = "f2ab0e7f9d69"
|
||||
const val DEVICE_ID_API = "deviceIDAPI"
|
||||
|
||||
@@ -243,9 +243,10 @@ object AppModule {
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
fun provideNetworkMonitor(@ApplicationContext context: Context): NetworkMonitor {
|
||||
return NetworkMonitor(context)
|
||||
fun provideNetworkMonitor(
|
||||
@ApplicationContext context: Context
|
||||
): NetworkMonitor {
|
||||
return NetworkMonitor(context).apply { startMonitoring() }
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -15,6 +15,7 @@ import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.os.Process
|
||||
import androidx.core.content.edit
|
||||
import com.example.hpostesting.data.constant.Constants
|
||||
import com.google.firebase.FirebaseApp
|
||||
import com.google.firebase.FirebaseOptions
|
||||
import com.google.firebase.firestore.FirebaseFirestore
|
||||
@@ -37,7 +38,8 @@ class FirebaseManager @Inject constructor(private val context: Context) {
|
||||
|
||||
private val defaultServers = listOf(
|
||||
// i have it in different place look down
|
||||
firebaseConfigProd, firebaseConfigDev , firebaseConfigQaQc, firebaseConfigPreProd
|
||||
firebaseConfigProd, firebaseConfigDev , firebaseConfigQaQc, firebaseConfigPreProd, firebaseConfigPreIIScRandD,
|
||||
configMolbio //not a firebase config
|
||||
)
|
||||
|
||||
init {
|
||||
@@ -61,11 +63,17 @@ class FirebaseManager @Inject constructor(private val context: Context) {
|
||||
fun getCurrentStorage(): FirebaseStorage = currentStorage
|
||||
|
||||
fun switchServer(firebaseConfig: FirebaseConfig) {
|
||||
saveSelectedServer(firebaseConfig)
|
||||
val firebaseApp = getOrInitializeFirebaseApp(firebaseConfig)
|
||||
currentFirestore = FirebaseFirestore.getInstance(firebaseApp)
|
||||
currentStorage = FirebaseStorage.getInstance(firebaseApp)
|
||||
updateStatus = true
|
||||
if (firebaseConfig.serverName =="molbio" ||firebaseConfig.apiKey == "molbio"){
|
||||
saveSelectedServer(firebaseConfig)
|
||||
makeMolbioAsBackEnd()
|
||||
}else {
|
||||
makeSMIBackEnd()
|
||||
saveSelectedServer(firebaseConfig)
|
||||
val firebaseApp = getOrInitializeFirebaseApp(firebaseConfig)
|
||||
currentFirestore = FirebaseFirestore.getInstance(firebaseApp)
|
||||
currentStorage = FirebaseStorage.getInstance(firebaseApp)
|
||||
updateStatus = true
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -73,7 +81,6 @@ class FirebaseManager @Inject constructor(private val context: Context) {
|
||||
val existingApp = FirebaseApp.getApps(context).find { it.name == firebaseConfig.serverName }
|
||||
|
||||
return if (existingApp != null) {
|
||||
|
||||
existingApp
|
||||
} else {
|
||||
|
||||
@@ -125,6 +132,16 @@ class FirebaseManager @Inject constructor(private val context: Context) {
|
||||
fun getAvailableServers(): List<FirebaseConfig> {
|
||||
return defaultServers
|
||||
}
|
||||
|
||||
private fun makeMolbioAsBackEnd(){
|
||||
Constants.FIREBASE_INTEGRATION = false
|
||||
Constants.MOLBIO_INTEGRATION = true
|
||||
restartApp()
|
||||
}
|
||||
private fun makeSMIBackEnd(){
|
||||
Constants.FIREBASE_INTEGRATION = true
|
||||
Constants.MOLBIO_INTEGRATION = false
|
||||
}
|
||||
}
|
||||
|
||||
fun restartApp(context: Context) {
|
||||
@@ -141,6 +158,8 @@ fun delayedRestart(context: Context) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private val firebaseConfigDev = FirebaseConfig(
|
||||
serverName = "dev",
|
||||
apiKey = "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I",
|
||||
@@ -172,3 +191,19 @@ private val firebaseConfigPreProd = FirebaseConfig(
|
||||
projectId = "hpos-preprod",
|
||||
storageBucket = "hpos-preprod.appspot.com"
|
||||
)
|
||||
|
||||
private val firebaseConfigPreIIScRandD= FirebaseConfig(
|
||||
serverName = "IISc R&D",
|
||||
apiKey = "AIzaSyBvts2m1dZpULimZh6wn8C9E7npLnA8-A4",
|
||||
appId = "1:699481688495:android:efe59ce3a83324dc00075a",
|
||||
projectId = "randd-8329b",
|
||||
storageBucket = "randd-8329b.firebasestorage.app"
|
||||
)
|
||||
|
||||
private val configMolbio = FirebaseConfig(
|
||||
serverName = "molbio",
|
||||
apiKey = "molbio",
|
||||
appId = "molbio",
|
||||
projectId = "molbio",
|
||||
storageBucket = "molbio"
|
||||
)
|
||||
@@ -1,16 +1,21 @@
|
||||
package com.example.hpostesting.presentation.main_base
|
||||
|
||||
import com.example.hpostesting.data.constant.Constants.FIREBASE_INTEGRATION
|
||||
import com.example.hpostesting.data.constant.Constants.MOLBIO_INTEGRATION
|
||||
|
||||
class AppVersionTapManager {
|
||||
|
||||
private var tapCount = 0
|
||||
private val maxTapCount = 5
|
||||
val shouldEnable = FIREBASE_INTEGRATION && !MOLBIO_INTEGRATION
|
||||
val notEnable = MOLBIO_INTEGRATION && !FIREBASE_INTEGRATION
|
||||
|
||||
fun registerTap(onMaxTapsReached: () -> Unit) {
|
||||
tapCount++
|
||||
if (tapCount >= maxTapCount) {
|
||||
onMaxTapsReached()
|
||||
reset()
|
||||
}
|
||||
if (tapCount >= maxTapCount && shouldEnable) {
|
||||
onMaxTapsReached()
|
||||
reset()
|
||||
}
|
||||
}
|
||||
private fun reset() {
|
||||
tapCount = 0
|
||||
|
||||
@@ -89,6 +89,7 @@ class PanelFragment : Fragment() {
|
||||
binding.btnDeviceInfo.visibility = View.VISIBLE
|
||||
binding.btnResetPassword.visibility = View.VISIBLE
|
||||
binding.btnUpdateValues.visibility = View.VISIBLE
|
||||
binding.btnRnd.visibility = View.GONE
|
||||
}else{
|
||||
binding.btnResetPassword.visibility = View.GONE
|
||||
binding.btnDeviceProvision.visibility = View.GONE
|
||||
@@ -102,6 +103,7 @@ class PanelFragment : Fragment() {
|
||||
binding.btnSubmit.visibility = View.GONE
|
||||
binding.btnDeviceInfo.visibility = View.VISIBLE
|
||||
binding.btnUpdateValues.visibility = View.GONE
|
||||
binding.btnRnd.visibility = View.GONE
|
||||
}
|
||||
|
||||
binding.btnResetPassword.setOnClickListener{
|
||||
@@ -142,6 +144,7 @@ class PanelFragment : Fragment() {
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
|
||||
binding.btnFiles.setOnClickListener {
|
||||
val intent = Intent(Intent.ACTION_GET_CONTENT)
|
||||
intent.type = "file/*"
|
||||
|
||||
@@ -28,7 +28,6 @@ import androidx.fragment.app.Fragment
|
||||
import androidx.preference.ListPreference
|
||||
import androidx.preference.Preference
|
||||
import androidx.preference.PreferenceFragmentCompat
|
||||
import androidx.preference.PreferenceManager
|
||||
import androidx.preference.SwitchPreferenceCompat
|
||||
import com.example.hpostesting.data.constant.Constants
|
||||
import com.example.hpostesting.data.constant.DataHolder
|
||||
@@ -201,7 +200,6 @@ class PrefsFragment : PreferenceFragmentCompat() {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
val appVersionPreference = Preference(requireContext()).apply {
|
||||
title = "App Version"
|
||||
summary =
|
||||
@@ -212,11 +210,10 @@ class PrefsFragment : PreferenceFragmentCompat() {
|
||||
tapManager.registerTap {
|
||||
firebaseManager.setDevModeOn(true)
|
||||
|
||||
val devConfig = servers.find { it.serverName == "dev" }
|
||||
|
||||
if (firebaseManager.getDevMode() && currentServer != "dev") {
|
||||
Toast.makeText(requireContext(), "Now you are a Developer", Toast.LENGTH_SHORT).show()
|
||||
Toast.makeText(requireContext(), "Setting Up developer Environmnet", Toast.LENGTH_SHORT).show()
|
||||
switchFirebaseServer(devConfig!!)
|
||||
}
|
||||
|
||||
if (preferenceScreen.findPreference<SwitchPreferenceCompat>("developer_options") == null) {
|
||||
|
||||
@@ -593,7 +593,7 @@ class TrueHemeFragment : Fragment() {
|
||||
binding.btnSubmit.visibility = View.VISIBLE
|
||||
binding.btnSubmit.isEnabled = true
|
||||
binding.btnSubmit.isClickable = true
|
||||
// binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
|
||||
// binding.clParent.setBackgroundColor(Color.parseColor("#edfffd"))
|
||||
binding.ivCheck.visibility = View.VISIBLE
|
||||
}
|
||||
} else {
|
||||
@@ -736,7 +736,7 @@ class TrueHemeFragment : Fragment() {
|
||||
}
|
||||
}
|
||||
|
||||
private fun processResult() {
|
||||
private fun processResult(){
|
||||
try {
|
||||
hemoCubeViewModel.messages.postValue(getString(R.string.processing_result))
|
||||
val deviceLog = resultData
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.example.hpostesting.util
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.Context
|
||||
import android.net.ConnectivityManager
|
||||
import android.net.Network
|
||||
@@ -12,6 +13,8 @@ import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.SupervisorJob
|
||||
import kotlinx.coroutines.cancel
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.isActive
|
||||
import kotlinx.coroutines.launch
|
||||
import java.net.HttpURLConnection
|
||||
import java.net.URL
|
||||
@@ -23,7 +26,7 @@ import javax.inject.Singleton
|
||||
class NetworkMonitor @Inject constructor(
|
||||
@ApplicationContext private val context: Context
|
||||
) {
|
||||
|
||||
private var isMonitoringStarted = false
|
||||
private val connectivityManager =
|
||||
context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
|
||||
|
||||
@@ -49,7 +52,10 @@ class NetworkMonitor @Inject constructor(
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressLint("NewApi")
|
||||
fun startMonitoring() {
|
||||
if (isMonitoringStarted) return // Already started, do nothing.
|
||||
isMonitoringStarted = true
|
||||
// Check initial connectivity status
|
||||
val network = connectivityManager.activeNetwork
|
||||
val capabilities = connectivityManager.getNetworkCapabilities(network)
|
||||
@@ -66,6 +72,8 @@ class NetworkMonitor @Inject constructor(
|
||||
.build()
|
||||
|
||||
connectivityManager.registerNetworkCallback(networkRequest, networkCallback)
|
||||
// Start periodic checks:
|
||||
startPeriodicPingCheck()
|
||||
}
|
||||
|
||||
fun stopMonitoring() { // never needed to call
|
||||
@@ -96,4 +104,14 @@ class NetworkMonitor @Inject constructor(
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun startPeriodicPingCheck(intervalMillis: Long = 1 * 60_000L) {
|
||||
networkScope.launch {
|
||||
while (isActive) {
|
||||
performPingCheck()
|
||||
delay(intervalMillis)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -55,7 +55,21 @@
|
||||
app:layout_constraintTop_toBottomOf="@id/tv_subtitle4" />
|
||||
|
||||
|
||||
<Button
|
||||
<Button
|
||||
android:id="@+id/btn_rnd"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginHorizontal="16dp"
|
||||
android:layout_marginTop="24dp"
|
||||
android:clickable="false"
|
||||
android:text="R and D"
|
||||
android:textColor="@color/white"
|
||||
app:cornerRadius="16dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/btn_submit" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_diagnostics"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -67,7 +81,7 @@
|
||||
app:cornerRadius="16dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/btn_submit" />
|
||||
app:layout_constraintTop_toBottomOf="@id/btn_rnd" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/btn_auto_dac"
|
||||
@@ -153,6 +167,7 @@
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/btn_deviceProvision" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/btn_update_values"
|
||||
android:layout_width="match_parent"
|
||||
@@ -160,12 +175,13 @@
|
||||
android:layout_marginHorizontal="16dp"
|
||||
android:layout_marginTop="24dp"
|
||||
android:clickable="false"
|
||||
android:text="Update values"
|
||||
android:text="Update valueLs"
|
||||
android:textColor="@color/white"
|
||||
app:cornerRadius="16dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/btn_reset_password" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/btn_firefox"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
<item>ka</item>
|
||||
<!-- Use language codes (e.g., en, kn) as values -->
|
||||
</string-array>
|
||||
|
||||
<string-array name="district">
|
||||
<item>Mysuru</item>
|
||||
<item>Kodagu</item>
|
||||
|
||||
Reference in New Issue
Block a user