From 3ef27be20387ac3e833e7c694cd100ff98b6210b Mon Sep 17 00:00:00 2001 From: Mariya Date: Thu, 4 Apr 2024 15:12:13 +0530 Subject: [PATCH] kit scan actvity changes did for v0 , commented the code for v2 --- .../presentation/KitScanActivity.kt | 115 +++++++++--------- .../presentation/dashboard/HomeFragment.kt | 4 +- 2 files changed, 60 insertions(+), 59 deletions(-) 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 e506ecb..592a06a 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/KitScanActivity.kt @@ -32,7 +32,7 @@ import com.zebra.scannercontrol.SDKHandler import `in`.sminnovations.hpostesting.R import `in`.sminnovations.hpostesting.databinding.ActivityKitScanBinding -class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate { +class KitScanActivity : AppCompatActivity() { private val TAG = "KitScanActivity" private lateinit var binding: ActivityKitScanBinding @@ -46,6 +46,7 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate { private val barcodeLauncher = registerForActivityResult( ScanContract() ) { result: ScanIntentResult -> + Log.d(TAG, result.contents) if (result.contents.isNullOrEmpty()) { Toast.makeText(this, R.string.cancelled_unable_scan, Toast.LENGTH_LONG).show() } else { @@ -65,33 +66,33 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate { } - override fun dcssdkEventScannerAppeared(dcsScannerInfo: DCSScannerInfo?) {} - - override fun dcssdkEventScannerDisappeared(i: Int) {} - - override fun dcssdkEventCommunicationSessionEstablished(dcsScannerInfo: DCSScannerInfo?) {} - - override fun dcssdkEventCommunicationSessionTerminated(i: Int) {} -// override fun dcssdkEventBarcode(p0: ByteArray?, p1: Int, p2: Int) { -// TODO("Not yet implemented") +// override fun dcssdkEventScannerAppeared(dcsScannerInfo: DCSScannerInfo?) {} +// +// override fun dcssdkEventScannerDisappeared(i: Int) {} +// +// override fun dcssdkEventCommunicationSessionEstablished(dcsScannerInfo: DCSScannerInfo?) {} +// +// override fun dcssdkEventCommunicationSessionTerminated(i: Int) {} +//// override fun dcssdkEventBarcode(p0: ByteArray?, p1: Int, p2: Int) { +//// TODO("Not yet implemented") +//// } +// +// +// override fun dcssdkEventImage(bytes: ByteArray?, i: Int) {} +// +// override fun dcssdkEventVideo(bytes: ByteArray?, i: Int) {} +// +// override fun dcssdkEventBinaryData(bytes: ByteArray?, i: Int) {} +// +// override fun dcssdkEventFirmwareUpdate(firmwareUpdateEvent: FirmwareUpdateEvent?) {} +// +// override fun dcssdkEventAuxScannerAppeared( +// dcsScannerInfo: DCSScannerInfo?, +// dcsScannerInfo1: DCSScannerInfo?, +// ) { // } - - - override fun dcssdkEventImage(bytes: ByteArray?, i: Int) {} - - override fun dcssdkEventVideo(bytes: ByteArray?, i: Int) {} - - override fun dcssdkEventBinaryData(bytes: ByteArray?, i: Int) {} - - override fun dcssdkEventFirmwareUpdate(firmwareUpdateEvent: FirmwareUpdateEvent?) {} - - override fun dcssdkEventAuxScannerAppeared( - dcsScannerInfo: DCSScannerInfo?, - dcsScannerInfo1: DCSScannerInfo?, - ) { - } - - override fun dcssdkEventConfigurationUpdate(configurationUpdateEvent: ConfigurationUpdateEvent?) {} +// +// override fun dcssdkEventConfigurationUpdate(configurationUpdateEvent: ConfigurationUpdateEvent?) {} override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -151,8 +152,8 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate { setSupportActionBar(binding.toolbar) binding.btnScanNow.setOnClickListener { -// startScanningNow() - pullTrigger() + startScanningNow() +// pullTrigger() } binding.btnGo.setOnClickListener { @@ -207,26 +208,26 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate { } //Setting up the SDK handler - sdkHandler = SDKHandler(this) - //Registers a particular object which conforms to IDcsSdkApiDelegate interface as a receiver of SDK notifications. - sdkHandler!!.dcssdkSetDelegate(this) - //this command is telling the sdk that we're going to be connecting to the scanner via USB - sdkHandler!!.dcssdkSetOperationalMode(DCSSDKDefs.DCSSDK_MODE.DCSSDK_OPMODE_SNAPI) - - //deciding what kind of notifications we want to receive. Explained more in the function - //first we use bitmapping to set these values into the notifications_mask. - var notifications_mask = 0 - // We would like to subscribe to all barcode events - notifications_mask = - notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value - sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask) - mScannerInfoList.addAll(sdkHandler!!.dcssdkGetAvailableScannersList()) - Log.e("scannersize", sdkHandler!!.dcssdkGetAvailableScannersList().size.toString()) - if (mScannerInfoList.isNotEmpty()) { - sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID) - } else { - Toast.makeText(this,"Scanner Is not available In this device", Toast.LENGTH_LONG).show() - } +// sdkHandler = SDKHandler(this) +// //Registers a particular object which conforms to IDcsSdkApiDelegate interface as a receiver of SDK notifications. +// sdkHandler!!.dcssdkSetDelegate(this) +// //this command is telling the sdk that we're going to be connecting to the scanner via USB +// sdkHandler!!.dcssdkSetOperationalMode(DCSSDKDefs.DCSSDK_MODE.DCSSDK_OPMODE_SNAPI) +// +// //deciding what kind of notifications we want to receive. Explained more in the function +// //first we use bitmapping to set these values into the notifications_mask. +// var notifications_mask = 0 +// // We would like to subscribe to all barcode events +// notifications_mask = +// notifications_mask or DCSSDKDefs.DCSSDK_EVENT.DCSSDK_EVENT_BARCODE.value +// sdkHandler!!.dcssdkSubsribeForEvents(notifications_mask) +// mScannerInfoList.addAll(sdkHandler!!.dcssdkGetAvailableScannersList()) +// Log.e("scannersize", sdkHandler!!.dcssdkGetAvailableScannersList().size.toString()) +// if (mScannerInfoList.isNotEmpty()) { +// sdkHandler!!.dcssdkEstablishCommunicationSession(mScannerInfoList[0].scannerID) +// } else { +// Toast.makeText(this,"Scanner Is not available In this device", Toast.LENGTH_LONG).show() +// } } private fun pullTrigger() { @@ -257,14 +258,14 @@ class KitScanActivity : AppCompatActivity(), IDcsSdkApiDelegate { } //this function is called if barcode is detected. - override fun dcssdkEventBarcode(barcodeData: ByteArray?, barcodeType: Int, fromScannerID: Int) { - val result = String(barcodeData!!) - Log.d("BARCODE", result) - runOnUiThread { - val editableResult: Editable = Editable.Factory.getInstance().newEditable(result) - binding.nameEditText.text = editableResult - } - } +// override fun dcssdkEventBarcode(barcodeData: ByteArray?, barcodeType: Int, fromScannerID: Int) { +// val result = String(barcodeData!!) +// Log.d("BARCODE", result) +// runOnUiThread { +// val editableResult: Editable = Editable.Factory.getInstance().newEditable(result) +// binding.nameEditText.text = editableResult +// } +// } private fun checkHemoCubeKitData(): Boolean { return sharedPreference.getString(Constants.KIT_NUMBER, "") 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 b92bc36..2bbf584 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 @@ -289,7 +289,7 @@ class HomeFragment : Fragment() { apply() } startActivity(Intent(requireContext(), KitScanActivity::class.java)) - requireActivity().finish() +// requireActivity().finish() } @@ -300,7 +300,7 @@ class HomeFragment : Fragment() { apply() } startActivity(Intent(requireContext(), KitScanActivity::class.java)) - requireActivity().finish() +// requireActivity().finish() } binding.btnQuickCapture.setOnClickListener { DataHolder.hemoCubeTestData = HemoCubeTestData()