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

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

@@ -2,6 +2,8 @@ package com.mytatvarnsdk
 
 import android.app.Application
 import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothManager
+import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
@@ -52,10 +54,13 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.json.JSONObject
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
+import java.util.Timer
+import java.util.TimerTask
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
@@ -69,12 +74,15 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
     var prefsHelper: SharedPreferencesLibraryUtil
     private val apiScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
     private var debounceJob: Job? = null
+    private var isBatchProcessing = false
 
     private var lastDeviceStatus: String? = null
 
     private var glucoseObserver: Observer<PocGlucose?>? = null
     private var isObserving = false
 
+    private var lastProcessedSyncTimeInMillis: Long? = null
+
     init {
         mReactContext = reactContext
         prefsHelper = SharedPreferencesLibraryUtil(mReactContext)
@@ -107,8 +115,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             Handler(Looper.getMainLooper()).post {
                 mModel.device.observeForever { device ->
                     if (device != null) {
-                        postEventDataToAPI(device, "", device?.qrMessage ?: "")
-
+                        postEventDataToAPI(device, "", device.qrMessage ?: "")
                         Log.d("observeDeviceStatus: ", device.toString())
                     }
                 }
@@ -119,7 +126,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun observeTransmitterUnbindStatus(token: String, apiResponse: String) {
+    fun observeTransmitterUnbindStatus(token: String, apiResponse: String?) {
         try {
             if (apiResponse != null && apiResponse.isNotEmpty()) {
                 userToken = token
@@ -189,19 +196,13 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                     val endDate = sensor.endDate
                     val sensorId = sensor.sensorId
 
-                    println("Start Date: $startDate")
-                    println("End Date: $endDate")
-
                     if (isCurrentDateInRange(startDate, endDate)) {
-
                         println("Current date is in range")
 
                         val pocDevice =
                             RepositoryDevice.getInstance(BApplication.getContext()).latestDeviceIoThread
 
                         if (pocDevice != null) {
-                            Log.d("pocDevice logsss", pocDevice.toString())
-
                             if (pocDevice.isUnBind) {
                                 postEventDataToAPI(
                                     pocDevice,
@@ -210,8 +211,6 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                                 )
                             }
                         } else {
-                            Log.d("pocDevice logsss", "Data null")
-
                             postEventDataToAPI(
                                 pocDevice,
                                 DeviceStatus.TRANSMITTER_DISCONNECT.id,
@@ -231,65 +230,100 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
         }
     }
 
+    private var debounceDeviceTimer: Timer? = null
+    private var isDebounceTimerActive: Boolean = false
+
+
     private fun postEventDataToAPI(device: PocDevice?, mStatus: String, sensorId: String?) {
-        apiScope.launch {
+        debounceJob?.cancel()
+
+
+        debounceJob = apiScope.launch {
+            delay(500)
+
             try {
                 val bluetoothAdapter: BluetoothAdapter? = BluetoothAdapter.getDefaultAdapter()
                 val bleStatus = bluetoothAdapter?.isEnabled == true
-                var status = ""
 
-                status = if (mStatus.isEmpty()) {
+                val status: String = mStatus.ifEmpty {
                     when {
                         device?.isBoundAndConnect == true -> DeviceStatus.CONNECTED.id
                         !bleStatus -> DeviceStatus.BLUETOOTH_OFF.id
                         device?.isUnBind == true -> DeviceStatus.TRANSMITTER_DISCONNECT.id
                         device?.isBoundButDisConnect == true -> DeviceStatus.DISCONNECTED.id
-                        else -> "" // fallback if no status matches
+                        else -> ""
                     }
-                } else {
-                    mStatus
                 }
 
-                Log.d("postEventDataToAPI: ", "Device Event Status==> $status")
+                Log.d("Device event Status", "Device event Status: $status")
 
-                if (status.isNotEmpty()) {
-                    if (status != lastDeviceStatus) {
+                if (status == DeviceStatus.DISCONNECTED.id && !isDebounceTimerActive) {
+                    // Start debounce timer for 1 minutes
+                    debounceDeviceTimer = Timer()
+                    isDebounceTimerActive = true
 
-                        lastDeviceStatus = status
-                        Log.d("postEventDataToAPI: ", "Device Event Status API==> $status")
+                    debounceDeviceTimer?.schedule(object : TimerTask() {
+                        override fun run() {
+                            isDebounceTimerActive = false
 
-                        val rawData = JSONObject().apply {
-                            put("transmitterName", device?.name ?: "")
-                            put("SensorId", sensorId ?: "")
-                            put("Sensor", sensorId ?: "")
-                            put("timeInMillis", Date().time)
+                            callEventAPI(device, status, sensorId)
                         }
 
-                        val obj = JSONObject().apply {
-                            put("sensorId", sensorId ?: "")
-                            put("status", status)
-                            put("rawData", rawData)
-                        }
+                    }, 1 * 60 * 1000) // 1 minutes in milliseconds
 
-                        authenticateSDKService.postDeviceData(
-                            environment = if ("uat".uppercase() == "PROD") TATVA_ENVIRONMENT.PROD else TATVA_ENVIRONMENT.STAGE,
-                            data = obj.toString(),
-                            token = userToken,
-                            loaderListener = object : LoaderListener {
-                                override fun onShowLoader() {}
-                                override fun onHideLoader() {}
-                            }
-                        )
+                    Log.d("Debounce", "Timer started for disconnection reminder")
+                } else {
+                    // Either device is not disconnected or timer already running
+                    debounceDeviceTimer?.cancel()
+                    debounceDeviceTimer = null
+                    isDebounceTimerActive = false
 
-                        resetDebounceTimer()
-                    }
+                    Log.d("Debounce", "Timer cancelled, event triggered immediately")
+
+                    callEventAPI(device, status, sensorId)
                 }
+
             } catch (e: Exception) {
                 e.printStackTrace()
             }
         }
     }
 
+    private fun callEventAPI(device: PocDevice?, status: String, sensorId: String?) {
+        Log.d("Device event Status", "Last Device event Status API: $lastDeviceStatus")
+
+        if (status.isNotEmpty() && status != lastDeviceStatus) {
+            lastDeviceStatus = status
+
+            Log.d("Device event Status", "Device event Status API: $status")
+
+            val rawData = JSONObject().apply {
+                put("transmitterName", device?.name ?: "")
+                put("SensorId", sensorId ?: "")
+                put("Sensor", sensorId ?: "")
+                put("timeInMillis", Date().time)
+            }
+
+            val obj = JSONObject().apply {
+                put("sensorId", sensorId ?: "")
+                put("status", status)
+                put("rawData", rawData)
+            }
+
+            authenticateSDKService.postDeviceData(
+                environment = if ("uat".uppercase() == "PROD") TATVA_ENVIRONMENT.PROD else TATVA_ENVIRONMENT.STAGE,
+                data = obj.toString(),
+                token = userToken,
+                loaderListener = object : LoaderListener {
+                    override fun onShowLoader() {}
+                    override fun onHideLoader() {}
+                }
+            )
+
+            resetDebounceTimer()
+        }
+    }
+
     private fun resetDebounceTimer() {
         debounceJob?.cancel() // Cancel any existing timer
         debounceJob = apiScope.launch {
@@ -360,6 +394,10 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                 )
                 return
             }
+        if (isBatchProcessing) {
+            Log.d("observeAllGlucoseData", "Batch processing in progress, skipping duplicate call")
+            return
+        }
 
             // Remove existing observer if any to prevent memory leaks
             stopObservingGlucoseData()
@@ -368,13 +406,42 @@ 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()
+
+                    val lastSyncData = prefsHelper.lastSyncData
+                    val currentSyncTimeInMillis = lastSyncData?.timeInMillis
+
+                    if (lastSyncData != null) {
+                        dataAge = currentTime - lastSyncData.timeInMillis
+                    }
+                   
+                    // Only proceed if timeInMillis is different from last processed
+                    if (currentSyncTimeInMillis != null && lastProcessedSyncTimeInMillis != null && currentSyncTimeInMillis == lastProcessedSyncTimeInMillis) {
+                        Log.d("SyncTimeCheck", "Duplicate sync time, skipping function calls")
+                        return@Observer
+                    }
+
+
+                    if ((pocGlucose != null && lastSyncData == null) || (pocGlucose != null && lastSyncData != null && dataAge <= 4 * 60 * 1000L)) {
                         handleGlucoseData(pocGlucose)
+                        Log.d(
+                            "observeGlucoseData",
+                            "Received glucose data - processing"
+                        )
+                        // Update last processed sync time
+                        lastProcessedSyncTimeInMillis = currentSyncTimeInMillis
                     } else {
-                        Log.w(
+
+                           Handler(Looper.getMainLooper()).postDelayed({
+                                observeAllGlucoseData(userToken)
+                            }, 100)
+                        Log.d(
                             "observeGlucoseData",
                             "Received null glucose data - skipping processing"
                         )
+                        // Update last processed sync time
+                        lastProcessedSyncTimeInMillis = currentSyncTimeInMillis
                     }
                 }
 
@@ -503,6 +570,11 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun observeAllGlucoseData(token: String) {
+        Log.d("function call", "observeAllGlucoseData")
+        if (isBatchProcessing) {
+            Log.d("observeAllGlucoseData", "Batch processing in progress, skipping duplicate call")
+            return
+        }
         userToken = token
 
         // FIX: Ensure proper cleanup and reset state
@@ -513,10 +585,24 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             try {
                 val lastSyncData = prefsHelper.lastSyncData
                 Log.d("lastSyncData: ", Gson().toJson(lastSyncData).toString())
+                val currentTime = System.currentTimeMillis()
+                var dataAge = System.currentTimeMillis()
 
-                if (lastSyncData != null) {
+                if (prefsHelper.lastSyncData != null) {
+                    dataAge = currentTime - prefsHelper.lastSyncData.timeInMillis
+                }
+
+                if (lastSyncData != null && dataAge > 3 * 60 * 1000L) {
+                     isBatchProcessing = true
                     CoroutineScope(Dispatchers.IO).launch {
-                        val glucoseData = mModel.getGlucoseBetweenTime(lastSyncData.lastSyncTime)
+                       
+                        val glucoseData = mModel.getGlucoseBetweenTime(lastSyncData.timeInMillis)
+
+                       
+                        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 {
@@ -524,16 +610,18 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                                 "observeAllGlucoseData",
                                 "No historical data found, starting live observation"
                             )
-                            Handler(Looper.getMainLooper()).post {
+
+                            withContext(Dispatchers.Main) {
                                 observeGlucoseData(userToken)
                             }
                         }
                     }
                 } else {
+                    isBatchProcessing = false
                     observeGlucoseData(userToken)
                 }
             } catch (e: Exception) {
-                Log.e("observeAllGlucoseData", "observeAllGlucoseData Error: ${e.message}")
+                isBatchProcessing = false
                 observeGlucoseData(userToken)
             }
         }, 100) // Small delay to ensure cleanup
@@ -556,7 +644,8 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             }
 
             // Ensure we're on main thread and not already observing
-            Handler(Looper.getMainLooper()).post {
+            isBatchProcessing = false
+            withContext(Dispatchers.Main) {
                 if (!isObserving) {
                     Log.d(
                         "processBatchDataAndStartObserver",
@@ -574,7 +663,8 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
         } catch (e: Exception) {
             Log.e("processBatchDataAndStartObserver", "Error in batch processing: ${e.message}")
             // Start live observation even on error
-            Handler(Looper.getMainLooper()).post {
+            isBatchProcessing = false
+        withContext(Dispatchers.Main) {
                 if (!isObserving) {
                     observeGlucoseData(userToken)
                 }
@@ -603,6 +693,9 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             // Clear any cached data if needed
             prefsHelper.clearQRInformation() // if you have such method
 
+            // Reset last processed sync time
+            lastProcessedSyncTimeInMillis = null
+
         } catch (e: Exception) {
             Log.e("resetCgmState", "Error resetting CGM state: ${e.message}")
         }
@@ -744,6 +837,9 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             // Reset last device status
             lastDeviceStatus = null
 
+            // Reset last processed sync time
+            lastProcessedSyncTimeInMillis = null
+
         } catch (e: Exception) {
             Log.e("stopObservingGlucoseData", "Error stopping observer: ${e.message}")
         }
@@ -778,12 +874,13 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
         lastRecord?.let {
             try {
                 val syncData = SyncMeta(
-                    Date().time,
+                    System.currentTimeMillis(),
                     it.timeInMillis,
                     it.deviceId,
                     it.glucoseId
                 )
                 prefsHelper.lastSyncData = syncData
+                lastProcessedSyncTimeInMillis = null
                 Log.d(
                     "Sync Metadata",
                     "Sync metadata updated: glucoseId=${it.glucoseId}, time=${it.timeInMillis}"
@@ -875,6 +972,4 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
         }
     }
 
-
-}
-
+}

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

@@ -272,8 +272,8 @@ class SearchTransmitterActivity : BaseBleActivity() {
         binding.tvTransName.text = "Sno: ${transmitterDeviceInfo!!.pocDevice.name}"
         val formatter = SimpleDateFormat("hh:mm a", Locale.getDefault())
         binding.tvDateTime.text = "Connected on ${formatter.format(Date()).uppercase()}"
-        binding.clSuccess.visibility = View.VISIBLE
         binding.clMain.visibility = View.GONE
+        binding.clSuccess.visibility = View.VISIBLE
         binding.commonButton.btnProceed.isEnabled = true
         binding.commonButton.btnProceed.alpha = 1.0f
         binding.view2.background = ContextCompat.getDrawable(this, R.drawable.bg_green_progress)

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

@@ -46,6 +46,9 @@ class VideoActivity : AppCompatActivity() {
             .build()
         binding.youtubePlayerView.enableAutomaticInitialization = false
 
+        binding.ivClose.setOnClickListener {
+            handleBackPressedManually()
+        }
 
         binding.youtubePlayerView.addFullscreenListener(object : FullscreenListener {
             override fun onEnterFullscreen(fullscreenView: View, exitFullscreen: () -> Unit) {
@@ -83,12 +86,15 @@ class VideoActivity : AppCompatActivity() {
 
     private val onBackPressedCallback = object : OnBackPressedCallback(true) {
         override fun handleOnBackPressed() {
-            if (isFullscreen) {
-                // if the player is in fullscreen, exit fullscreen
-                youTubePlayer.toggleFullscreen()
-            } else {
-                finish()
-            }
+            handleBackPressedManually()
+        }
+    }
+
+    private fun handleBackPressedManually() {
+        if (isFullscreen) {
+            youTubePlayer.toggleFullscreen()
+        } else {
+            finish()
         }
     }
 }

package/android/src/main/java/com/mytatvarnsdk/model/BaseViewModel.java

@@ -99,7 +99,7 @@ public class BaseViewModel extends AndroidViewModel {
   }
 
   public List<PocGlucose> getGlucoseBetweenTime(long startTime) {
-    return mRepositoryGlucose.getGlucoseByTimeMillis(startTime, new Date().getTime());
+    return mRepositoryGlucose.getGlucoseByTimeMillis(startTime, System.currentTimeMillis());
   }
 
   public PocDevice getDeviceInfo(int deviceId) {

package/android/src/main/res/layout/activity_video.xml

@@ -8,6 +8,15 @@
     android:background="#E6000000"
     tools:context=".activity.VideoActivity">
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/ivClose"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:padding="7dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_close_gray" />
+
     <com.pierfrancescosoffritti.androidyoutubeplayer.core.player.views.YouTubePlayerView
         android:id="@+id/youtube_player_view"
         android:layout_width="match_parent"
@@ -23,10 +32,12 @@
         android:id="@+id/full_screen_view_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
+
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

package/ios/MyReactNativeBridge.m

@@ -20,7 +20,7 @@ RCT_EXPORT_MODULE();
 
 // Define the supported events
 - (NSArray<NSString *> *)supportedEvents {
-    return @[@"cgmDeviceEvent"]; // Event names to listen to in JS
+    return @[@"cgmDeviceEvent", @"cgmwatchdemoclicked", @"cgmWAsupportclicked"]; // Event names to listen to in JS
 }
 
 // Example method to emit an event from native to JS
@@ -39,7 +39,7 @@ RCT_EXPORT_MODULE();
 // This method returns the list of events the module supports
 - (NSArray<NSString *> *)supportedEvents
 {
-    return @[@"cgmDeviceEvent"];
+    return @[@"cgmDeviceEvent", @"cgmwatchdemoclicked", @"cgmWAsupportclicked"];
 }
 
 // Start listening for notifications
@@ -51,6 +51,17 @@ RCT_EXPORT_MODULE();
                                                  selector:@selector(handleNotification:)
                                                      name:@"cgmDeviceEvent"
                                                    object:nil];
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                      selector:@selector(handleNotification:)
+                                                          name:@"cgmwatchdemoclicked"
+                                                        object:nil];
+        
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                      selector:@selector(handleNotification:)
+                                                          name:@"cgmWAsupportclicked"
+                                                        object:nil];
     }
     return self;
 }
@@ -64,6 +75,9 @@ RCT_EXPORT_MODULE();
     
     // Send the data to React Native via event emitter
     [self sendEventWithName:@"cgmDeviceEvent" body:@{@"status": @"WARM_PERIOD_STARTED"}];
+    [self sendEventWithName:@"cgmwatchdemoclicked" body:@{@"status": @"cgm_watch_demo_clicked"}];
+    [self sendEventWithName:@"cgmWAsupportclicked" body:@{@"status": @"cgm_WA_support_clicked"}];
+    
 }
 
 // Private helper
@@ -259,68 +273,59 @@ RCT_EXPORT_METHOD(observeAllGlucoseData:(NSString *)token)
     });
 }
 
-// Internal method — can be kept private using a class extension
-- (void)observeTransmitterUnbindStatus:(NSString *)token
-                                       response:(NSDictionary *)responseDict
-                                     completion:(void (^)(NSDictionary *response, NSError *error))completion
+//--------------OLD FUNCTION-----------------
+//RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token)
+//{
+//    NSLog(@"Received token: %@", token);
+//    [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
+//    [[NSUserDefaults standardUserDefaults] synchronize];
+//    FinalViewModelManager *manager = [FinalViewModelManager shared];
+//    [manager callForObserveTransmitterUnbindStatus];
+//}
+
+
+
+RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token
+                  response:(NSString *)responseJsonString
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
+    if (responseJsonString == nil || ![responseJsonString isKindOfClass:[NSString class]]) {
+        NSError *error = [NSError errorWithDomain:@"CgmTrackyLib"
+                                             code:1001
+                                         userInfo:@{NSLocalizedDescriptionKey: @"Invalid or nil JSON string passed from JS"}];
+        reject(@"invalid_params", @"Response JSON string is nil or invalid", error);
+        return;
+    }
+
+    // Parse JSON string to NSDictionary
+    NSData *data = [responseJsonString dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *parseError = nil;
+    NSDictionary *responseDict = [NSJSONSerialization JSONObjectWithData:data options:0 error:&parseError];
+
+    if (parseError || ![responseDict isKindOfClass:[NSDictionary class]]) {
+        reject(@"json_parse_error", @"Failed to parse JSON string to dictionary", parseError);
+        return;
+    }
+
     // Save token
     [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
 
-    // Save CGM status item to UserDefaults (if needed by Swift)
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:responseDict options:0 error:nil];
-    if (jsonData) {
-        [[NSUserDefaults standardUserDefaults] setObject:jsonData forKey:@"CGMStatusItem"];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-    }
+    // Save response data
+    [[NSUserDefaults standardUserDefaults] setObject:data forKey:@"CGMStatusItem"];
+    [[NSUserDefaults standardUserDefaults] synchronize];
 
-    // Call Swift method which reads CGMStatusItem from UserDefaults
+    // Call manager logic
     FinalViewModelManager *manager = [FinalViewModelManager shared];
     [manager callForObserveTransmitterUnbindStatusWithCompletion:^(NSDictionary *response, NSError *error) {
-        if (completion) {
-            completion(response, error);
+        if (error) {
+            reject([NSString stringWithFormat:@"%ld", (long)error.code], error.localizedDescription, error);
+        } else {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                resolve(response ?: @{});
+            });
         }
     }];
 }
 
-//RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token response:(NSString *)responseJsonString)
-//{
-//    // Optional: Parse the JSON string if needed
-//    NSData *jsonData = [responseJsonString dataUsingEncoding:NSUTF8StringEncoding];
-//    NSError *jsonError;
-//    NSDictionary *responseDict = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&jsonError];
-//
-//    if (jsonError) {
-//        NSLog(@"Failed to parse JSON: %@", jsonError.localizedDescription);
-//        [self sendEventWithName:@"observeTransmitterUnbindStatusHandler" body:@{
-//            @"token": token ?: @"",
-//            @"success": @NO,
-//            @"error": @"Invalid JSON response from JS"
-//        }];
-//        return;
-//    }
-//
-//    // Now you have responseDict, you can use it
-//    [self observeTransmitterUnbindStatusInternal:token response:responseDict completion:^(NSDictionary *response, NSError *error) {
-//        if (error) {
-//            NSDictionary *errorPayload = @{
-//                @"token": token ?: @"",
-//                @"success": @NO,
-//                @"error": error.localizedDescription ?: @"Unknown error"
-//            };
-//            [self sendEventWithName:@"observeTransmitterUnbindStatusHandler" body:errorPayload];
-//        } else {
-//            NSDictionary *successPayload = @{
-//                @"token": token ?: @"",
-//                @"responseFromBackend": response ?: @{},
-//                @"responseFromJS": responseDict ?: @{},
-//                @"success": @YES
-//            };
-//            [self sendEventWithName:@"observeTransmitterUnbindStatusHandler" body:successPayload];
-//        }
-//    }];
-//
-//}
-
 @end

package/ios/Support/API.swift

@@ -188,7 +188,7 @@ class API {
         // Set request body
         let json: [String: Any] = [
             "sensorId": sensorId,
-            "sensorName": sensorId,
+           // "sensorName": sensorId,
             "status": status.rawValue,
             "rawData": [
                 "transmitterName": transmitterName,

package/ios/ViewControllers/AttachTransmitterViewController.swift

@@ -72,6 +72,7 @@ class AttachTransmitterViewController: UIViewController {
         }
 
         customTopView.onDemoTapped = {
+            NotificationCenter.default.post(name: Notification.Name("cgmwatchdemoclicked"), object: nil, userInfo: ["a":"a"])
             let webVC = WebViewController()
             webVC.modalPresentationStyle = .formSheet
             webVC.videoURL = URL(string: watchCGMVideo)

package/ios/ViewControllers/ChatWithExpertViewController.swift

@@ -27,6 +27,7 @@ class ChatWithExpertViewController: UIViewController {
         super.viewDidLoad()
         // Do any additional setup after loading the view.
         setupLayout()
+        
     }
     
     func setupLayout() {
@@ -43,6 +44,9 @@ class ChatWithExpertViewController: UIViewController {
         buttonBack.titleLabel?.font = FontManager.font(ofSize: 16, weight: .medium)
         bottomButton.labelText = "Proceed"
         bottomButton.showLeftWhatsappImage()
+        
+        NotificationCenter.default.post(name: Notification.Name("cgmWAsupportclicked"), object: nil, userInfo: ["a":"a"])
+        
         bottomButton.buttonTapCallback = {
         
             if let url = URL(string: "https://wa.aisensy.com/aaa1qv") {

package/ios/ViewControllers/ConnectToSensorViewController.swift

@@ -99,6 +99,7 @@ class ConnectToSensorViewController: UIViewController {
         }
         
         customTopView.onDemoTapped = {
+            NotificationCenter.default.post(name: Notification.Name("cgmwatchdemoclicked"), object: nil, userInfo: ["a":"a"])
             let webVC = WebViewController()
             webVC.modalPresentationStyle = .formSheet
             webVC.videoURL = URL(string: watchCGMVideo)

package/ios/ViewControllers/ConnectToTransmitterViewController.swift

@@ -96,12 +96,21 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
         }
         bottomButton.buttonTapCallback = {
             if self.isForReconnect {
-                let vc = ConnectToSensorViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
-                vc.connected = {
-                    //self.showConfirmInsulinUser()
+                if  self.bottomButton.labelText == "Retry" {
+                    self.manager?.bluetoothDelegate = self
+                    self.manager?.startScan()
+                    self.screenType = .searching
+                    self.tableView.reloadData()
+                    self.bottomButton.hideRightArrow()
+                } else {
+                    let vc = ConnectToSensorViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
+                    vc.connected = {
+                        //self.showConfirmInsulinUser()
+                    }
+                    vc.isFromReconnect = true
+                    self.navigationController?.pushViewController(vc, animated: false)
                 }
-                vc.isFromReconnect = true
-                self.navigationController?.pushViewController(vc, animated: false)
+               
 //                NotificationCenter.default.post(name: Notification.Name("cgmDeviceEvent"), object: nil, userInfo: ["a":"a"])
 //                if let rootVC = UIApplication.shared.connectedScenes
 //                    .compactMap({ ($0 as? UIWindowScene)?.windows.first?.rootViewController })
@@ -112,6 +121,8 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
 //                }
             } else {
                 if self.screenType == .error {
+                    self.manager?.bluetoothDelegate = self
+                    self.manager?.startScan()
                     self.bottomButton.disable()
                     self.screenType = .searching
                     self.tableView.reloadData()
@@ -126,6 +137,7 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
         }
 
         customTopView.onDemoTapped = {
+            NotificationCenter.default.post(name: Notification.Name("cgmwatchdemoclicked"), object: nil, userInfo: ["a":"a"])
             let webVC = WebViewController()
             webVC.modalPresentationStyle = .formSheet
             webVC.videoURL = URL(string: watchCGMVideo)
@@ -297,6 +309,7 @@ extension ConnectToTransmitterViewController: UITableViewDelegate, UITableViewDa
             
             //cell.labelDesc.text = "Sno:\(devices[indexPath.row].name)"
             cell.button.buttonTapCallback = {
+                
                 if self.isForReconnect {
                     self.sensorForceEnd()
                 }
@@ -304,7 +317,7 @@ extension ConnectToTransmitterViewController: UITableViewDelegate, UITableViewDa
                 if !KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
                     return
                 }
-
+                
                 self.manager?.stopScan()
                 if self.foundDevices.count > indexPath.row {
                     let peripheral = self.foundDevices[indexPath.row] as! CBPeripheral

package/ios/ViewControllers/ProvidePermissionViewController.swift

@@ -45,11 +45,14 @@ class ProvidePermissionViewController: UIViewController {
         
         bottomButton.labelText = "Proceed"
         bottomButton.buttonTapCallback = {
+            let isForReconnect = UserDefaults.standard.bool(forKey: "isForReconnect")
             let vc = ConnectToTransmitterViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
+            vc.isForReconnect = isForReconnect
             self.navigationController?.pushViewController(vc, animated: false)
         }
         
         customTopView.onDemoTapped = {
+            NotificationCenter.default.post(name: Notification.Name("cgmwatchdemoclicked"), object: nil, userInfo: ["a":"a"])
             let webVC = WebViewController()
             webVC.modalPresentationStyle = .formSheet
             webVC.videoURL = URL(string: watchCGMVideo)

package/ios/ViewControllers/PutOnTheSensorViewController.swift

@@ -42,6 +42,7 @@ class PutOnTheSensorViewController: UIViewController {
         }
 
         customTopView.onDemoTapped = {
+            NotificationCenter.default.post(name: Notification.Name("cgmwatchdemoclicked"), object: nil, userInfo: ["a":"a"])
             let webVC = WebViewController()
             webVC.modalPresentationStyle = .formSheet
             webVC.videoURL = URL(string: watchCGMVideo)

package/ios/ViewControllers/StartConnectionViewController.swift

@@ -51,8 +51,7 @@ class StartConnectionViewController: UIViewController {
                                 ImageTVC.self,
                                 ChargingIndicatorTVC.self])
         tableView.reloadData()
-       // UserDefaults.standard.set(isLocationEnabled, forKey: "isForReconnect")
-
+     
         let isForReconnect = UserDefaults.standard.bool(forKey: "isForReconnect")
         if isForReconnect{
             checkLocationPermission()
@@ -74,6 +73,7 @@ class StartConnectionViewController: UIViewController {
         }
 
         customTopView.onDemoTapped = {
+            NotificationCenter.default.post(name: Notification.Name("cgmwatchdemoclicked"), object: nil, userInfo: ["a":"a"])
             let webVC = WebViewController()
             webVC.modalPresentationStyle = .formSheet // or .pageSheet, .fullScreen
             webVC.videoURL = URL(string: watchCGMVideo)
@@ -95,7 +95,9 @@ class StartConnectionViewController: UIViewController {
     
     private func updateBottomButtonState() {
         if isBluetoothEnabled && isLocationEnabled {
+            let isForReconnect = UserDefaults.standard.bool(forKey: "isForReconnect")
             let vc = ConnectToTransmitterViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
+            vc.isForReconnect = isForReconnect
             self.navigationController?.pushViewController(vc, animated: false)
         } else {
             let vc = ProvidePermissionViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)

package/ios/ViewModel/FinalViewModel.swift

@@ -105,29 +105,25 @@ import Foundation
         startDate: String,
         endDate: String
     ) -> [String: Any] {
-        let updatedResponse = response
+        var updatedResponse = response
 
         if viewModel.isCurrentDateInRange(startDate: startDate, endDate: endDate) {
             print("Current date is in range")
-            if ((viewModel.manager.connectedPeripheral == nil) && !KLTLocalSettingManager.shareInstance().canConnectOtherDevice) {
+
+            let canConnectOther = KLTLocalSettingManager.shareInstance().canConnectOtherDevice
+            let connectedPeripheral = viewModel.manager.connectedPeripheral
+
+            if connectedPeripheral == nil && !canConnectOther {
                 viewModel.manager.startScan()
                 viewModel.debouncer.update(with: .transmitterDisconnect)
-            }  else {
-                print("here")
-                //debouncer.update(with: .connected)
-                //API.shared.sendStatus(status: .connected) 计算 算法入参
-                if let last = viewModel.manager.currentDevice {
-                    
-                }
-                else {
-                    
-                    //self.manager.closeBleSensor()
-                    //manager.startScan()
-                    //self.debouncer.update(with: .disconnected)
-                    //debouncer.update(with: .transmitterDisconnectBox)
-                }
-                
-                if KLTBluetoothManager.shared().currentDevice.connectedDateTime == nil  && KLTBluetoothManager.shared().currentDevice.disconnectedDateTime == nil {
+            } else {
+                if let device = KLTBluetoothManager.shared().currentDevice {
+                    if device.connectedDateTime == nil && device.disconnectedDateTime == nil {
+                        viewModel.manager.startScan()
+                        viewModel.debouncer.update(with: .transmitterDisconnect)
+                    }
+                } else {
+                    print("⚠️ currentDevice is nil")
                     viewModel.manager.startScan()
                     viewModel.debouncer.update(with: .transmitterDisconnect)
                 }
@@ -136,9 +132,6 @@ import Foundation
 
         return updatedResponse
     }
-    
-  
-
 }
 
 class FinalViewModel: NSObject {
@@ -335,7 +328,7 @@ class FinalViewModel: NSObject {
         let batches = stride(from: 0, to: data.count, by: batchSize).map {
             Array(data[$0..<min($0 + batchSize, data.count)])
         }
-
+        
         uploadBatch(batches: batches, index: 0)
     }
 

package/package.json

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