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

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

@@ -48,6 +48,8 @@ class PlaceSensorActivity : AppCompatActivity() {
     }
 
     private fun init() {
+        sendDataToRN("", "cgm_place_sensor_landing")
+
         Glide.with(this)
             .load(R.drawable.img_male)
             .transform(RoundedCorners(50))
@@ -59,7 +61,10 @@ class PlaceSensorActivity : AppCompatActivity() {
             .into(binding.ivPlay)
 
         binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(Intent(this, HelpActivity::class.java))
+            startActivity(
+                Intent(this, HelpActivity::class.java)
+                    .putExtra("ScreenName", "Attach Sensor Screen")
+            )
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
@@ -101,7 +106,7 @@ class PlaceSensorActivity : AppCompatActivity() {
                 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/PlaceTransmitterActivity.kt

@@ -48,6 +48,8 @@ class PlaceTransmitterActivity : AppCompatActivity() {
     }
 
     private fun init() {
+        sendDataToRN("", "cgm_place_transmitter_landing")
+
         Glide.with(this)
             .load(R.drawable.img_female)
             .transform(RoundedCorners(50))
@@ -61,16 +63,20 @@ class PlaceTransmitterActivity : AppCompatActivity() {
         binding.commonButton.tvProceed.text = "Complete"
 
         binding.commonButton.btnProceed.setOnClickListener {
-            sendDataToRN("","WARM_PERIOD_STARTED")
+            sendDataToRN("", "cgm_connection_complete_clicked")
+            sendDataToRN("", "WARM_PERIOD_STARTED")
             finish()
         }
 
         binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(Intent(this, HelpActivity::class.java))
+            startActivity(
+                Intent(this, HelpActivity::class.java)
+                    .putExtra("ScreenName", "Attach Transmitter Screen")
+            )
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
-            sendDataToRN("","cgm_watch_demo_clicked")
+            sendDataToRN("", "cgm_watch_demo_clicked")
 
             startActivity(
                 Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
@@ -133,7 +139,7 @@ class PlaceTransmitterActivity : AppCompatActivity() {
                 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/SearchTransmitterActivity.kt

@@ -55,6 +55,7 @@ import com.mytatvarnsdk.network.AuthenticateSDKService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import org.json.JSONObject
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -107,6 +108,8 @@ class SearchTransmitterActivity : BaseBleActivity() {
     }
 
     private fun setupInitialState() {
+        sendDataToRN("", "cgm_connect_transmitter_landing")
+
         isForReconnect = intent.getBooleanExtra("IsForReconnect", false)
 
         // Set initial states
@@ -146,16 +149,27 @@ class SearchTransmitterActivity : BaseBleActivity() {
             }
 
             binding.btnSupport.btnProceed.setOnClickListener {
-                startActivity(Intent(this, HelpActivity::class.java))
+                startActivity(
+                    Intent(this, HelpActivity::class.java)
+                        .putExtra("ScreenName", "Transmitter Screen")
+                )
             }
 
             binding.btnRetry.btnProceed.setOnClickListener {
-                val intent = intent
-                finish()
-                startActivity(intent)
+                sendDataToRN("", "cgm_retry_connect_transmitter_clicked")
+
+                Handler().postDelayed({
+                    val intent = intent
+                    finish()
+                    startActivity(intent)
+                }, 500)
             }
 
             if (errorStatus.isNotEmpty()) {
+                val jsonObject = JSONObject()
+                jsonObject.put("error_description", errorStatus)
+                sendDataToRN(jsonObject.toString(), "cgm_transmitter_connection_failed")
+
                 binding.tvReason.visibility = View.VISIBLE
                 binding.tvReason.text = "Reason - ${errorStatus}"
             } else {
@@ -219,6 +233,8 @@ class SearchTransmitterActivity : BaseBleActivity() {
         if (transmitterDeviceInfo != null && !binding.tvReason.isVisible) {
             manageErrorState(false, "")
         } else {
+            sendDataToRN("", "cgm_transmitter_detection_failed")
+
             manageErrorState(true, "")
         }
         Log.d("Search Transmitter Error--> ", "Search Transmitter Error--> scanEnd")
@@ -226,6 +242,7 @@ class SearchTransmitterActivity : BaseBleActivity() {
 
     override fun bluetoothStateOFF() {
         super.bluetoothStateOFF()
+
         manageErrorState(true, "Bluetooth Off")
         Log.d("Search Transmitter Error--> ", "Search Transmitter Error--> bluetoothStateOFF")
     }
@@ -246,6 +263,7 @@ class SearchTransmitterActivity : BaseBleActivity() {
         ProgressManagement.getInstance().dismissWait(this)
         manageErrorState(true, "Bind Failure")
         Log.d("Search Transmitter Error--> ", "Search Transmitter Error--> bindFail")
+        sendDataToRN("", "cgm_transmitter_connection_failed")
     }
 
     public override fun bindSuccess() {
@@ -260,54 +278,8 @@ class SearchTransmitterActivity : BaseBleActivity() {
         binding.commonButton.btnProceed.alpha = 1.0f
         binding.view2.background = ContextCompat.getDrawable(this, R.drawable.bg_green_progress)
         binding.tvDivide2.setTextColor("#299D6B".toColorInt())
-    }
 
-    fun mapToDto(glucose: PocGlucose): GlucoseLog {
-        val dto: GlucoseLog = GlucoseLog()
-        dto.timeInMillis = glucose.getTimeInMillis()
-        dto.countdownMinutes = glucose.getCountdownMinutes()
-        dto.countdownHours = glucose.getCountdownHours()
-        dto.countdownDays = glucose.getCountdownDays()
-        dto.hypoglycemiaEarlyWarnMinutes = glucose.getHypoglycemiaEarlyWarnMinutes()
-        dto.showGlucoseMG = glucose.getShowGlucoseMG()
-        dto.glucoseId = glucose.getGlucoseId()
-        dto.name = glucose.getName()
-        dto.showGlucose = glucose.getShowGlucose()
-        dto.Ib = glucose.getIb()
-        dto.Iw = glucose.getIw()
-        dto.T = glucose.getT()
-        dto.year = glucose.getYear()
-        dto.month = glucose.getMonth()
-        dto.day = glucose.getDay()
-        dto.hour = glucose.getHour()
-        dto.minute = glucose.getMinute()
-
-        // Convert byte[] to List<Integer>
-        dto.bytes = ArrayList()
-        for (b in glucose.getBytes()) {
-            dto.bytes?.add(b.toInt() and 0xFF) // Prevent negative values
-        }
-
-        // Trend
-        val trendObj: TrendObject = TrendObject()
-        trendObj.trendId = glucose.getTrend().getTrendId()
-        trendObj.drawableId = glucose.getTrend().getDrawableId()
-        trendObj.widgetImg = glucose.getTrend().getWidgetImg()
-        trendObj.apsChangeRate = glucose.getTrend().getApsChangeRate()
-        dto.trendObject = trendObj
-
-        // Status
-        val statusObj: GlucoseStatusObject = GlucoseStatusObject()
-        statusObj.statusId = glucose.getGlucoseStatus().getStatusId()
-        dto.glucoseStatusObject = statusObj
-
-        // Error
-        val errorObj: ErrorObject = ErrorObject()
-        errorObj.errorId = glucose.getErrorCode().getErrorId()
-        errorObj.sound = glucose.getErrorCode().getSound().toString()
-        dto.errorObject = errorObj
-
-        return dto
+        sendDataToRN("", "cgm_transmitter_connection_successful")
     }
 
 
@@ -352,7 +324,10 @@ class SearchTransmitterActivity : BaseBleActivity() {
 
     private fun setupClickListeners() {
         binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(Intent(this, HelpActivity::class.java))
+            startActivity(
+                Intent(this, HelpActivity::class.java)
+                    .putExtra("ScreenName", "Transmitter Screen")
+            )
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
@@ -472,7 +447,7 @@ class SearchTransmitterActivity : 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")
@@ -562,6 +537,8 @@ class SearchTransmitterActivity : BaseBleActivity() {
         })
 
         binding.searchingLayout.startAnimation(fadeOut)
+
+        sendDataToRN("", "cgm_transmitter_detected")
     }
 
     private fun connectToTransmitter() {

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

@@ -65,6 +65,8 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
     private fun init() {
         isForReconnect = intent.getBooleanExtra("IsForReconnect", false)
 
+        sendDataToRN("", "cgm_sensor_connection_successful")
+
         val formatter = SimpleDateFormat("hh:mm a", Locale.getDefault())
         binding.tvDateTime.text = "Connected on ${formatter.format(Date()).uppercase()}"
 
@@ -76,7 +78,10 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
         authenticateSDKService = AuthenticateSDKService(scope = scope)
 
         binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(Intent(this, HelpActivity::class.java))
+            startActivity(
+                Intent(this, HelpActivity::class.java)
+                    .putExtra("ScreenName", "Sensor Screen")
+            )
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
@@ -88,6 +93,8 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
         }
 
         binding.commonButton.btnProceed.setOnClickListener {
+            sendDataToRN("", "cgm_connect_sensor_proceed_clicked")
+
             if (isForReconnect) {
                 startActivity(Intent(this, PlaceTransmitterActivity::class.java))
             } else {
@@ -117,7 +124,7 @@ class SensorConnectSuccessActivity : AppCompatActivity() {
                 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/StartCGMActivity.kt

@@ -27,6 +27,7 @@ import com.mytatvarnsdk.CgmTrackyLibModule.Companion.mReactContext
 import com.mytatvarnsdk.R
 import com.mytatvarnsdk.databinding.ActivityStartCgmactivityBinding
 import com.mytatvarnsdk.databinding.ExitDialogBottomsheetBinding
+import org.json.JSONObject
 
 
 class StartCGMActivity : AppCompatActivity() {
@@ -51,6 +52,8 @@ class StartCGMActivity : AppCompatActivity() {
     private fun init() {
         isForReconnect = intent.getBooleanExtra("IsForReconnect", false)
 
+        sendDataToRN("", "cgm_start_connection_landing")
+
         if (isForReconnect) {
             binding.commonButton.tvProceed.text = "Start Reconnection Journey"
         } else {
@@ -58,6 +61,8 @@ class StartCGMActivity : AppCompatActivity() {
         }
 
         binding.commonButton.btnProceed.setOnClickListener {
+            sendDataToRN("", "cgm_start_connection_journey_clicked")
+
             if (isForReconnect) {
                 val intent = if (areAllPermissionsGranted()) {
                     Intent(this, SearchTransmitterActivity::class.java).putExtra(
@@ -82,11 +87,14 @@ class StartCGMActivity : AppCompatActivity() {
         }
 
         binding.toolbar.btnWhatsapp.setOnClickListener {
-            startActivity(Intent(this, HelpActivity::class.java))
+            startActivity(
+                Intent(this, HelpActivity::class.java)
+                    .putExtra("ScreenName", "Start CGM Screen")
+            )
         }
 
         binding.toolbar.btnWatchDemo.setOnClickListener {
-            sendDataToRN("","cgm_watch_demo_clicked")
+            sendDataToRN("", "cgm_watch_demo_clicked")
             startActivity(
                 Intent(this, VideoActivity::class.java).putExtra("VideoId", "r5Zemc4R044")
             )
@@ -157,7 +165,7 @@ class StartCGMActivity : AppCompatActivity() {
                 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/package.json

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