clean code
This commit is contained in:
@@ -16,11 +16,11 @@ android {
|
|||||||
|
|
||||||
// dev -> development, quality -> qc, uat -> User Acceptance Testing, preprod -> preproduction, prod -> production, iocl -> iocl-iisc production
|
// dev -> development, quality -> qc, uat -> User Acceptance Testing, preprod -> preproduction, prod -> production, iocl -> iocl-iisc production
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "in.sminnovations.hpostesting.dev"
|
applicationId "in.sminnovations.hpostesting.quality"
|
||||||
minSdk 21
|
minSdk 21
|
||||||
targetSdk 34
|
targetSdk 34
|
||||||
versionCode 114
|
versionCode 112
|
||||||
versionName "2.1.114"
|
versionName "2.1.112"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,11 +11,11 @@ interface MolbioAuthApi {
|
|||||||
|
|
||||||
@POST("deviceManagement/device/provision")
|
@POST("deviceManagement/device/provision")
|
||||||
suspend fun deviceProvision(
|
suspend fun deviceProvision(
|
||||||
@Body deviceProvisionRequest: DeviceProvisionRequest
|
@Body deviceProvisionRequest: DeviceProvisionRequest,
|
||||||
): DeviceProvisionResponse
|
): DeviceProvisionResponse
|
||||||
|
|
||||||
@POST("deviceService/device/login")
|
@POST("deviceService/device/login")
|
||||||
suspend fun login(
|
suspend fun login(
|
||||||
@Body loginRequest: LoginRequest
|
@Body loginRequest: LoginRequest,
|
||||||
): LoginResponse
|
): LoginResponse
|
||||||
}
|
}
|
||||||
@@ -7,11 +7,9 @@ import com.example.hpostesting.data.model.updates.CheckUpdateRequest
|
|||||||
import com.example.hpostesting.data.model.updates.CheckUpdateResponse
|
import com.example.hpostesting.data.model.updates.CheckUpdateResponse
|
||||||
import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
|
import com.example.hpostesting.data.model.updates.DeviceUpdateRequest
|
||||||
import okhttp3.MultipartBody
|
import okhttp3.MultipartBody
|
||||||
import okhttp3.Response
|
|
||||||
import okhttp3.ResponseBody
|
import okhttp3.ResponseBody
|
||||||
import retrofit2.http.Body
|
import retrofit2.http.Body
|
||||||
import retrofit2.http.GET
|
import retrofit2.http.GET
|
||||||
import retrofit2.http.Header
|
|
||||||
import retrofit2.http.Multipart
|
import retrofit2.http.Multipart
|
||||||
import retrofit2.http.POST
|
import retrofit2.http.POST
|
||||||
import retrofit2.http.PUT
|
import retrofit2.http.PUT
|
||||||
@@ -21,17 +19,17 @@ interface MolbioResultApi {
|
|||||||
|
|
||||||
@PUT("deviceService/results/HPOS")
|
@PUT("deviceService/results/HPOS")
|
||||||
suspend fun uploadResults(
|
suspend fun uploadResults(
|
||||||
@Body molbioV2ResultRequest: MolbioV2ResultRequest
|
@Body molbioV2ResultRequest: MolbioV2ResultRequest,
|
||||||
): MolbioV2ResultResponse
|
): MolbioV2ResultResponse
|
||||||
|
|
||||||
@POST("deviceService/device/checkUpdate")
|
@POST("deviceService/device/checkUpdate")
|
||||||
suspend fun checkUpdate(
|
suspend fun checkUpdate(
|
||||||
@Body checkUpdateRequest: CheckUpdateRequest
|
@Body checkUpdateRequest: CheckUpdateRequest,
|
||||||
): CheckUpdateResponse
|
): CheckUpdateResponse
|
||||||
|
|
||||||
@POST("deviceService/device/getUpdate")
|
@POST("deviceService/device/getUpdate")
|
||||||
suspend fun deviceUpdate(
|
suspend fun deviceUpdate(
|
||||||
@Body deviceUpdateRequest: DeviceUpdateRequest
|
@Body deviceUpdateRequest: DeviceUpdateRequest,
|
||||||
): ResponseBody
|
): ResponseBody
|
||||||
|
|
||||||
@GET("deviceService/device/getClientCertificate")
|
@GET("deviceService/device/getClientCertificate")
|
||||||
@@ -41,6 +39,6 @@ interface MolbioResultApi {
|
|||||||
@Multipart
|
@Multipart
|
||||||
@POST("deviceService/device/uploadLogs")
|
@POST("deviceService/device/uploadLogs")
|
||||||
suspend fun uploadLogs(
|
suspend fun uploadLogs(
|
||||||
@Part logFile: MultipartBody.Part
|
@Part logFile: MultipartBody.Part,
|
||||||
): UploadLogsResponse
|
): UploadLogsResponse
|
||||||
}
|
}
|
||||||
@@ -186,19 +186,6 @@ object Constants {
|
|||||||
const val BUFFER_LED_LOWER_BOUND = 21000
|
const val BUFFER_LED_LOWER_BOUND = 21000
|
||||||
const val BUFFER_LED_UPPER_BOUND = 23500
|
const val BUFFER_LED_UPPER_BOUND = 23500
|
||||||
|
|
||||||
const val TEST_STATUS_CODE_TEST_STARTED = 1.0
|
|
||||||
const val TEST_STATUS_CODE_CONFIG_STARTED = 2.0
|
|
||||||
const val TEST_STATUS_CODE_CONFIG_COMPLETED = 3.0
|
|
||||||
const val TEST_STATUS_CODE_BUFFER_STARTED = 4.0
|
|
||||||
const val TEST_STATUS_CODE_BUFFER_COMPLETED = 5.0
|
|
||||||
const val TEST_STATUS_CODE_BUFFER_PRINT_STARTED = 6.0
|
|
||||||
const val TEST_STATUS_CODE_BUFFER_PRINT_COMPLETED = 7.0
|
|
||||||
const val TEST_STATUS_CODE_SAMPLE_STARTED = 8.0
|
|
||||||
const val TEST_STATUS_CODE_SAMPLE_COMPLETED = 9.0
|
|
||||||
const val TEST_STATUS_CODE_SAMPLE_PRINT_STARTED = 10.0
|
|
||||||
const val TEST_STATUS_CODE_SAMPLE_PRINT_COMPLETED = 11.0
|
|
||||||
const val TEST_STATUS_CODE_TEST_COMPLETED = 12.0
|
|
||||||
|
|
||||||
val DEVICE_CONFIGURATION: Map<String, List<List<Double>>> = mapOf<String, List<List<Double>>>(
|
val DEVICE_CONFIGURATION: Map<String, List<List<Double>>> = mapOf<String, List<List<Double>>>(
|
||||||
"HCV-000-3001" to listOf(
|
"HCV-000-3001" to listOf(
|
||||||
listOf(1.0, 0.0), // LED1, 435nm
|
listOf(1.0, 0.0), // LED1, 435nm
|
||||||
@@ -1665,8 +1652,8 @@ object Constants {
|
|||||||
|
|
||||||
val COEFFICIENTS: Map<String, List<List<Double>>> = mapOf(
|
val COEFFICIENTS: Map<String, List<List<Double>>> = mapOf(
|
||||||
"HC-V1-005" to listOf(
|
"HC-V1-005" to listOf(
|
||||||
listOf(1.5,0.0),
|
listOf(1.5, 0.0),
|
||||||
listOf(0.0,0.0)
|
listOf(0.0, 0.0)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -19,12 +19,14 @@ object LanguageManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun persistLanguagePreference(context: Context, languageCode: String) {
|
fun persistLanguagePreference(context: Context, languageCode: String) {
|
||||||
val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
|
val prefs: SharedPreferences =
|
||||||
|
context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
|
||||||
prefs.edit().putString(LANGUAGE_PREF_KEY, languageCode).apply()
|
prefs.edit().putString(LANGUAGE_PREF_KEY, languageCode).apply()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getSavedLanguage(context: Context): String {
|
fun getSavedLanguage(context: Context): String {
|
||||||
val prefs: SharedPreferences = context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
|
val prefs: SharedPreferences =
|
||||||
|
context.getSharedPreferences("AppPrefs", Context.MODE_PRIVATE)
|
||||||
return prefs.getString(LANGUAGE_PREF_KEY, "en") ?: "en"
|
return prefs.getString(LANGUAGE_PREF_KEY, "en") ?: "en"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -16,6 +16,7 @@ class Converters {
|
|||||||
null
|
null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@TypeConverter
|
@TypeConverter
|
||||||
fun toString(location: UserData.Location?): String? {
|
fun toString(location: UserData.Location?): String? {
|
||||||
return if (location != null) {
|
return if (location != null) {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import androidx.room.OnConflictStrategy
|
|||||||
import androidx.room.Query
|
import androidx.room.Query
|
||||||
import com.example.hpostesting.data.model.patient.DeviceData
|
import com.example.hpostesting.data.model.patient.DeviceData
|
||||||
import com.example.hpostesting.data.model.patient.HemoCubeTestData
|
import com.example.hpostesting.data.model.patient.HemoCubeTestData
|
||||||
import com.example.hpostesting.data.model.patient.UserData
|
|
||||||
@Dao
|
@Dao
|
||||||
interface DeviceDao {
|
interface DeviceDao {
|
||||||
@Query("SELECT * from device_table")
|
@Query("SELECT * from device_table")
|
||||||
|
|||||||
@@ -8,7 +8,11 @@ import com.example.hpostesting.data.model.patient.DeviceData
|
|||||||
import com.example.hpostesting.data.model.patient.HemoCubeTestData
|
import com.example.hpostesting.data.model.patient.HemoCubeTestData
|
||||||
import com.example.hpostesting.data.model.patient.UserData
|
import com.example.hpostesting.data.model.patient.UserData
|
||||||
|
|
||||||
@Database(entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class], version = 26, exportSchema = false)
|
@Database(
|
||||||
|
entities = [UserData::class, HemoCubeTestData::class, DeviceData::class, BufferCheckData::class],
|
||||||
|
version = 26,
|
||||||
|
exportSchema = false
|
||||||
|
)
|
||||||
@TypeConverters(Converters::class)
|
@TypeConverters(Converters::class)
|
||||||
abstract class MyDatabase : RoomDatabase() {
|
abstract class MyDatabase : RoomDatabase() {
|
||||||
abstract fun userDao(): UserDao
|
abstract fun userDao(): UserDao
|
||||||
|
|||||||
@@ -1,11 +1,6 @@
|
|||||||
package com.example.hpostesting.data.datasource
|
package com.example.hpostesting.data.datasource
|
||||||
|
|
||||||
import android.os.Environment
|
|
||||||
import com.example.hpostesting.data.model.patient.HemoCubeTestData
|
import com.example.hpostesting.data.model.patient.HemoCubeTestData
|
||||||
import com.opencsv.CSVWriter
|
|
||||||
import java.io.File
|
|
||||||
import java.io.FileWriter
|
|
||||||
import java.io.IOException
|
|
||||||
|
|
||||||
interface LocalFileDataSource {
|
interface LocalFileDataSource {
|
||||||
|
|
||||||
@@ -14,6 +9,6 @@ interface LocalFileDataSource {
|
|||||||
fun saveTextToDisk(filepath: String, contents: String)
|
fun saveTextToDisk(filepath: String, contents: String)
|
||||||
|
|
||||||
fun exportDataToCSV(
|
fun exportDataToCSV(
|
||||||
fileName: String, dataList: List<HemoCubeTestData>
|
fileName: String, dataList: List<HemoCubeTestData>,
|
||||||
): Boolean
|
): Boolean
|
||||||
}
|
}
|
||||||
@@ -8,7 +8,7 @@ import java.io.FileWriter
|
|||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class LocalFileDataSourceImpl @Inject constructor(): LocalFileDataSource {
|
class LocalFileDataSourceImpl @Inject constructor() : LocalFileDataSource {
|
||||||
|
|
||||||
override fun saveCsvToDisk(filepath: String, contents: ArrayList<Array<String>>) {
|
override fun saveCsvToDisk(filepath: String, contents: ArrayList<Array<String>>) {
|
||||||
val writer = CSVWriter(FileWriter(filepath))
|
val writer = CSVWriter(FileWriter(filepath))
|
||||||
@@ -25,10 +25,13 @@ class LocalFileDataSourceImpl @Inject constructor(): LocalFileDataSource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun exportDataToCSV(
|
override fun exportDataToCSV(
|
||||||
fileName: String, dataList: List<HemoCubeTestData>
|
fileName: String, dataList: List<HemoCubeTestData>,
|
||||||
): Boolean {
|
): Boolean {
|
||||||
try {
|
try {
|
||||||
val formattedFileName = fileName.replace(Regex("[^a-zA-Z0-9.-]"), "_") // Replace special characters with underscores
|
val formattedFileName = fileName.replace(
|
||||||
|
Regex("[^a-zA-Z0-9.-]"),
|
||||||
|
"_"
|
||||||
|
) // Replace special characters with underscores
|
||||||
val filePath = File(getExternalStorageDirectory(), formattedFileName)
|
val filePath = File(getExternalStorageDirectory(), formattedFileName)
|
||||||
val writer = FileWriter(filePath)
|
val writer = FileWriter(filePath)
|
||||||
val csvWriter = CSVWriter(writer)
|
val csvWriter = CSVWriter(writer)
|
||||||
|
|||||||
@@ -2,5 +2,5 @@ package com.example.hpostesting.data.model.deviceprovision
|
|||||||
|
|
||||||
data class Credentials(
|
data class Credentials(
|
||||||
val password: String? = "",
|
val password: String? = "",
|
||||||
val username: String? = ""
|
val username: String? = "",
|
||||||
)
|
)
|
||||||
@@ -13,5 +13,5 @@ data class Device(
|
|||||||
val serialNumber: String? = "",
|
val serialNumber: String? = "",
|
||||||
val uid: String? = "",
|
val uid: String? = "",
|
||||||
val updatedAt: String? = "",
|
val updatedAt: String? = "",
|
||||||
val updatedBy: Int? = 0
|
val updatedBy: Int? = 0,
|
||||||
)
|
)
|
||||||
@@ -2,5 +2,5 @@ package com.example.hpostesting.data.model.deviceprovision
|
|||||||
|
|
||||||
data class DeviceProvisionData(
|
data class DeviceProvisionData(
|
||||||
val credentials: Credentials? = Credentials(),
|
val credentials: Credentials? = Credentials(),
|
||||||
val device: Device? = Device()
|
val device: Device? = Device(),
|
||||||
)
|
)
|
||||||
@@ -5,5 +5,5 @@ data class DeviceProvisionRequest(
|
|||||||
val email: String? = "",
|
val email: String? = "",
|
||||||
val password: String? = "",
|
val password: String? = "",
|
||||||
val serialNumber: String? = "",
|
val serialNumber: String? = "",
|
||||||
val uid: String? = ""
|
val uid: String? = "",
|
||||||
)
|
)
|
||||||
@@ -8,5 +8,5 @@ data class DeviceProvisionResponse(
|
|||||||
@SerializedName("Message")
|
@SerializedName("Message")
|
||||||
val message: String? = "",
|
val message: String? = "",
|
||||||
@SerializedName("Result")
|
@SerializedName("Result")
|
||||||
val result: String? = ""
|
val result: String? = "",
|
||||||
)
|
)
|
||||||
@@ -8,5 +8,5 @@ data class DeviceType(
|
|||||||
val id: Int? = 0,
|
val id: Int? = 0,
|
||||||
val name: String? = "",
|
val name: String? = "",
|
||||||
val updatedAt: String? = "",
|
val updatedAt: String? = "",
|
||||||
val updatedBy: Int? = 0
|
val updatedBy: Int? = 0,
|
||||||
)
|
)
|
||||||
@@ -11,5 +11,5 @@ data class DeviceUser(
|
|||||||
val natsTokenExpiry: String? = "",
|
val natsTokenExpiry: String? = "",
|
||||||
val updatedAt: String? = "",
|
val updatedAt: String? = "",
|
||||||
val updatedBy: Int? = 0,
|
val updatedBy: Int? = 0,
|
||||||
val username: String? = ""
|
val username: String? = "",
|
||||||
)
|
)
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
package com.example.hpostesting.data.model.deviceprovision
|
package com.example.hpostesting.data.model.deviceprovision
|
||||||
|
|
||||||
data class ProvisionData(
|
data class ProvisionData(
|
||||||
val username: String?,
|
val username: String?,
|
||||||
val password: String?,
|
val password: String?,
|
||||||
val natsToken: String?
|
val natsToken: String?,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package com.example.hpostesting.data.model.diagnostics
|
package com.example.hpostesting.data.model.diagnostics
|
||||||
|
|
||||||
data class DiagnosticsData (
|
data class DiagnosticsData(
|
||||||
var deviceId: String = "",
|
var deviceId: String = "",
|
||||||
var appVersion: String? = "",
|
var appVersion: String? = "",
|
||||||
var deviceType: String = "HEMOCUBE",
|
var deviceType: String = "HEMOCUBE",
|
||||||
@@ -8,5 +8,5 @@ data class DiagnosticsData (
|
|||||||
var devicePassword: String = "",
|
var devicePassword: String = "",
|
||||||
var deviceNatsToken: String = "",
|
var deviceNatsToken: String = "",
|
||||||
var accessToken: String = "",
|
var accessToken: String = "",
|
||||||
var runTime: String = ""
|
var runTime: String = "",
|
||||||
)
|
)
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
package com.example.hpostesting.data.model.jig
|
package com.example.hpostesting.data.model.jig
|
||||||
|
|
||||||
data class JigData (
|
data class JigData(
|
||||||
var deviceId: String = "",
|
var deviceId: String = "",
|
||||||
var appVersion: String? = "",
|
var appVersion: String? = "",
|
||||||
var deviceType: String = "JIG",
|
var deviceType: String = "JIG",
|
||||||
var scanData: String = "",
|
var scanData: String = "",
|
||||||
var createdAt: String = ""
|
var createdAt: String = "",
|
||||||
)
|
)
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
package com.example.hpostesting.data.model.log
|
package com.example.hpostesting.data.model.log
|
||||||
|
|
||||||
data class UploadLogsData(
|
data class UploadLogsData(
|
||||||
val filename: String? = ""
|
val filename: String? = "",
|
||||||
)
|
)
|
||||||
@@ -8,5 +8,5 @@ data class UploadLogsResponse(
|
|||||||
@SerializedName("Message")
|
@SerializedName("Message")
|
||||||
val message: String? = "",
|
val message: String? = "",
|
||||||
@SerializedName("Result")
|
@SerializedName("Result")
|
||||||
val result: String? = ""
|
val result: String? = "",
|
||||||
)
|
)
|
||||||
@@ -12,5 +12,5 @@ data class Device(
|
|||||||
val serialNumber: String? = "",
|
val serialNumber: String? = "",
|
||||||
val uid: String? = "",
|
val uid: String? = "",
|
||||||
val updatedAt: String? = "",
|
val updatedAt: String? = "",
|
||||||
val updatedBy: Int? = 0
|
val updatedBy: Int? = 0,
|
||||||
)
|
)
|
||||||
@@ -8,5 +8,5 @@ data class DeviceType(
|
|||||||
val id: Int? = 0,
|
val id: Int? = 0,
|
||||||
val name: String? = "",
|
val name: String? = "",
|
||||||
val updatedAt: String? = "",
|
val updatedAt: String? = "",
|
||||||
val updatedBy: Int? = 0
|
val updatedBy: Int? = 0,
|
||||||
)
|
)
|
||||||
@@ -12,5 +12,5 @@ data class DeviceUser(
|
|||||||
val natsTokenExpiry: String? = "",
|
val natsTokenExpiry: String? = "",
|
||||||
val updatedAt: String? = "",
|
val updatedAt: String? = "",
|
||||||
val updatedBy: Int? = 0,
|
val updatedBy: Int? = 0,
|
||||||
val username: String? = ""
|
val username: String? = "",
|
||||||
)
|
)
|
||||||
@@ -2,5 +2,5 @@ package com.example.hpostesting.data.model.login
|
|||||||
|
|
||||||
data class LoginData(
|
data class LoginData(
|
||||||
val accessToken: String? = "",
|
val accessToken: String? = "",
|
||||||
val deviceUser: DeviceUser? = DeviceUser()
|
val deviceUser: DeviceUser? = DeviceUser(),
|
||||||
)
|
)
|
||||||
@@ -9,5 +9,5 @@ data class LoginRequest(
|
|||||||
val password: String? = "",
|
val password: String? = "",
|
||||||
val serialNumber: String? = "",
|
val serialNumber: String? = "",
|
||||||
val username: String? = "",
|
val username: String? = "",
|
||||||
val version: String? = ""
|
val version: String? = "",
|
||||||
)
|
)
|
||||||
@@ -8,5 +8,5 @@ data class LoginResponse(
|
|||||||
@SerializedName("Message")
|
@SerializedName("Message")
|
||||||
val message: String? = "",
|
val message: String? = "",
|
||||||
@SerializedName("Result")
|
@SerializedName("Result")
|
||||||
val result: String? = ""
|
val result: String? = "",
|
||||||
)
|
)
|
||||||
@@ -34,5 +34,5 @@ data class MolbioV2Result(
|
|||||||
val testType: String? = "",
|
val testType: String? = "",
|
||||||
val thresholds: String? = "",
|
val thresholds: String? = "",
|
||||||
val underMedication: Boolean? = false,
|
val underMedication: Boolean? = false,
|
||||||
val volume: Int? = 2
|
val volume: Int? = 2,
|
||||||
)
|
)
|
||||||
@@ -38,5 +38,5 @@ data class MolbioV2ResultData(
|
|||||||
val underMedication: Boolean? = false,
|
val underMedication: Boolean? = false,
|
||||||
val updatedAt: String? = "",
|
val updatedAt: String? = "",
|
||||||
val updatedBy: Int? = 0,
|
val updatedBy: Int? = 0,
|
||||||
val volume: Int? = 0
|
val volume: Int? = 0,
|
||||||
)
|
)
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
package com.example.hpostesting.data.model.molbioresult
|
package com.example.hpostesting.data.model.molbioresult
|
||||||
|
|
||||||
data class MolbioV2ResultRequest(
|
data class MolbioV2ResultRequest(
|
||||||
val results: MutableList<MolbioV2Result>? = mutableListOf()
|
val results: MutableList<MolbioV2Result>? = mutableListOf(),
|
||||||
)
|
)
|
||||||
@@ -8,5 +8,5 @@ data class MolbioV2ResultResponse(
|
|||||||
@SerializedName("Message")
|
@SerializedName("Message")
|
||||||
val message: String? = "",
|
val message: String? = "",
|
||||||
@SerializedName("Result")
|
@SerializedName("Result")
|
||||||
val result: String? = ""
|
val result: String? = "",
|
||||||
)
|
)
|
||||||
@@ -19,7 +19,7 @@ data class RawData(
|
|||||||
var gender: String = "",
|
var gender: String = "",
|
||||||
var localFlag: Boolean = false,
|
var localFlag: Boolean = false,
|
||||||
var deviceId: String? = "",
|
var deviceId: String? = "",
|
||||||
var appVersion:String? = "",
|
var appVersion: String? = "",
|
||||||
var deviceSerialNumber: String = "",
|
var deviceSerialNumber: String = "",
|
||||||
var deviceType: String = "HEMOCUBE",
|
var deviceType: String = "HEMOCUBE",
|
||||||
var kitSerial: String = "",
|
var kitSerial: String = "",
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ data class BufferCheckData(
|
|||||||
var _id: String = "",
|
var _id: String = "",
|
||||||
var kitno: String = "",
|
var kitno: String = "",
|
||||||
var deviceId: String? = "",
|
var deviceId: String? = "",
|
||||||
var appVersion:String? = "",
|
var appVersion: String? = "",
|
||||||
var deviceSerialNumber: String = "",
|
var deviceSerialNumber: String = "",
|
||||||
var deviceType: String = "HEMOCUBE",
|
var deviceType: String = "HEMOCUBE",
|
||||||
var localFlag: Boolean = false,
|
var localFlag: Boolean = false,
|
||||||
|
|||||||
@@ -15,9 +15,9 @@ data class DeviceData(
|
|||||||
@get:PropertyName("coefficients") @set:PropertyName("coefficients")
|
@get:PropertyName("coefficients") @set:PropertyName("coefficients")
|
||||||
var coefficients: List<Double> = emptyList(),
|
var coefficients: List<Double> = emptyList(),
|
||||||
@get:PropertyName("calibratedAt") @set:PropertyName("calibratedAt")
|
@get:PropertyName("calibratedAt") @set:PropertyName("calibratedAt")
|
||||||
var calibratedAt: String = "" ,
|
var calibratedAt: String = "",
|
||||||
@get:PropertyName("deviceProvisionResponse") @set:PropertyName("deviceProvisionResponse")
|
@get:PropertyName("deviceProvisionResponse") @set:PropertyName("deviceProvisionResponse")
|
||||||
var deviceProvisionResponse: String = "" ,
|
var deviceProvisionResponse: String = "",
|
||||||
@get:PropertyName("username") @set:PropertyName("username")
|
@get:PropertyName("username") @set:PropertyName("username")
|
||||||
var username: String = "",
|
var username: String = "",
|
||||||
@get:PropertyName("password") @set:PropertyName("password")
|
@get:PropertyName("password") @set:PropertyName("password")
|
||||||
@@ -25,5 +25,5 @@ data class DeviceData(
|
|||||||
@get:PropertyName("natsToken") @set:PropertyName("natsToken")
|
@get:PropertyName("natsToken") @set:PropertyName("natsToken")
|
||||||
var natsToken: String = "",
|
var natsToken: String = "",
|
||||||
@get:PropertyName("natsTokenExpiry") @set:PropertyName("natsTokenExpiry")
|
@get:PropertyName("natsTokenExpiry") @set:PropertyName("natsTokenExpiry")
|
||||||
var natsTokenExpiry: String = ""
|
var natsTokenExpiry: String = "",
|
||||||
)
|
)
|
||||||
@@ -22,7 +22,7 @@ data class HemoCubeTestData(
|
|||||||
var gender: String = "",
|
var gender: String = "",
|
||||||
var localFlag: Boolean = false,
|
var localFlag: Boolean = false,
|
||||||
var deviceId: String? = "",
|
var deviceId: String? = "",
|
||||||
var appVersion:String? = "",
|
var appVersion: String? = "",
|
||||||
var deviceSerialNumber: String = "",
|
var deviceSerialNumber: String = "",
|
||||||
var deviceType: String = "HEMOCUBE",
|
var deviceType: String = "HEMOCUBE",
|
||||||
var kitSerial: String = "",
|
var kitSerial: String = "",
|
||||||
@@ -89,5 +89,5 @@ data class HemoCubeTestData(
|
|||||||
var solution: String? = "",
|
var solution: String? = "",
|
||||||
var concentration: String? = "",
|
var concentration: String? = "",
|
||||||
var volume: String? = "",
|
var volume: String? = "",
|
||||||
var isCSVCreated: Boolean = false
|
var isCSVCreated: Boolean = false,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ data class PatientDetails(
|
|||||||
var address: Address?,
|
var address: Address?,
|
||||||
var category: Category?,
|
var category: Category?,
|
||||||
var registerDate: Date?,
|
var registerDate: Date?,
|
||||||
var uploadDate: Date?
|
var uploadDate: Date?,
|
||||||
) {
|
) {
|
||||||
constructor() : this(
|
constructor() : this(
|
||||||
"",
|
"",
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ data class UserData(
|
|||||||
var reportPath: String = "",
|
var reportPath: String = "",
|
||||||
var result: TestRightResultType? = null,
|
var result: TestRightResultType? = null,
|
||||||
var resultRatio: Double? = null,
|
var resultRatio: Double? = null,
|
||||||
var prdClassification: String = ""
|
var prdClassification: String = "",
|
||||||
) {
|
) {
|
||||||
enum class Gender {
|
enum class Gender {
|
||||||
MALE,
|
MALE,
|
||||||
@@ -39,7 +39,7 @@ data class UserData(
|
|||||||
|
|
||||||
data class Location(
|
data class Location(
|
||||||
var latitude: Double? = null,
|
var latitude: Double? = null,
|
||||||
var longitude: Double? = null
|
var longitude: Double? = null,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
package com.example.hpostesting.data.model.updates
|
package com.example.hpostesting.data.model.updates
|
||||||
|
|
||||||
data class CheckUpdateData(
|
data class CheckUpdateData(
|
||||||
val version: String? = ""
|
val version: String? = "",
|
||||||
)
|
)
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
package com.example.hpostesting.data.model.updates
|
package com.example.hpostesting.data.model.updates
|
||||||
|
|
||||||
data class CheckUpdateRequest(
|
data class CheckUpdateRequest(
|
||||||
val currentVersion: String? = ""
|
val currentVersion: String? = "",
|
||||||
)
|
)
|
||||||
@@ -8,5 +8,5 @@ data class CheckUpdateResponse(
|
|||||||
@SerializedName("Message")
|
@SerializedName("Message")
|
||||||
val message: String? = "",
|
val message: String? = "",
|
||||||
@SerializedName("Result")
|
@SerializedName("Result")
|
||||||
val result: String? = ""
|
val result: String? = "",
|
||||||
)
|
)
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
package com.example.hpostesting.data.model.updates
|
package com.example.hpostesting.data.model.updates
|
||||||
|
|
||||||
data class DeviceUpdateRequest(
|
data class DeviceUpdateRequest(
|
||||||
val serial_no: String? = ""
|
val serial_no: String? = "",
|
||||||
)
|
)
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
package com.example.hpostesting.domain
|
package com.example.hpostesting.domain
|
||||||
|
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import com.example.hpostesting.data.repository.LocalFileRepository
|
|
||||||
import com.example.hpostesting.data.constant.Constants
|
import com.example.hpostesting.data.constant.Constants
|
||||||
import com.example.hpostesting.data.model.patient.UserData
|
import com.example.hpostesting.data.model.patient.UserData
|
||||||
import com.example.hpostesting.data.model.test.TestRightCalculationData
|
import com.example.hpostesting.data.model.test.TestRightCalculationData
|
||||||
|
import com.example.hpostesting.data.repository.LocalFileRepository
|
||||||
import java.util.Collections.sort
|
import java.util.Collections.sort
|
||||||
|
|
||||||
class SaveRawData(private val localFileRepository: LocalFileRepository) {
|
class SaveRawData(private val localFileRepository: LocalFileRepository) {
|
||||||
@@ -98,7 +98,7 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {
|
|||||||
folderPath: String,
|
folderPath: String,
|
||||||
fileName: String,
|
fileName: String,
|
||||||
calculationData: TestRightCalculationData,
|
calculationData: TestRightCalculationData,
|
||||||
testDetails: UserData?
|
testDetails: UserData?,
|
||||||
) {
|
) {
|
||||||
// val fileObj = File(folderPath, fileName)
|
// val fileObj = File(folderPath, fileName)
|
||||||
// val writer = FileWriter(fileObj)
|
// val writer = FileWriter(fileObj)
|
||||||
@@ -116,7 +116,7 @@ class SaveRawData(private val localFileRepository: LocalFileRepository) {
|
|||||||
|
|
||||||
private fun getLogStringFromObjWithPatientData(
|
private fun getLogStringFromObjWithPatientData(
|
||||||
calculationData: TestRightCalculationData,
|
calculationData: TestRightCalculationData,
|
||||||
testDetails: UserData?
|
testDetails: UserData?,
|
||||||
): String {
|
): String {
|
||||||
var outputString = "Test calculation logs ==>\n"
|
var outputString = "Test calculation logs ==>\n"
|
||||||
outputString += "Name = ${testDetails?.name}\n"
|
outputString += "Name = ${testDetails?.name}\n"
|
||||||
|
|||||||
Reference in New Issue
Block a user