react-native-mytatva-rn-sdk 1.2.19 → 1.2.21

package/android/build.gradle

@@ -179,8 +179,10 @@ dependencies {
   implementation "io.ktor:ktor-client-serialization:$ktor_version"
   implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.1")
 
-  implementation files('libs/library_zxing-release.aar')
-  implementation files('libs/algorithm-release.aar')
+  implementation(name: 'library_zxing-release', ext: 'aar')
+  implementation(name: 'algorithm-release', ext: 'aar')
+  // implementation files('libs/library_zxing-release.aar')
+  // implementation files('libs/algorithm-release.aar')
 }
 
 if (isNewArchitectureEnabled()) {

package/android/src/main/java/com/mytatvarnsdk/activity/ConnectSensorActivity.kt

@@ -25,6 +25,11 @@ import cgmblelib.ble.scancallback.ManageScanCallback
 import cgmblelib.custom.livedata.scan.PocDeviceAndRssi
 import cgmblelib.database.entity.PocDevice
 import com.bumptech.glide.Glide
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.CatalystInstance
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import com.mytatvarnsdk.CgmTrackyLibModule
 import com.mytatvarnsdk.R
 import com.mytatvarnsdk.base.BaseBleActivity
 import com.mytatvarnsdk.databinding.ActivityConnectSensorBinding
@@ -34,309 +39,357 @@ import com.mytatvarnsdk.myView.progress.ProgressType
 
 
 class ConnectSensorActivity : BaseBleActivity() {
-  private lateinit var binding: ActivityConnectSensorBinding
-  public val REQUEST_QR: Int = 115
-  private val CAMERA_REQUEST_CODE = 100
-  var transmitterDeviceInfo: PocDeviceAndRssi? = null
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    binding = ActivityConnectSensorBinding.inflate(layoutInflater)
-    setContentView(binding.root)
-
-    enableEdgeToEdge()
-    ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
-      val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
-      v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
-      insets
-    }
-    initialize()
-  }
-
-  override fun setView(): Int {
-    return R.layout.activity_connect_sensor
-  }
-
-  override fun onPermissionRequestSuccess() {
-  }
-
-  override fun initViews() {
-  }
-
-  private fun initialize() {
-    transmitterDeviceInfo =
-      intent.getSerializableExtra("transmitterDeviceInfo") as PocDeviceAndRssi?
-
-    binding.commonButton.btnProceed.setOnClickListener {
-      transmitterDeviceInfo?.let {
-        QRActivity.startQR(
-          this,
-          it.pocDevice
-        )
-      }
+    private lateinit var binding: ActivityConnectSensorBinding
+    public val REQUEST_QR: Int = 115
+    private val CAMERA_REQUEST_CODE = 100
+    var transmitterDeviceInfo: PocDeviceAndRssi? = null
+    private var isForReconnect: Boolean = false
+    private val reactContext = CgmTrackyLibModule.mReactContext
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityConnectSensorBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        enableEdgeToEdge()
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+            insets
+        }
+        initialize()
     }
 
