From 78cc79eef890833a9fb5767fe7980ea41c4d9664 Mon Sep 17 00:00:00 2001 From: chandrashekhar reddy Date: Mon, 4 Mar 2024 15:37:32 +0530 Subject: [PATCH] changes in HomeFragment added deviceId global and added default values --- .../hpostesting/presentation/dashboard/HomeFragment.kt | 8 +++++--- .../deviceprovision/DeviceProvisionFragment.kt | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt index 764d1d2..f60891f 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt @@ -1016,6 +1016,7 @@ class HomeFragment : Fragment() { } private fun getDeviceId() { + Log.d("HomeFragmentUSb","getDeviceId") val handler = activity as? DeviceCommunicationHandler handler?.sendAndListenToDevice( HemoCubeCommands.DEVICE_CONFIGURATION_COMMAND, @@ -1023,9 +1024,9 @@ class HomeFragment : Fragment() { override fun onUsbRead(data: ByteArray?) { data?.let { val receivedData = String(it, Charset.forName("UTF-8")) + Log.d("HomeFragment","USB data"+receivedData) // Assuming the device ID is the full content of the received data. Adjust if needed. - deviceId = - extractDeviceId(receivedData) // Implement this method based on your data format. + deviceId = extractDeviceId(receivedData) // Implement this method based on your data format. if (deviceId.isNotEmpty()) { // Store the deviceId in SharedPreferences with(sharedPreference.edit()) { @@ -1042,6 +1043,7 @@ class HomeFragment : Fragment() { override fun onUsbError(e: Exception?) { // Handle USB communication error + Log.d("HomeFragment","USB read error"+e.toString()) } }) @@ -1057,8 +1059,8 @@ class HomeFragment : Fragment() { private fun checkForUpdate() { try { val db = Firebase.firestore + //val deviceId = deviceId - val deviceId="HHH-AAA-ZZZ" val deviceRef = db.collection("deviceUpdate").document(Constants.DOCUMENT_ID_FOR_UPDATE) deviceRef.get().addOnSuccessListener { documentSnapshot -> diff --git a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt index 7bb268c..10d34eb 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/deviceprovision/DeviceProvisionFragment.kt @@ -116,7 +116,10 @@ class DeviceProvisionFragment : Fragment() { password = response.data.data?.credentials?.password.toString(), deviceProvisionResponse = response.data.data.toString(), natsToken = response.data.data?.device?.deviceUser?.natsToken.toString(), - natsTokenExpiry = response.data.data?.device?.deviceUser?.natsTokenExpiry.toString() + natsTokenExpiry = response.data.data?.device?.deviceUser?.natsTokenExpiry.toString(), + globalUpdateIgnore = false, + globalUpdateDone = false, + deviceUpdateAvailable = false ) ) // viewModel.addDeviceId(DeviceData(deviceId = sharedPreferences.getString(Constants.DEVICE_ID, "").toString()))