react-native-mytatva-rn-sdk 1.2.44 → 1.2.46

package/android/src/main/java/com/mytatvarnsdk/CgmTrackyLibModule.kt

@@ -262,7 +262,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                             put("transmitterName", device?.name ?: "")
                             put("SensorId", sensorId ?: "")
                             put("Sensor", sensorId ?: "")
-                            put("timeInMillis", Date().time)
+                            put("timeInMillis", System.currentTimeMillis())
                         }
 
                         val obj = JSONObject().apply {
@@ -368,10 +368,22 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             Handler(Looper.getMainLooper()).postDelayed({
                 // Create new observer with explicit nullable parameter type
                 glucoseObserver = Observer<PocGlucose?> { pocGlucose ->
-                    if (pocGlucose != null) {
+                    val currentTime = System.currentTimeMillis()
+                    var dataAge = System.currentTimeMillis()
+
+                    if (prefsHelper.lastSyncData != null) {
+                        dataAge = currentTime - prefsHelper.lastSyncData.timeInMillis
+                    }
+
+                    if ((pocGlucose != null && prefsHelper.lastSyncData == null) || (pocGlucose != null && prefsHelper.lastSyncData != null && dataAge <= 4 * 60 * 1000L)) {
                         handleGlucoseData(pocGlucose)
+                        Log.d(
+                            "observeGlucoseData",
+                            "Received glucose data - processing"
+                        )
                     } else {
-                        Log.w(
+                        observeAllGlucoseData(userToken)
+                        Log.d(
                             "observeGlucoseData",
                             "Received null glucose data - skipping processing"
                         )
@@ -517,6 +529,11 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                 if (lastSyncData != null) {
                     CoroutineScope(Dispatchers.IO).launch {
                         val glucoseData = mModel.getGlucoseBetweenTime(lastSyncData.lastSyncTime)
+
+                        Log.d("observeAllGlucoseData: ", glucoseData.toString())
+                        Log.d("Last sync time: ", lastSyncData.lastSyncTime.toString())
+                        Log.d("current time: ", System.currentTimeMillis().toString())
+
                         if (glucoseData != null && glucoseData.isNotEmpty()) {
                             processBatchDataAndStartObserver(glucoseData)
                         } else {
@@ -778,7 +795,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
         lastRecord?.let {
             try {
                 val syncData = SyncMeta(
-                    Date().time,
+                    System.currentTimeMillis(),
                     it.timeInMillis,
                     it.deviceId,
                     it.glucoseId

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

@@ -36,6 +36,7 @@ import com.mytatvarnsdk.databinding.ActivityConnectSensorBinding
 import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
 import com.mytatvarnsdk.myView.progress.ProgressManagement
 import com.mytatvarnsdk.myView.progress.ProgressType
+import org.json.JSONObject
 
 
 class ConnectSensorActivity : BaseBleActivity() {
@@ -75,6 +76,8 @@ class ConnectSensorActivity : BaseBleActivity() {
             intent.getSerializableExtra("transmitterDeviceInfo") as PocDeviceAndRssi?
         isForReconnect = intent.getBooleanExtra("IsForReconnect", false)
 
+        sendDataToRN("", "cgm_connect_sensor_scan_landing")
+
         binding.commonButton.btnProceed.setOnClickListener {
             transmitterDeviceInfo?.let {
                 QRActivity.startQR(
@@ -89,7 +92,10 @@ class ConnectSensorActivity : BaseBleActivity() {
         }
 
         binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(Intent(this, HelpActivity::class.java))
+            startActivity(
+                Intent(this, HelpActivity::class.java)
+                    .putExtra("ScreenName", "Sensor Screen")
+            )
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
@@ -148,10 +154,15 @@ class ConnectSensorActivity : BaseBleActivity() {
             }
 
             binding.btnSupport.btnProceed.setOnClickListener {
-                startActivity(Intent(this, HelpActivity::class.java))
+                startActivity(
+                    Intent(this, HelpActivity::class.java)
+                        .putExtra("ScreenName", "Sensor Screen")
+                )
             }
 
             binding.btnRetry.btnProceed.setOnClickListener {
+                sendDataToRN("", "cgm_retry_connect_sensor_clicked")
+
                 transmitterDeviceInfo?.let {
                     QRActivity.startQR(
                         this,
@@ -161,6 +172,10 @@ class ConnectSensorActivity : BaseBleActivity() {
             }
 
             if (errorStatus.isNotEmpty()) {
+                val jsonObject = JSONObject()
+                jsonObject.put("error_description", errorStatus)
+                sendDataToRN(jsonObject.toString(), "cgm_sensor_connection_failed")
+
                 binding.tvReason.visibility = View.VISIBLE
                 binding.tvReason.text = "Reason - ${errorStatus}"
             } else {
@@ -340,7 +355,7 @@ class ConnectSensorActivity : BaseBleActivity() {
                 val module = catalystInstance.getNativeModule(CgmTrackyLibModule::class.java)
 
                 if (module == null) {
-                    sendDataToRNDirectly("", status)
+                    sendDataToRNDirectly(data, status)
                     Log.d("sendDataToRN: ", "Module null")
                 } else {
                     module.sendDataToReact(data, status, "cgmDeviceEvent")

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

@@ -3,96 +3,155 @@ package com.mytatvarnsdk.activity
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.util.Log
+import android.widget.RadioButton
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+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.databinding.ActivityHelpBinding
+import org.json.JSONObject
 
 class HelpActivity : AppCompatActivity() {
-  private lateinit var binding: ActivityHelpBinding
+    private lateinit var binding: ActivityHelpBinding
+    private val reactContext = CgmTrackyLibModule.mReactContext
 
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    binding = ActivityHelpBinding.inflate(layoutInflater)
-    setContentView(binding.root)
 
-    enableEdgeToEdge()
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = ActivityHelpBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
-    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
-    }
+        enableEdgeToEdge()
 
-    init()
-  }
+        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
+        }
 
-  private fun init() {
-    binding.btnProceed.setOnClickListener {
-      openWhatsApp()
+        init()
     }
 
-    binding.ivBack.setOnClickListener {
-      finish()
-    }
+    private fun init() {
+        val jsonObject = JSONObject()
+        jsonObject.put("screen_name", intent.getStringExtra("ScreenName"))
+        sendDataToRN(jsonObject.toString(), "cgm_WA_support_clicked")
 
-     binding.tvBack.setOnClickListener {
-      finish()
-    }
+        binding.btnProceed.setOnClickListener {
+            val selectedRadioButtonId = binding.helpOptionsGroup.checkedRadioButtonId
+
+            if (selectedRadioButtonId != -1) {
+                val selectedRadioButton = findViewById<RadioButton>(selectedRadioButtonId)
+                val selectedText = selectedRadioButton.text.toString()
 
-    enableDisableBtn(false)
+                val jsonObject = JSONObject()
+                jsonObject.put("help", selectedText)
+                sendDataToRN(jsonObject.toString(), "cgm_WA_support_proceed_clicked")
+            }
 
-    binding.helpOptionsGroup.setOnCheckedChangeListener { group, checkedId ->
-      when (checkedId) {
-        R.id.radio_purchase -> {
-          enableDisableBtn(true)
+            openWhatsApp()
         }
 
-        R.id.radio_connect -> {
-          enableDisableBtn(true)
+        binding.ivBack.setOnClickListener {
+            finish()
         }
 
-        R.id.radio_troubles -> {
-          enableDisableBtn(true)
+        binding.tvBack.setOnClickListener {
+            finish()
+        }
+
+        enableDisableBtn(false)
+
+        binding.helpOptionsGroup.setOnCheckedChangeListener { group, checkedId ->
+            when (checkedId) {
+                R.id.radio_purchase -> {
+                    enableDisableBtn(true)
+                }
+
+                R.id.radio_connect -> {
+                    enableDisableBtn(true)
+                }
+
+                R.id.radio_troubles -> {
+                    enableDisableBtn(true)
+                }
+
+                else -> {
+                    enableDisableBtn(false)
+                }
+            }
         }
 
-        else -> {
-          enableDisableBtn(false)
+        val callback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                finish()
+            }
         }
-      }
+        onBackPressedDispatcher.addCallback(this, callback)
     }
 
-    val callback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
-      override fun handleOnBackPressed() {
-        finish()
-      }
+    fun enableDisableBtn(isEnable: Boolean) {
+        binding.btnProceed.isEnabled = isEnable
+        if (isEnable) {
+            binding.btnProceed.alpha = 1f
+        } else {
+            binding.btnProceed.alpha = 0.5f
+        }
     }
-    onBackPressedDispatcher.addCallback(this, callback)
-  }
-
-  fun enableDisableBtn(isEnable: Boolean) {
-    binding.btnProceed.isEnabled = isEnable
-    if (isEnable) {
-      binding.btnProceed.alpha = 1f
-    } else {
-      binding.btnProceed.alpha = 0.5f
+
+    private fun openWhatsApp() {
+        val waBotUrl = "https://wa.aisensy.com/aaa1qv"
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(waBotUrl))
+        try {
+            // You don't need to set the package for browser-based WhatsApp bots
+            startActivity(intent)
+        } catch (e: Exception) {
+            e.printStackTrace()
+            Toast.makeText(this, "Error opening WhatsApp Bot", Toast.LENGTH_SHORT).show()
+        }
     }
-  }
-
-  private fun openWhatsApp() {
-    val waBotUrl = "https://wa.aisensy.com/aaa1qv"
-    val intent = Intent(Intent.ACTION_VIEW, Uri.parse(waBotUrl))
-    try {
-      // You don't need to set the package for browser-based WhatsApp bots
-      startActivity(intent)
-    } catch (e: Exception) {
-      e.printStackTrace()
-      Toast.makeText(this, "Error opening WhatsApp Bot", Toast.LENGTH_SHORT).show()
+
+    private fun sendDataToRN(data: String, status: String) {
+        if (reactContext != null) {
+            try {
+                val catalystInstance: CatalystInstance = reactContext.catalystInstance
+                val module = catalystInstance.getNativeModule(CgmTrackyLibModule::class.java)
+
+                if (module == null) {
+                    sendDataToRNDirectly(data, status)
+                    Log.d("sendDataToRN: ", "Module null")
+                } else {
+                    module.sendDataToReact(data, status, "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")
+        }
     }
-  }
 
+    private fun sendDataToRNDirectly(data: String, status: String) {
+        try {
+            val map: WritableMap = Arguments.createMap().apply {
+                putString("data", data)
+                putString("status", status)
+            }
+
+            reactContext?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                ?.emit("cgmDeviceEvent", map)
+        } catch (e: Exception) {
+            Log.e("sendDataToRNDirectly", "Error sending data to React", e)
+        }
+    }
 }