-    binding.toolbar.btnClose.setOnClickListener {
-      openExitDialog()
+    override fun setView(): Int {
+        return R.layout.activity_connect_sensor
     }
 
-    binding.toolbar.btnWhatsapp.setOnClickListener {
-      startActivity(Intent(this, HelpActivity::class.java))
+    override fun onPermissionRequestSuccess() {
     }
 
-    val callback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
-      override fun handleOnBackPressed() {
-        openExitDialog()
-      }
+    override fun initViews() {
     }
-    onBackPressedDispatcher.addCallback(this, callback)
 
+    private fun initialize() {
+        transmitterDeviceInfo =
+            intent.getSerializableExtra("transmitterDeviceInfo") as PocDeviceAndRssi?
+        isForReconnect = intent.getBooleanExtra("IsForReconnect", false)
+
+        binding.commonButton.btnProceed.setOnClickListener {
+            transmitterDeviceInfo?.let {
+                QRActivity.startQR(
+                    this,
+                    it.pocDevice
+                )
+            }
+        }
 
-    binding.tvPermission.setOnClickListener(View.OnClickListener { v: View? ->
-      requestCameraPermission()
-    })
+        binding.toolbar.btnClose.setOnClickListener {
+            openExitDialog()
+        }
 
-    if (isCameraPermissionGranted(this)) {
-      binding.commonButton.btnProceed.isEnabled = true
-      binding.commonButton.btnProceed.alpha = 1f
-      binding.tvPermission.text = "Press on Proceed button below to scan QR"
-    } else {
-      binding.commonButton.btnProceed.isEnabled = false
-      binding.commonButton.btnProceed.alpha = 0.5f
-      binding.clPermission.visibility = View.VISIBLE
-    }
-  }
+        binding.toolbar.btnWhatsapp.setOnClickListener {
+            startActivity(Intent(this, HelpActivity::class.java))
+        }
 
-  fun manageErrorState(showError: Boolean, errorStatus: String) {
-    ProgressManagement.getInstance().dismissWait(this)
-    if (showError) {
-      binding.clFail.visibility = View.VISIBLE
-      binding.clMain.visibility = View.GONE
-      binding.commonButton.root.visibility = View.GONE
+        val callback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                openExitDialog()
+            }
+        }
+        onBackPressedDispatcher.addCallback(this, callback)
 
-      Glide.with(this)
-        .asGif()
-        .load(R.drawable.warning)
-        .into(binding.ivGif)
 
-      binding.btnSupport.tvProceed.text = "Contact Support"
-      binding.btnRetry.tvProceed.text = "Retry"
+        binding.tvPermission.setOnClickListener(View.OnClickListener { v: View? ->
+            requestCameraPermission()
+        })
 
-      binding.btnWatchDemo.setOnClickListener {
+        if (isCameraPermissionGranted(this)) {
+            binding.commonButton.btnProceed.isEnabled = true
+            binding.commonButton.btnProceed.alpha = 1f
+            binding.tvPermission.text = "Press on Proceed button below to scan QR"
+        } else {
+            binding.commonButton.btnProceed.isEnabled = false
+            binding.commonButton.btnProceed.alpha = 0.5f
+            binding.clPermission.visibility = View.VISIBLE
+        }
+    }
 
-      }
+    fun manageErrorState(showError: Boolean, errorStatus: String) {
+        ProgressManagement.getInstance().dismissWait(this)
+        if (showError) {
+            binding.clFail.visibility = View.VISIBLE
+            binding.clMain.visibility = View.GONE
+            binding.commonButton.root.visibility = View.GONE
+
+            Glide.with(this)
+                .asGif()
+                .load(R.drawable.warning)
+                .into(binding.ivGif)
+
+            binding.btnSupport.tvProceed.text = "Contact Support"
+            binding.btnRetry.tvProceed.text = "Retry"
+
+            binding.btnWatchDemo.setOnClickListener {
+
+            }
+
+            binding.btnSupport.btnProceed.setOnClickListener {
+                startActivity(Intent(this, HelpActivity::class.java))
+            }
+
+            binding.btnRetry.btnProceed.setOnClickListener {
+                transmitterDeviceInfo?.let {
+                    QRActivity.startQR(
+                        this,
+                        it.pocDevice
+                    )
+                }
+            }
+
+            if (errorStatus.isNotEmpty()) {
+                binding.tvReason.visibility = View.VISIBLE
+                binding.tvReason.text = "Reason - ${errorStatus}"
+            } else {
+                binding.tvReason.visibility = View.GONE
+            }
+        } else {
+            binding.commonButton.root.visibility = View.VISIBLE
+            binding.clFail.visibility = View.GONE
+            binding.clMain.visibility = View.VISIBLE
+        }
+    }
 
-      binding.btnSupport.btnProceed.setOnClickListener {
-        startActivity(Intent(this, HelpActivity::class.java))
-      }
 
-      binding.btnRetry.btnProceed.setOnClickListener {
-        transmitterDeviceInfo?.let {
-          QRActivity.startQR(
-            this,
-            it.pocDevice
-          )
+    private fun requestCameraPermission() {
+        if (hasPermissions(PermissionUtils.CAMERA_PERMISSION)) {
+            onCameraPermissionGranted()
+        } else {
+            if (ActivityCompat.shouldShowRequestPermissionRationale(
+                    this,
+                    Manifest.permission.CAMERA
+                )
+            ) {
+                showPermissionRationale(
+                    title = "Camera Permission Needed",
+                    message = "We need access to your camera to proceed.",
+                    onProceed = {
+                        ActivityCompat.requestPermissions(
+                            this,
+                            PermissionUtils.CAMERA_PERMISSION,
+                            CAMERA_REQUEST_CODE
+                        )
+                    }
+                )
+            } else {
+                ActivityCompat.requestPermissions(
+                    this,
+                    PermissionUtils.CAMERA_PERMISSION,
+                    CAMERA_REQUEST_CODE
+                )
+            }
         }
-      }
-
-      if (errorStatus.isNotEmpty()) {
-        binding.tvReason.visibility = View.VISIBLE
-        binding.tvReason.text = "Reason - ${errorStatus}"
-      } else {
-        binding.tvReason.visibility = View.GONE
-      }
-    } else {
-      binding.commonButton.root.visibility = View.VISIBLE
-      binding.clFail.visibility = View.GONE
-      binding.clMain.visibility = View.VISIBLE
     }
-  }
-
-
-  private fun requestCameraPermission() {
-    if (hasPermissions(PermissionUtils.CAMERA_PERMISSION)) {
-      onCameraPermissionGranted()
-    } else {
-      if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.CAMERA)) {
-        showPermissionRationale(
-          title = "Camera Permission Needed",
-          message = "We need access to your camera to proceed.",
-          onProceed = {
-            ActivityCompat.requestPermissions(
-              this,
-              PermissionUtils.CAMERA_PERMISSION,
-              CAMERA_REQUEST_CODE
-            )
-          }
-        )
-      } else {
-        ActivityCompat.requestPermissions(
-          this,
-          PermissionUtils.CAMERA_PERMISSION,
-          CAMERA_REQUEST_CODE
-        )
-      }
+
+    private fun onCameraPermissionGranted() {
+        binding.commonButton.btnProceed.isEnabled = true
+        binding.commonButton.btnProceed.alpha = 1f
+        binding.commonButton.btnProceed.performClick()
     }
-  }
-
-  private fun onCameraPermissionGranted() {
-    binding.commonButton.btnProceed.isEnabled = true
-    binding.commonButton.btnProceed.alpha = 1f
-    binding.commonButton.btnProceed.performClick()
-  }
-
-  private fun showPermissionRationale(title: String, message: String, onProceed: () -> Unit) {
-    AlertDialog.Builder(this)
-      .setTitle(title)
-      .setMessage(message)
-      .setPositiveButton("OK") { _, _ -> onProceed() }
-      .setNegativeButton("Cancel", null)
-      .show()
-  }
-
-  private fun hasPermissions(permissions: Array<String>): Boolean {
-    return permissions.all {
-      ContextCompat.checkSelfPermission(this, it) == PackageManager.PERMISSION_GRANTED
+
+    private fun showPermissionRationale(title: String, message: String, onProceed: () -> Unit) {
+        AlertDialog.Builder(this)
+            .setTitle(title)
+            .setMessage(message)
+            .setPositiveButton("OK") { _, _ -> onProceed() }
+            .setNegativeButton("Cancel", null)
+            .show()
     }
-  }
 
-  fun isCameraPermissionGranted(context: Context): Boolean {
-    return ContextCompat.checkSelfPermission(
-      context,
-      Manifest.permission.CAMERA
-    ) == PackageManager.PERMISSION_GRANTED
-  }
+    private fun hasPermissions(permissions: Array<String>): Boolean {
+        return permissions.all {
+            ContextCompat.checkSelfPermission(this, it) == PackageManager.PERMISSION_GRANTED
+        }
+    }
 
+    fun isCameraPermissionGranted(context: Context): Boolean {
+        return ContextCompat.checkSelfPermission(
+            context,
+            Manifest.permission.CAMERA
+        ) == PackageManager.PERMISSION_GRANTED
+    }
 
-  private fun openExitDialog() {
-    val binding = ExitDialogBottomsheetBinding.inflate(layoutInflater)
 
-    val dialog = Dialog(this)
-    dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
-    dialog.setContentView(binding.root)
+    private fun openExitDialog() {
+        val binding = ExitDialogBottomsheetBinding.inflate(layoutInflater)
 
-    val window = dialog.window
-    window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-    window?.setGravity(Gravity.BOTTOM)
-    window?.setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
+        val dialog = Dialog(this)
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dialog.setContentView(binding.root)
 
-    binding.btnExit.tvProceed.text = "Exit"
+        val window = dialog.window
+        window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+        window?.setGravity(Gravity.BOTTOM)
+        window?.setBackgroundDrawable(Color.TRANSPARENT.toDrawable())
 
-    binding.btnExit.root.setOnClickListener(View.OnClickListener { v: View? ->
-      finish()
-      dialog.dismiss()
-    })
+        binding.btnExit.tvProceed.text = "Exit"
 
-    binding.btnCancel.root.setOnClickListener(View.OnClickListener { v: View? ->
-      dialog.dismiss()
-    })
+        binding.btnExit.root.setOnClickListener(View.OnClickListener { v: View? ->
+            finish()
+            dialog.dismiss()
+        })
 
-    binding.closeButton.setOnClickListener(View.OnClickListener { v: View? ->
-      dialog.dismiss()
-    })
+        binding.btnCancel.root.setOnClickListener(View.OnClickListener { v: View? ->
+            dialog.dismiss()
+        })
 
+        binding.closeButton.setOnClickListener(View.OnClickListener { v: View? ->
+            dialog.dismiss()
+        })
 
-    dialog.show()
-  }
 
-  override fun init() {
-  }
+        dialog.show()
+    }
 
-  override fun onRequestPermissionsResult(
-    requestCode: Int,
-    permissions: Array<out String>,
-    grantResults: IntArray
-  ) {
-    super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-    val allGranted = grantResults.all { it == PackageManager.PERMISSION_GRANTED }
+    override fun init() {
+    }
 
-    when (requestCode) {
-      CAMERA_REQUEST_CODE -> {
-        if (allGranted) {
-          onCameraPermissionGranted()
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        val allGranted = grantResults.all { it == PackageManager.PERMISSION_GRANTED }
+
+        when (requestCode) {
+            CAMERA_REQUEST_CODE -> {
+                if (allGranted) {
+                    onCameraPermissionGranted()
+                }
+            }
         }
-      }
     }
-  }
-
-  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-    super.onActivityResult(requestCode, resultCode, data)
-    if (requestCode == REQUEST_QR && resultCode == RESULT_OK && data != null) {
-      val device: PocDevice? = data.getParcelableExtra("device")
-      if (device != null) {
-        bind(device)
-      }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == REQUEST_QR && resultCode == RESULT_OK && data != null) {
+            val device: PocDevice? = data.getParcelableExtra("device")
+            if (device != null) {
+                bind(device)
+            }
+        }
     }
-  }
-
-  private fun bind(device: PocDevice) {
-    try {
-      if (device.address != null) {
-        ManageGattCallback.getInstance().ConnectViaAddress(device.address)
-        ManageScanCallback.getInstance().stopLeScan()
-        ProgressManagement.getInstance().showWait(this, ProgressType.PROGRESSDIALOG_CONNECT, null)
-      }
-    } catch (e: Exception) {
-      Log.d("bind::-> ", "bind: ${e.message}")
+
+    private fun bind(device: PocDevice) {
+        try {
+            if (device.address != null) {
+                ManageGattCallback.getInstance().ConnectViaAddress(device.address)
+                ManageScanCallback.getInstance().stopLeScan()
+                ProgressManagement.getInstance()
+                    .showWait(this, ProgressType.PROGRESSDIALOG_CONNECT, null)
+            }
+        } catch (e: Exception) {
+            Log.d("bind::-> ", "bind: ${e.message}")
+        }
+    }
+
+    override fun onClick(p0: View?) {
+    }
+
+    override fun bindFail() {
+        super.bindFail()
+        manageErrorState(true, "Bind Fail")
+    }
+
+    override fun bindSuccess() {
+        super.bindSuccess()
+        ProgressManagement.getInstance().dismissWait(this)
+        if (isForReconnect) {
+            sendDataToRN("")
+        } else {
+            startActivity(Intent(this, SensorConnectSuccessActivity::class.java))
+        }
+        finish()
+    }
+
+    private fun sendDataToRN(data: String) {
+        if (reactContext != null) {
+            try {
+                val catalystInstance: CatalystInstance = reactContext.catalystInstance
+                val module = catalystInstance.getNativeModule(CgmTrackyLibModule::class.java)
+
+                if (module == null) {
+                    sendDataToRNDirectly("", "WARM_PERIOD_STARTED")
+                    Log.d("sendDataToRN: ", "Module null")
+                } else {
+                    module.sendDataToReact(data, "WARM_PERIOD_STARTED", "cgmDeviceEvent")
+                    Log.d("sendDataToRN: ", "Module is not null")
+                }
+            } catch (e: Exception) {
+                Log.e("sendDataToRN: Error ", e.message.toString())
+            }
+        } else {
+            Log.e("TrackyActivity", "ReactApplicationContext is null")
+        }
     }
-  }
 
-  override fun onClick(p0: View?) {
-  }
 
-  override fun bindFail() {
-    super.bindFail()
-    manageErrorState(true, "Bind Fail")
-  }
+    private fun sendDataToRNDirectly(data: String, status: String) {
+        try {
+            val map: WritableMap = Arguments.createMap().apply {
+                putString("data", data)
+                putString("status", status)
+            }
 
-  override fun bindSuccess() {
-    super.bindSuccess()
-    ProgressManagement.getInstance().dismissWait(this)
-    startActivity(Intent(this, SensorConnectSuccessActivity::class.java))
-    finish()
-  }
+            reactContext?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                ?.emit("cgmDeviceEvent", map)
+        } catch (e: Exception) {
+            Log.e("sendDataToRNDirectly", "Error sending data to React", e)
+        }
+    }
 
 
-  override fun bluetoothStateOFF() {
-    super.bluetoothStateOFF()
-    manageErrorState(true, "Bluetooth Off")
+    override fun bluetoothStateOFF() {
+        super.bluetoothStateOFF()
+        manageErrorState(true, "Bluetooth Off")
 
-  }
+    }
 
-  override fun disconnect() {
-    super.disconnect()
-    manageErrorState(true, "Disconnected")
+    override fun disconnect() {
+        super.disconnect()
+        manageErrorState(true, "Disconnected")
 
-  }
+    }
 
-  override fun disconnectForTimeout() {
-    super.disconnectForTimeout()
-    manageErrorState(true, "Disconnected")
+    override fun disconnectForTimeout() {
+        super.disconnectForTimeout()
+        manageErrorState(true, "Disconnected")
 
-  }
+    }
 
-  override fun checkFailForLowPower() {
-    super.checkFailForLowPower()
-    manageErrorState(true, "Low Power")
+    override fun checkFailForLowPower() {
+        super.checkFailForLowPower()
+        manageErrorState(true, "Low Power")
 
-  }
+    }
 
-  override fun checkFailErrorTemperature() {
-    super.checkFailErrorTemperature()
-    manageErrorState(true, "Temperature Error")
+    override fun checkFailErrorTemperature() {
+        super.checkFailErrorTemperature()
+        manageErrorState(true, "Temperature Error")
 
-  }
+    }
 
-  override fun unbindReset() {
-    super.unbindReset()
-    manageErrorState(true, "Unbinded")
+    override fun unbindReset() {
+        super.unbindReset()
+        manageErrorState(true, "Unbinded")
 
-  }
+    }
 
-  override fun unbindCommand() {
-    super.unbindCommand()
-    manageErrorState(true, "Unbinded")
+    override fun unbindCommand() {
+        super.unbindCommand()
+        manageErrorState(true, "Unbinded")
 
-  }
+    }
 
 }