From 468cacfbe5f0d28f2905f3f3d178a9d3917a5666 Mon Sep 17 00:00:00 2001 From: Pritimay Sarkar Date: Fri, 2 Feb 2024 16:53:02 +0530 Subject: [PATCH] release 2.1.99 --- app/build.gradle | 6 +++--- .../example/hpostesting/presentation/KitScanActivity.kt | 9 ++++----- .../presentation/hemocube/HemoCubeFragment.kt | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f9177f4..a1fb725 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,11 +16,11 @@ android { // prod - production, preprod - preproduction, quality - qc, dev - development defaultConfig { - applicationId "in.sminnovations.hpostesting.dev" + applicationId "in.sminnovations.hpostesting.quality" minSdk 21 targetSdk 34 - versionCode 98 - versionName "2.1.98" + versionCode 99 + versionName "2.1.99" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt index 2f7ae9b..bfbbb99 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt @@ -3,8 +3,8 @@ package com.example.hpostesting.presentation import android.content.Context import android.content.Intent import android.content.SharedPreferences -import android.os.AsyncTask import android.os.Bundle +import android.text.Editable import android.util.Log import android.view.View import android.widget.EditText @@ -16,7 +16,6 @@ import com.example.hpostesting.data.constant.LanguageManager import com.example.hpostesting.presentation.dashboard.DashboardActivity import com.example.hpostesting.presentation.hemocube.HemocubeActivity import com.example.hpostesting.presentation.testRight.TestRightActivity -import com.example.hpostesting.presentation.trueheme.TrueHemeActivity import com.google.android.material.snackbar.Snackbar import com.google.firebase.crashlytics.FirebaseCrashlytics import com.journeyapps.barcodescanner.ScanContract @@ -32,7 +31,6 @@ import com.zebra.scannercontrol.IDcsSdkApiDelegate import com.zebra.scannercontrol.SDKHandler import `in`.sminnovations.hpostesting.R import `in`.sminnovations.hpostesting.databinding.ActivityKitScanBinding -import java.nio.charset.StandardCharsets class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate { @@ -280,7 +278,8 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate { val result = String(barcodeData!!) Log.d("BARCODE", result) runOnUiThread { - binding.tvTitle2.text = result + val editableResult: Editable = Editable.Factory.getInstance().newEditable(result) + binding.nameEditText.text = editableResult } } @@ -314,7 +313,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate { } Constants.DEVICE_TYPE_TRUEHEME -> { - val i = Intent(applicationContext, TrueHemeActivity::class.java) + val i = Intent(applicationContext, HemocubeActivity::class.java) startActivity(i) } } 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 24269a1..b016635 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 @@ -728,7 +728,7 @@ class HemoCubeFragment : Fragment() { val led2Average = log10(led2BufferForDevice.div(led2SampleForDevice)) val led3Average = log10(led3BufferForDevice.div(led3SampleForDevice)) val led4Average = log10(led4BufferForDevice.div(led4SampleForDevice)) - val deviceRatio = led4Average / led1Average + val deviceRatio = led2Average / led1Average if (led1BufferForDevice < Constants.BUFFER_INTENSITY_THRESHOLDS[deviceHardwareId]?.get(0) ?.get(0)!!