From 90b92897bda10ceccbf7ce0c6e4a3469e21de21a Mon Sep 17 00:00:00 2001 From: "smileomi18@gmail.com" Date: Thu, 27 Jul 2023 17:16:28 +0530 Subject: [PATCH] HemoCube new Changes --- .../hpostesting/presentation/MainActivity.kt | 76 +------------------ 1 file changed, 1 insertion(+), 75 deletions(-) diff --git a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt index 551a784..83f1346 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/MainActivity.kt @@ -1,11 +1,8 @@ package com.example.hpostesting.presentation import android.Manifest -import android.app.PendingIntent import android.content.* import android.content.pm.PackageManager -import android.hardware.usb.UsbDevice -import android.hardware.usb.UsbDeviceConnection import android.hardware.usb.UsbManager import android.location.Location import android.os.Bundle @@ -21,9 +18,7 @@ import com.example.hpostesting.data.DataHolder import com.example.hpostesting.data.constant.Constants import com.example.hpostesting.data.model.patient.UserData import com.example.hpostesting.data.model.test.TestType -import com.example.hpostesting.presentation.testRight.UsbService import com.google.android.gms.location.* -import com.hoho.android.usbserial.driver.UsbSerialDriver import com.hoho.android.usbserial.driver.UsbSerialProber import `in`.sminnovations.hpostesting.R import `in`.sminnovations.hpostesting.databinding.ActivityMainBinding @@ -35,35 +30,14 @@ class MainActivity : AppCompatActivity() { private val TAG = "MainActivity" private lateinit var fusedLocationClient: FusedLocationProviderClient private lateinit var locationCallback: LocationCallback - private var mConnection: UsbDeviceConnection? = null - lateinit var mService: UsbService - private lateinit var mDriver: UsbSerialDriver + private val usbReceiver = object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent) { when (intent.action) { UsbManager.ACTION_USB_DEVICE_DETACHED -> DataHolder.usbConnected.value = false UsbManager.ACTION_USB_DEVICE_ATTACHED -> DataHolder.usbConnected.value = true } - - - synchronized(this) { - val device: UsbDevice? = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE) - - if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) { - device?.apply { - connectUsb(true) - } - } else { - onErrorReported("permission denied for device") - } - } - checkAndUpdateUsbConnection() - - - - - } } @@ -164,46 +138,6 @@ class MainActivity : AppCompatActivity() { } } - private fun connectUsb(permissionGranted: Boolean) { - Log.d(TAG, "connectUsb() called, permission variable = $permissionGranted") - val manager = getSystemService(Context.USB_SERVICE) as UsbManager - val availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager) - - if (availableDrivers.isEmpty()) { - onErrorReported("No Device is Connected") - } else { - mDriver = availableDrivers[0] - - if (mConnection == null) { - requestUserPermission(manager, mDriver.device) - } else { -// setupService() - } - } - } - - private fun requestUserPermission(manager: UsbManager, device: UsbDevice) { - val mPendingIntent: PendingIntent - if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) { - mPendingIntent = PendingIntent.getBroadcast( - this, - 0, - Intent(Constants.ACTION_USB_PERMISSION), - PendingIntent.FLAG_MUTABLE - ) - } else { - mPendingIntent = PendingIntent.getBroadcast( - this, - 0, - Intent(Constants.ACTION_USB_PERMISSION), - PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE - ) - } - - val filter = IntentFilter(Constants.ACTION_USB_PERMISSION) - registerReceiver(usbReceiver, filter) - manager.requestPermission(device, mPendingIntent) - } private fun setupListeners() { binding.cvItem1.setOnClickListener { DataHolder.selectedTestType = TestType.SICKLECERT @@ -324,14 +258,6 @@ class MainActivity : AppCompatActivity() { stopLocationUpdates() } - - fun onErrorReported(msg: String) { - Toast.makeText(this, msg, Toast.LENGTH_SHORT).show() - if (!isFinishing) - onBackPressed() - } - - override fun onRequestPermissionsResult( requestCode: Int, permissions: Array, grantResults: IntArray ) {