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

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

@@ -250,10 +250,13 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                     mStatus
                 }
 
+                Log.d("postEventDataToAPI: ", "Device Event Status==> $status")
+
                 if (status.isNotEmpty()) {
                     if (status != lastDeviceStatus) {
 
                         lastDeviceStatus = status
+                        Log.d("postEventDataToAPI: ", "Device Event Status API==> $status")
 
                         val rawData = JSONObject().apply {
                             put("transmitterName", device?.name ?: "")
@@ -366,19 +369,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                 // Create new observer with explicit nullable parameter type
                 glucoseObserver = Observer<PocGlucose?> { pocGlucose ->
                     if (pocGlucose != null) {
-                        // Add timestamp check to prevent processing old data
-                        val currentTime = System.currentTimeMillis()
-                        val dataAge = currentTime - pocGlucose.timeInMillis
-
-                        // Only process data that's relatively recent (within last 10 minutes as example)
-                        if (dataAge <= 10 * 60 * 1000L) { // 10 minutes
-                            handleGlucoseData(pocGlucose)
-                        } else {
-                            Log.d(
-                                "observeGlucoseData",
-                                "Skipping old glucose data: age = ${dataAge}ms"
-                            )
-                        }
+                        handleGlucoseData(pocGlucose)
                     } else {
                         Log.w(
                             "observeGlucoseData",
@@ -610,7 +601,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             lastDeviceStatus = null
 
             // Clear any cached data if needed
-            // prefsHelper.clearCache() // if you have such method
+            prefsHelper.clearQRInformation() // if you have such method
 
         } catch (e: Exception) {
             Log.e("resetCgmState", "Error resetting CGM state: ${e.message}")

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

@@ -93,6 +93,8 @@ class ConnectSensorActivity : BaseBleActivity() {
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
+            sendDataToRN("", "cgm_watch_demo_clicked")
+
             startActivity(
                 Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
             )
@@ -317,7 +319,7 @@ class ConnectSensorActivity : BaseBleActivity() {
         super.bindSuccess()
         ProgressManagement.getInstance().dismissWait(this)
         if (isForReconnect) {
-            sendDataToRN("")
+            sendDataToRN("", "WARM_PERIOD_STARTED")
             startActivity(
                 Intent(this, SensorConnectSuccessActivity::class.java)
                     .putExtra(
@@ -331,17 +333,17 @@ class ConnectSensorActivity : BaseBleActivity() {
         finish()
     }
 
-    private fun sendDataToRN(data: String) {
+    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("", "WARM_PERIOD_STARTED")
+                    sendDataToRNDirectly("", status)
                     Log.d("sendDataToRN: ", "Module null")
                 } else {
-                    module.sendDataToReact(data, "WARM_PERIOD_STARTED", "cgmDeviceEvent")
+                    module.sendDataToReact(data, status, "cgmDeviceEvent")
                     Log.d("sendDataToRN: ", "Module is not null")
                 }
             } catch (e: Exception) {

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

@@ -29,6 +29,11 @@ import androidx.core.graphics.drawable.toDrawable
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import cgmblelib.utils.ConstantsLibrary
+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.base.BasePermissionActivity
 import com.mytatvarnsdk.databinding.ActivityPermissionBinding
 import com.mytatvarnsdk.databinding.BluetoothDialogBottomsheetBinding
@@ -43,6 +48,7 @@ class PermissionActivity : BasePermissionActivity() {
   private val bluetoothAdapter: BluetoothAdapter? by lazy {
     BluetoothAdapter.getDefaultAdapter()
   }
+  private val reactContext = CgmTrackyLibModule.mReactContext
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
@@ -150,6 +156,8 @@ class PermissionActivity : BasePermissionActivity() {
     }
 
     binding.toolbar.btnWatchDemo.setOnClickListener {
+      sendDataToRN("","cgm_watch_demo_clicked")
+
       startActivity(
         Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
       )
@@ -171,6 +179,42 @@ class PermissionActivity : BasePermissionActivity() {
     onBackPressedDispatcher.addCallback(this, callback)
   }
 
+  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("", 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)
+    }
+  }
+
   private fun openBluetoothDialog() {
     val binding = BluetoothDialogBottomsheetBinding.inflate(layoutInflater)
 

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

@@ -4,6 +4,7 @@ import android.app.Dialog
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
+import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
@@ -16,6 +17,11 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
+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.ActivityPlaceSensorBinding
 import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
@@ -26,6 +32,7 @@ import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.options.IFram
 
 class PlaceSensorActivity : AppCompatActivity() {
     private lateinit var binding: ActivityPlaceSensorBinding
+    private val reactContext = CgmTrackyLibModule.mReactContext
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -56,6 +63,8 @@ class PlaceSensorActivity : AppCompatActivity() {
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
+            sendDataToRN("", "cgm_watch_demo_clicked")
+
             startActivity(
                 Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
             )
@@ -85,6 +94,41 @@ class PlaceSensorActivity : AppCompatActivity() {
         onBackPressedDispatcher.addCallback(this, callback)
     }
 
+    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("", 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)
+        }
+    }
 
     private fun openExitDialog() {
         val binding = ExitDialogBottomsheetBinding.inflate(layoutInflater)

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

@@ -61,7 +61,7 @@ class PlaceTransmitterActivity : AppCompatActivity() {
         binding.commonButton.tvProceed.text = "Complete"
 
         binding.commonButton.btnProceed.setOnClickListener {
-            sendDataToRN("")
+            sendDataToRN("","WARM_PERIOD_STARTED")
             finish()
         }
 
@@ -70,6 +70,8 @@ class PlaceTransmitterActivity : AppCompatActivity() {
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
+            sendDataToRN("","cgm_watch_demo_clicked")
+
             startActivity(
                 Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
             )
@@ -124,17 +126,17 @@ class PlaceTransmitterActivity : AppCompatActivity() {
         dialog.show()
     }
 
-    private fun sendDataToRN(data: String) {
+    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("", "WARM_PERIOD_STARTED")
+                    sendDataToRNDirectly("", status)
                     Log.d("sendDataToRN: ", "Module null")
                 } else {
-                    module.sendDataToReact(data, "WARM_PERIOD_STARTED", "cgmDeviceEvent")
+                    module.sendDataToReact(data, status, "cgmDeviceEvent")
                     Log.d("sendDataToRN: ", "Module is not null")
                 }
             } catch (e: Exception) {

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

@@ -33,6 +33,11 @@ import cgmblelib.custom.livedata.scan.PocDeviceAndRssi
 import cgmblelib.database.entity.PocDevice
 import cgmblelib.database.entity.PocGlucose
 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.ActivitySearchTransmitterBinding
@@ -65,6 +70,7 @@ class SearchTransmitterActivity : BaseBleActivity() {
     private val job = Job()
     private val scope = CoroutineScope(Dispatchers.IO + job)
     private var isForReconnect: Boolean = false
+    private val reactContext = CgmTrackyLibModule.mReactContext
 
     override fun init() {
 
@@ -350,6 +356,8 @@ class SearchTransmitterActivity : BaseBleActivity() {
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
+            sendDataToRN("", "cgm_watch_demo_clicked")
+
             startActivity(
                 Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
             )
@@ -457,6 +465,41 @@ class SearchTransmitterActivity : BaseBleActivity() {
         }
     }
 
+    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("", 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)
+        }
+    }
 
     fun logLongJson(tag: String, message: String) {
         val maxLogSize = 4000

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

@@ -4,6 +4,7 @@ import android.app.Dialog
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
+import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
@@ -16,6 +17,10 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import cgmblelib.utils.SharedPreferencesLibraryUtil
 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.R
 import com.mytatvarnsdk.databinding.ActivitySensorConnectSuccessBinding
 import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
@@ -41,6 +46,7 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
     private val job = Job()
     private val scope = CoroutineScope(Dispatchers.IO + job)
     private var isForReconnect: Boolean = false
+    private val reactContext = CgmTrackyLibModule.mReactContext
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -74,6 +80,8 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
+            sendDataToRN("","cgm_watch_demo_clicked")
+
             startActivity(
                 Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
             )
@@ -102,6 +110,42 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
         postEventDataToAPI()
     }
 
+    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("", 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)
+        }
+    }
+
     private fun postEventDataToAPI() {
         val sharedPreferencesLibraryUtil = SharedPreferencesLibraryUtil(this)
         val information = sharedPreferencesLibraryUtil.qrInformation

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

@@ -6,6 +6,7 @@ import android.content.pm.PackageManager
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
@@ -17,6 +18,11 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toDrawable
 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.CgmTrackyLibModule.Companion.mReactContext
 import com.mytatvarnsdk.R
 import com.mytatvarnsdk.databinding.ActivityStartCgmactivityBinding
@@ -26,6 +32,7 @@ import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
 class StartCGMActivity : AppCompatActivity() {
     private lateinit var binding: ActivityStartCgmactivityBinding
     private var isForReconnect: Boolean = false
+    private val reactContext = CgmTrackyLibModule.mReactContext
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -79,6 +86,7 @@ class StartCGMActivity : AppCompatActivity() {
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
+            sendDataToRN("","cgm_watch_demo_clicked")
             startActivity(
                 Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
             )
@@ -142,4 +150,40 @@ class StartCGMActivity : AppCompatActivity() {
         dialog.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("", 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)
+        }
+    }
+
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mytatva-rn-sdk",
-  "version": "1.2.42",
+  "version": "1.2.44",
   "description": "a package to inject data into visit health pwa",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",