diff --git a/app/build.gradle b/app/build.gradle index 8c0b1c0..2633906 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { applicationId "in.sminnovations.hpostesting.quality" minSdk 21 targetSdk 34 - versionCode 92 - versionName "2.1.92" + versionCode 93 + versionName "2.1.93" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceViewModel.kt index d577739..bd3bd68 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceViewModel.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/deviceinfo/DeviceViewModel.kt @@ -1,20 +1,14 @@ package com.example.hpostesting.presentation.deviceinfo import android.content.Context -import android.content.SharedPreferences -import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope import com.example.hpostesting.data.NetworkStatusLiveData import com.example.hpostesting.data.dao.HemoCubeDao -import com.example.hpostesting.data.model.Response -import com.example.hpostesting.data.model.diagnostics.DiagnosticsData import com.example.hpostesting.data.model.patient.DeviceData import com.example.hpostesting.data.repository.Repository import dagger.hilt.android.lifecycle.HiltViewModel -import kotlinx.coroutines.launch import javax.inject.Inject @HiltViewModel class DeviceViewModel @Inject constructor( diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt index 5de50a6..d4ff601 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt @@ -584,7 +584,7 @@ class HemoCubeFragment : Fragment() { } if (!Constants.DEVICE_CONFIGURATION.containsKey(deviceHardwareId)) { - deviceHardwareId = "HCV-000-3001" + assignDefaultDevice() allErrorMessages += "Calibration configuration for this device id is not found\n" } if (!Constants.BUFFER_INTENSITY_THRESHOLDS.containsKey(deviceHardwareId)) { @@ -592,6 +592,15 @@ class HemoCubeFragment : Fragment() { } } + fun assignDefaultDevice() { + deviceHardwareId = "HCV-000-3001" + testStatusCode = TestStatus.CONFIG_COMPLETED.code + activity?.runOnUiThread { + binding.btnPlacebuffer.visibility = View.VISIBLE + } + hemoCubeViewModel.messages.postValue(getString(R.string.start)) + } + fun extractMiddleString(input: String): String? { val pattern = Regex("SNS\\s(.*?)\\sSNE") val matchResult: MatchResult? = pattern.find(input) diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt index a4e8901..79ad9e0 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeViewModel.kt @@ -3,7 +3,6 @@ package com.example.hpostesting.presentation.hemocube import android.content.Context import android.content.Intent import android.content.IntentFilter -import android.content.SharedPreferences import android.os.BatteryManager import android.util.Log import androidx.lifecycle.LiveData @@ -35,7 +34,6 @@ import com.example.hpostesting.data.model.patient.toHemoCubeTestData import com.example.hpostesting.data.model.updates.CheckUpdateRequest import com.example.hpostesting.data.model.updates.CheckUpdateResponse import com.example.hpostesting.data.model.updates.DeviceUpdateRequest -import com.example.hpostesting.data.repository.DatabaseRepository import com.example.hpostesting.data.repository.Repository import com.example.hpostesting.domain.CheckUpdateWorker import com.example.hpostesting.domain.LogFileManager @@ -47,7 +45,6 @@ import okhttp3.RequestBody.Companion.asRequestBody import okhttp3.ResponseBody import java.text.SimpleDateFormat import java.util.Calendar -import java.util.Date import java.util.Locale import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt index 19af4da..e526a66 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/testRight/TestRightViewModel.kt @@ -2,7 +2,6 @@ package com.example.hpostesting.presentation.testRight import android.content.Context import android.net.Uri -import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -26,7 +25,6 @@ import com.example.hpostesting.domain.TestRightResultCalculation import com.example.hpostesting.util.MyUtils import com.google.firebase.storage.FirebaseStorage import dagger.hilt.android.lifecycle.HiltViewModel -import dagger.hilt.android.scopes.ViewModelScoped import kotlinx.coroutines.launch import kotlinx.coroutines.tasks.await import java.io.File diff --git a/app/src/main/res/layout/fragment_hemo_cube_reference.xml b/app/src/main/res/layout/fragment_hemo_cube_reference.xml index 8c92390..a8b7dd7 100644 --- a/app/src/main/res/layout/fragment_hemo_cube_reference.xml +++ b/app/src/main/res/layout/fragment_hemo_cube_reference.xml @@ -214,7 +214,7 @@ android:layout_width="414dp" android:layout_height="201dp" android:gravity="center" - android:text="#SS1\n#SC1" + android:text="no device message" android:textColor="@color/black" android:textSize="11sp" app:layout_constraintEnd_toEndOf="parent"