From 7fcfd5854432bd62c0fa1e2ae461d65227807ec3 Mon Sep 17 00:00:00 2001 From: chandrashekhar reddy Date: Mon, 15 Apr 2024 12:20:04 +0530 Subject: [PATCH] quality version bulid for V1 device --- app/build.gradle | 6 +- app/google-services.json | 186 ++---------------- .../presentation/hemocube/HemoCubeFragment.kt | 19 +- 3 files changed, 26 insertions(+), 185 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f9c0789..875aa30 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,11 +16,11 @@ android { // dev -> development, quality -> qc, uat -> User Acceptance Testing, preprod -> preproduction, prod -> production, iocl -> iocl-iisc production defaultConfig { - applicationId "in.sminnovations.hpostesting.dev" + applicationId "in.sminnovations.hpostesting.quality" minSdk 21 targetSdk 34 - versionCode 122 - versionName "2.1.122" + versionCode 124 + versionName "2.1.124" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/google-services.json b/app/google-services.json index a73fe1e..7f4a67b 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -1,205 +1,45 @@ { "project_info": { - "project_number": "650071678820", - "project_id": "hpos-af3cc", - "storage_bucket": "hpos-af3cc.appspot.com" + "project_number": "1004619739289", + "project_id": "hpos-qa", + "storage_bucket": "hpos-qa.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:650071678820:android:f1435a1c07f710036c6471", + "mobilesdk_app_id": "1:1004619739289:android:f669b47552748433e5c808", "android_client_info": { - "package_name": "com.example.hposconsentform" + "package_name": "in.sminnovations.hposregistration.quality" } }, - "oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ], + "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I" + "current_key": "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs" } ], "services": { "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ] + "other_platform_oauth_client": [] } } }, { "client_info": { - "mobilesdk_app_id": "1:650071678820:android:7865bef608cdee6f6c6471", + "mobilesdk_app_id": "1:1004619739289:android:8397cd1f0357bd89e5c808", "android_client_info": { - "package_name": "com.smi.counselling" + "package_name": "in.sminnovations.hpostesting.quality" } }, - "oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ], + "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I" + "current_key": "AIzaSyC4d4GhWHr_NMJAeBvnztQ_yQ3Qe9MAnLs" } ], "services": { "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:650071678820:android:2925e9ce3417d2386c6471", - "android_client_info": { - "package_name": "in.sminnovations.hemocube" - } - }, - "oauth_client": [ - { - "client_id": "650071678820-srhm9spm9hjn4frcd3r6o02gdhdbtd15.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "in.sminnovations.hemocube", - "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a" - } - }, - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:650071678820:android:7569c1cad4fc99916c6471", - "android_client_info": { - "package_name": "in.sminnovations.hposregistration" - } - }, - "oauth_client": [ - { - "client_id": "650071678820-70kp5jvjda4r5diqch2kn4lc40p4f42g.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "in.sminnovations.hposregistration", - "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a" - } - }, - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:650071678820:android:f96be19e5d43102b6c6471", - "android_client_info": { - "package_name": "in.sminnovations.hpostesting" - } - }, - "oauth_client": [ - { - "client_id": "650071678820-l87dnr0bdj95get0khgnvfv2an1k6ogq.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "in.sminnovations.hpostesting", - "certificate_hash": "7714b9268a81d0cf0fb178b0af8dbb630f8fc70a" - } - }, - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ] - } - } - }, - { - "client_info": { - "mobilesdk_app_id": "1:650071678820:android:a53292637abb7c0d6c6471", - "android_client_info": { - "package_name": "in.sminnovations.hpostesting.dev" - } - }, - "oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyAVdNGCev_AFX0qmuZJF6kxzRzXUTeAW5I" - } - ], - "services": { - "appinvite_service": { - "other_platform_oauth_client": [ - { - "client_id": "650071678820-to41afi9f0gi5r3k6v7pe1e5p96nupcs.apps.googleusercontent.com", - "client_type": 3 - } - ] + "other_platform_oauth_client": [] } } } 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 105fd65..efbefc7 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 @@ -149,24 +149,25 @@ class HemoCubeFragment : Fragment() { binding.btnSamplestart.setOnClickListener { + sampleClick = true - if(checkCuvetteSam){ + // if(checkCuvetteSam){ activity?.runOnUiThread { binding.tvSubtitle4.visibility = View.VISIBLE // binding.tvSubtitle4.text = "Sample Started" } startSampleProcess() // it.visibility = View.GONE - }else{ - checkCuvettePresence() - } +// }else{ +// checkCuvettePresence() +// } } binding.btnRetryCheckCuvette.setOnClickListener { checkCuvettePresence() } binding.btnPlacebuffer.setOnClickListener { - if(checkCuvette){ + // if(checkCuvette){ startBufferProcess() // if (isBufferValueAvailable() || !Constants.BLANK_EVERY_TEST) { @@ -181,9 +182,9 @@ class HemoCubeFragment : Fragment() { // it.visibility = View.GONE // } - }else{ - checkCuvettePresence() - } +// }else{ +// checkCuvettePresence() +// } } @@ -471,7 +472,7 @@ class HemoCubeFragment : Fragment() { binding.btnPlacebuffer.visibility = View.VISIBLE binding.btnSamplestart.visibility = View.VISIBLE } - getTemp() + // getTemp() } (resultData.contains("#AC") && this.testStatusCode < TestStatus.TEMPERATURE_CHECK.code) -> { this.testStatusCode = TestStatus.TEMPERATURE_CHECK.code