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

package/ios/ViewModel/FinalViewModel.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+
 @objc public class FinalViewModelManager: NSObject {
     @objc public static let shared = FinalViewModelManager()
     @objc let viewModel = FinalViewModel()
@@ -86,7 +87,7 @@ import Foundation
             completion(nil, error)
             return
         }
-
+        UserDefaults.standard.set(sensorId, forKey: "sensorId")
         let baseResponse: [String: Any] = [
             "sensorId": sensorId,
             "startDate": startDate,
@@ -105,7 +106,7 @@ import Foundation
         startDate: String,
         endDate: String
     ) -> [String: Any] {
-        var updatedResponse = response
+        let updatedResponse = response
 
         if viewModel.isCurrentDateInRange(startDate: startDate, endDate: endDate) {
             print("Current date is in range")
@@ -137,19 +138,24 @@ import Foundation
 class FinalViewModel: NSObject {
     var initialPeriod = 0
     var totalSeconds : TimeInterval = 60 * 60
-    
     let manager: KLTBluetoothManager!
-    
     var countdownTimer: Timer?
     var startScanTimer: Timer?
-    
     let debouncer = EnumDebouncer<CGMConnectionStatus>()
-
+    
+    var lastBluetoothStatus: BluetoothManagerStatus = .disconnected
+    var delayedDisconnectTimer: Timer?
+    
+    
     @objc public override init() {
         self.manager = KLTBluetoothManager.shared()
         super.init()
         debouncer.onDebounceSuccess = { value in
+            print("Blutooth is------------------->>>>>>>>>> \(value)")
             API.shared.sendStatus(status: value)
+//            if value == .errorCommon {
+//                self.manager.startScan()
+//            }
             print("Same type held for an hour!")
         }
      }
@@ -157,8 +163,9 @@ class FinalViewModel: NSObject {
     @objc public func initialize() {
         //getStatus()
         startCountDown()
-    
+        
         if ((manager.connectedPeripheral == nil) && !KLTLocalSettingManager.shareInstance().canConnectOtherDevice) {
+            
             manager.startScan()
             debouncer.update(with: .disconnected)
         }  else {
@@ -169,7 +176,7 @@ class FinalViewModel: NSObject {
             else {
                 //self.manager.closeBleSensor()
                 //manager.startScan()
-                debouncer.update(with: .disconnected)
+                //  debouncer.update(with: .disconnected)
                 //debouncer.update(with: .transmitterDisconnectBox)
             }
         }
@@ -334,6 +341,7 @@ class FinalViewModel: NSObject {
 
     private func uploadBatch(batches: [[ReceiveData]], index: Int) {
         guard index < batches.count else {
+            print("====================================> All batches uploaded")
             print("✅ All batches uploaded")
             return
         }
@@ -342,7 +350,9 @@ class FinalViewModel: NSObject {
         let cgmLogs = batch.map { ReceiveDataToLog(data: $0) }
         let payload = Payload(logs: cgmLogs)
 
+        print("====================================> called uploadBatch")
         API.shared.postCGMData(environment: .stage, data: payload) {
+            print("====================================> uploaded successfully")
             print("✅ Batch \(index + 1) uploaded successfully")
             KLTDatabaseHandler.shared().deleteReceiveDataArray(batch)
             self.uploadBatch(batches: batches, index: index + 1)
@@ -360,7 +370,7 @@ class FinalViewModel: NSObject {
         if let device = KLTBluetoothManager.shared().currentDevice {
             let arrayFromInitial = KLTDatabaseHandler.shared().queryReceiveData(with: device, needUserBG: true) as! [ReceiveData]
             print(arrayFromInitial)
-            print("===> arrayFromInitial count: ", arrayFromInitial.count)
+            print("======================> arrayFromInitial count: ", arrayFromInitial.count)
             self.uploadData(data: arrayFromInitial)
         }
     }
@@ -453,12 +463,11 @@ class FinalViewModel: NSObject {
         //countDownValueLabel.text =
     }
     
-    override func observeValue(
-        forKeyPath keyPath: String?,
-        of object: Any?,
-        change: [NSKeyValueChangeKey : Any]?,
-        context: UnsafeMutableRawPointer?
-    ) {
+    override func observeValue(forKeyPath keyPath: String?,
+                               of object: Any?,
+                               change: [NSKeyValueChangeKey : Any]?,
+                               context: UnsafeMutableRawPointer?) {
+        
         guard keyPath == "status",
               let newValue = change?[.newKey] as? Int,
               let status = BluetoothManagerStatus(rawValue: newValue) else {
@@ -467,60 +476,156 @@ class FinalViewModel: NSObject {
         
         print("===>device status is -> \(status)")
         
+        // Cancel any pending delayed disconnect if state changes
+//        if status != .disconnected, delayedDisconnectTimer != nil {
+//            delayedDisconnectTimer?.invalidate()
+//            delayedDisconnectTimer = nil
+//            print("===> Cancelled delayed disconnect due to state change to \(status)")
+//        }
+
         switch status {
             
         case .disconnected:
+            print("lastBluetoothStatus-------->> \(lastBluetoothStatus)")
+            if lastBluetoothStatus == .connected {
+                print("===> Previously connected, delaying disconnect for 1 minute")
+                self.lastBluetoothStatus = .disconnected
+                delayedDisconnectTimer = Timer.scheduledTimer(withTimeInterval: 60.0, repeats: false) { [weak self] _ in
+                    guard let self = self else { return }
+                    print("lastBluetoothStatus-------->> \(lastBluetoothStatus)")
+                    if self.lastBluetoothStatus == .disconnected {
+                        self.debouncer.update(with: CGMConnectionStatus.disconnected)
+                        print("===> 1 minute passed, confirmed disconnected")
+                    } else {
+                        print("===> Status changed in between, ignoring disconnect")
+                    }
+                    self.delayedDisconnectTimer?.invalidate()
+                    self.delayedDisconnectTimer = nil
+                }
+            } else {
+                print("===> Not previously connected, immediate disconnect")
+                lastBluetoothStatus = .disconnected
+                delayedDisconnectTimer?.invalidate()
+                delayedDisconnectTimer = nil
+                debouncer.update(with: CGMConnectionStatus.disconnected)
+            }
+            
             if KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
-                // Unbind then disconnect
                 endBleSensorCycle()
-            } else {
-                if UserDefaults.standard.integer(forKey: "bgmode") != 1 {
-                    manager.startScan()
-                }
+            } else if UserDefaults.standard.integer(forKey: "bgmode") != 1 {
+                manager.startScan()
             }
-            //API.shared.sendStatus(status: .disconnected)
-            print("===>device is disconnected")
-            debouncer.update(with: CGMConnectionStatus.disconnected)
-        case .tryToConnect:
-            //            if UserDefaults.standard.integer(forKey: "bgmode") != 1 {
-            //                DispatchQueue.main.asyncAfter(deadline: .now() + 20) {
-            //                    self.manager.startScan()
-            //                }
-            //            }
-            break
+
         case .connected:
+            lastBluetoothStatus = .connected
             if let timer = startScanTimer {
                 timer.invalidate()
                 startScanTimer = nil
+                print("--------------------------- startScanTimer is nil")
             }
-            //API.shared.sendStatus(status: .connected)
-            print("===>device is connected")
+
             debouncer.update(with: CGMConnectionStatus.connected)
+
         case .timeOut:
-            //            if !KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
-            //                startScanTimer = Timer.scheduledTimer(timeInterval: 20,
-            //                                                      target: self,
-            //                                                      selector: #selector(startScan),
-            //                                                      userInfo: nil,
-            //                                                      repeats: false)
-            //            }
-            print("===>time out")
-            break
+            lastBluetoothStatus = .timeOut
+            if !KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
+                startScanTimer = Timer.scheduledTimer(timeInterval: 20,
+                                                      target: self,
+                                                      selector: #selector(startScan),
+                                                      userInfo: nil,
+                                                      repeats: false)
+            }
+
         case .sensorLostPower:
+            lastBluetoothStatus = .sensorLostPower
             sensorLostPower()
-            print("===>sensor lost power")
+            
         case .updateBindWatchSuccess:
-            //KLTLaunchConfiguration.sharedManager.bindSuccessRootViewController()
+            lastBluetoothStatus = .updateBindWatchSuccess
             startCountDown()
-            print("===>Success done")
+            
         case .closed:
-            debouncer.update(with: CGMConnectionStatus.transmitterDisconnectBox)
-            //API.shared.sendStatus(status: .transmitterDisconnectBox)
-            print("===>closed")
+            lastBluetoothStatus = .closed
+            debouncer.update(with: CGMConnectionStatus.transmitterDisconnect)
+            
         default:
             break
         }
+        
     }
+
+    
+//    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+//        guard keyPath == "status",
+//              let newValue = change?[.newKey] as? Int,
+//              let status = BluetoothManagerStatus(rawValue: newValue) else {
+//            return
+//        }
+//        
+//        print("===>device status is -> \(status)")
+//        
+//        switch status {
+//            
+//        case .disconnected:
+//            if KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
+//                // Unbind then disconnect
+//                endBleSensorCycle()
+//            } else {
+//                if UserDefaults.standard.integer(forKey: "bgmode") != 1 {
+//                    manager.startScan()
+//                }
+//            }
+//            //API.shared.sendStatus(status: .disconnected)
+//            print("===>device is disconnected")
+//            
+//            debouncer.update(with: CGMConnectionStatus.disconnected)
+//            
+//        case .tryToConnect:
+//            //            if UserDefaults.standard.integer(forKey: "bgmode") != 1 {
+//            //                DispatchQueue.main.asyncAfter(deadline: .now() + 20) {
+//            //                    self.manager.startScan()
+//            //                }
+//            //            }
+//            break
+//        case .connected:
+//            if let timer = startScanTimer {
+//                timer.invalidate()
+//                startScanTimer = nil
+//                print("--------------------------- startScanTimer is nil")
+//            }
+//            //API.shared.sendStatus(status: .connected)
+//            print("===>device is connected")
+//            debouncer.update(with: CGMConnectionStatus.connected)
+//        case .timeOut:
+//            if !KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
+//                startScanTimer = Timer.scheduledTimer(timeInterval: 20,
+//                                                      target: self,
+//                                                      selector: #selector(startScan),
+//                                                      userInfo: nil,
+//                                                      repeats: false)
+//            }
+//            print("===>time out")
+//            
+//        case .sensorLostPower:
+//            sensorLostPower()
+//            print("===>sensor lost power")
+//        case .updateBindWatchSuccess:
+//            //KLTLaunchConfiguration.sharedManager.bindSuccessRootViewController()
+//            startCountDown()
+//            print("===>Success done")
+//        case .closed:
+//            debouncer.update(with: CGMConnectionStatus.transmitterDisconnect)
+//            //API.shared.sendStatus(status: .transmitterDisconnectBox)
+//            print("===>closed")
+//        default:
+//            break
+//        }
+//    }
+    
+//    if ((self.manager.connectedPeripheral == nil) && !KLTLocalSettingManager.shareInstance().canConnectOtherDevice) {
+//        self.manager.startScan()
+//        self.debouncer.update(with: .disconnected)
+//    }
     
     func sensorLostPower() {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
@@ -530,7 +635,9 @@ class FinalViewModel: NSObject {
     }
 
     @objc func startScan() {
+        print("--------------------------- Scanning inprocess")
         manager.startScan()
+        //debouncer.update(with: .disconnected)
     }
 
     func endBleSensorCycle() {
@@ -549,7 +656,6 @@ class FinalViewModel: NSObject {
 
 struct KLTDateFormatter {
     static let shared = KLTDateFormatter()
-
     private let calendar = Calendar(identifier: .gregorian)
     private let locale = Locale(identifier: "en_GB")
 
@@ -612,6 +718,7 @@ struct KLTDateFormatter {
         return getWholeString(from: date)
     }
 }
+
 extension String {
     func klt_contains(_ other: String) -> Bool {
         return self.range(of: other) != nil

package/package.json

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