react-native-mytatva-rn-sdk 1.2.45 → 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/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/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.46",
   "description": "a package to inject data into visit health pwa",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",