react-native-mytatva-rn-sdk 1.2.21 → 1.2.23

package/ios/Database/KLTDatabaseHandler.m

@@ -267,7 +267,7 @@
     NSFetchRequest *request = [[NSFetchRequest alloc] init];
     NSPredicate *predicate;
     if (needUserBG) {
-        predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ && userBG > 0 && userBG != NIL AND isDelete == NIL",currentDevice.identifier, currentDevice.initialBeginDate];
+        predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ && gluADC > 0 && gluADC != NIL AND isDelete == NIL",currentDevice.identifier, currentDevice.initialBeginDate];
     } else {
         predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ AND isDelete == NIL",currentDevice.identifier, currentDevice.initialBeginDate];
     }
@@ -387,7 +387,7 @@
     data.TsCount = (int)index + 1;
     
     // 校准后的点
-    NSArray<ReceiveData*> *needUserBgs = [self queryReceiveDataWithDevice:currentDevice needUserBG:NO];
+    NSArray<ReceiveData*> *needUserBgs = [self queryReceiveDataWithDevice:currentDevice needUserBG:YES];
     NSUInteger numberOfUserBgs = needUserBgs.count;
     if (needUserBgs.count > 0) {
         bgToGlucoseIds = malloc(sizeof(int) * numberOfUserBgs);

package/ios/MyReactNativeBridge.m

@@ -117,8 +117,14 @@ RCT_EXPORT_METHOD(reconnectCgmTracky:(NSString *)token)
             [reconnectVC setValue:@(YES) forKey:@"isForReconnect"];
         }
         // Present it directly without navigation
+//        if (reconnectVC) {
+//            [rootVC presentViewController:reconnectVC animated:YES completion:nil];
+//        }
+        
+        UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:reconnectVC];
+        navController.modalPresentationStyle = UIModalPresentationOverFullScreen;
         if (reconnectVC) {
-            [rootVC presentViewController:reconnectVC animated:YES completion:nil];
+            [rootVC presentViewController:navController animated:YES completion:nil];
         }
     });
 }

package/ios/Support/API.swift

@@ -278,9 +278,10 @@ class API {
                         
                         if self.isCurrentDateInRange(startDate: startDateStr, endDate: endDateStr) {
                             print("Current date is in range")
-                            if KLTBluetoothManager.shared().currentDevice.initialEndDate != nil  {
-                                self.sendStatus(status: .transmitterDisconnect)
-                            }
+    
+                            //if KLTBluetoothManager.shared().currentDevice.initialEndDate != nil  {
+                                //self.sendStatus(status: .transmitterDisconnect)
+                           // }
                         }
                     }
                 }

package/ios/Support/BluetoothManager.swift

@@ -5,468 +5,3 @@
 //  Created by Nirav Ramani on 12/05/25.
 //
 
-import CoreBluetooth
-
-protocol BluetoothManagerDelegate: AnyObject {
-    func didDiscoverDevice(_ device: CBPeripheral)
-    func didConnectDevice(_ device: CBPeripheral)
-    func didFailToConnect(_ device: CBPeripheral, error: Error?)
-    func didDisconnectDevice(_ device: CBPeripheral, error: Error?)
-}
-
-class BluetoothManager: NSObject {
-
-    static let shared = BluetoothManager()
-
-    private(set) var centralManager: CBCentralManager!
-    private(set) var discoveredDevices: [(CBPeripheral,String)] = []
-    private(set) var peripherals: [CBPeripheral] = []
-    
-    private var connectedPeripheral: CBPeripheral?
-    private var connectedDeviceName: String = ""
-    
-    weak var delegate: BluetoothManagerDelegate?
-
-    var writeReadCharacteristic: CBCharacteristic?
-    var notifyCharacteristic: CBCharacteristic?
-    var eDevice: EDevice?
-    private override init() {
-        super.init()
-        centralManager = CBCentralManager(delegate: self, queue: nil)
-    }
-
-    func startScanning() {
-        discoveredDevices.removeAll()
-        centralManager.scanForPeripherals(withServices: nil, options: nil)
-        print("Started scanning for peripherals...")
-    }
-
-    func stopScanning() {
-        centralManager.stopScan()
-        print("Stopped scanning.")
-    }
-
-    func connect(to peripheral: CBPeripheral, name: String) {
-        centralManager.connect(peripheral, options: nil)
-        peripheral.delegate = self
-        connectedPeripheral = peripheral
-        connectedDeviceName = name
-    }
-
-    func disconnect() {
-        if let peripheral = connectedPeripheral {
-            centralManager.cancelPeripheralConnection(peripheral)
-        }
-    }
-    
-    func requestResendCT3() {
-        if let eDevice = eDevice,
-           let writeReadCharacteristic = writeReadCharacteristic {
-            if let value = ProtocalTools.check_request(eDevice) {
-                connectedPeripheral?.writeValue(value,
-                                                for: writeReadCharacteristic,
-                                                type: .withoutResponse)
-            }
-        }
-        /*guard let currentDevice = currentDevice else { return }
-
-        if KLTLocalSettingManager.shareInstance.canConnectOtherDevice {
-            if let eDevice = eDevice,
-               let writeReadCharacteristic = writeReadCharacteristic {
-                if let value = ProtocalTools.check_request(eDevice) {
-                    connectedPeripheral?.writeValue(value,
-                                                    for: writeReadCharacteristic,
-                                                    type: .withoutResponse)
-                }
-            }
-        } else {
-            let maxGlucoseId = KLTDatabaseHandler.shared()
-                .getLatestAndMaxGlucoseId(of: currentDevice)
-            pullGlucouseSeriesRequest(glucoseId: maxGlucoseId)
-        }*/
-    }
-
-}
-
-// MARK: - CBCentralManagerDelegate
-
-extension BluetoothManager: CBCentralManagerDelegate {
-    func centralManagerDidUpdateState(_ central: CBCentralManager) {
-        if central.state == .poweredOn {
-            startScanning()
-        } else {
-            print("Central Manager State: \(central.state.rawValue)")
-        }
-    }
-
-    func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral,
-                        advertisementData: [String : Any], rssi RSSI: NSNumber) {
-        print("Discovered: \(peripheral.name ?? "Unknown") - RSSI: \(RSSI)",advertisementData["kCBAdvDataLocalName"])
-        guard let name = advertisementData["kCBAdvDataLocalName"] as? String, name.hasPrefix("SN") else { return }
-        if !discoveredDevices.contains(where: { $0.0 == peripheral }) {
-            discoveredDevices.append((peripheral,name))
-            print("advertisementData-kCBAdvDataLocalName",advertisementData["kCBAdvDataLocalName"])
-            eDevice = EDevice.getEnumDevice(advertisementData["kCBAdvDataLocalName"] as? String ?? "")
-            
-            delegate?.didDiscoverDevice(peripheral)
-        }
-    }
-
-    func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeripheral) {
-        print("Connected to: \(peripheral.name ?? "Unknown")")
-        delegate?.didConnectDevice(peripheral)
-        peripheral.delegate = self
-        if let eDevice = eDevice {
-            peripheral.discoverServices([CBUUID(string: eDevice.eGattMessage.uuid_SERVICE)])
-        }
-    }
-
-    func centralManager(_ central: CBCentralManager, didFailToConnect peripheral: CBPeripheral, error: Error?) {
-        print("Failed to connect: \(error?.localizedDescription ?? "Unknown error")")
-        delegate?.didFailToConnect(peripheral, error: error)
-    }
-
-    func centralManager(_ central: CBCentralManager, didDisconnectPeripheral peripheral: CBPeripheral, error: Error?) {
-        print("Disconnected from: \(peripheral.name ?? "Unknown")")
-        delegate?.didDisconnectDevice(peripheral, error: error)
-    }
-}
-
-// MARK: - CBPeripheralDelegate
-
-extension BluetoothManager: CBPeripheralDelegate {
-    func peripheral(_ peripheral: CBPeripheral, didDiscoverServices error: Error?) {
-        if let error = error {
-            print("Service discovery failed: \(error.localizedDescription)")
-            return
-        }
-        guard let services = peripheral.services else { return }
-        for service in services {
-            print("Discovered service: \(service.uuid)")
-            peripheral.discoverCharacteristics(nil, for: service)
-        }
-    }
-
-    func peripheral(_ peripheral: CBPeripheral, didDiscoverCharacteristicsFor service: CBService, error: Error?) {
-        if let error = error {
-            print("Characteristic discovery failed: \(error.localizedDescription)")
-            return
-        }
-        service.characteristics?.forEach {
-            print("Discovered characteristic: \($0.uuid)")
-        }
-        guard let characteristics = service.characteristics else { return }
-
-        for characteristic in characteristics {
-            /*if characteristic.properties.contains(.notify) {
-                peripheral.setNotifyValue(true, for: characteristic)
-            }
-            
-            if characteristic.properties.contains(.read) {
-                peripheral.readValue(for: characteristic)
-            }*/
-            guard let eDevice = eDevice else { return }
-            if characteristic.uuid == CBUUID(string: eDevice.eGattMessage.uuid_WRITE) {
-                writeReadCharacteristic = characteristic
-                if eDevice.deviceType == "CT4" {
-                    // CT3 / CT4 handle first bind & reconnect logic
-                    requestResendCT3()
-                }
-            }
-
-            if characteristic.uuid == CBUUID(string: eDevice.eGattMessage.uuid_READ) {
-                notifyCharacteristic = characteristic
-                peripheral.setNotifyValue(true, for: characteristic)
-            }
-        }
-    }
-    
-    func peripheral(_ peripheral: CBPeripheral, didUpdateValueFor characteristic: CBCharacteristic, error: Error?) {
-        guard error == nil else { return }
-        //handleResendDataWithPrefix22(characteristic.value!)
-
-        guard let eDevice = eDevice else { return }
-        if characteristic.uuid == CBUUID(string: eDevice.eGattMessage.uuid_READ) {
-            guard let value = characteristic.value, !value.isEmpty else { return }
-            
-            let hex = KLTFormat.dataToHexString(value, isReverse: false)
-            let command = String(hex.prefix(2))
-            
-            switch command {
-            case "05":
-                // CT3/CT4 self-check protocol response (only checks voltage >= 3.9)
-                let ret: HW_CHECK_RET = ProtocalTools.check_response(value, andEDevice: eDevice)
-              
-                switch ret {
-                case .SUCCESS:
-                    //KLTDatabaseHandler.shared.updateDevice(currentDevice, initialBeginDate: nil, endDate: nil)
-                    if let writeReadCharacteristic = writeReadCharacteristic {
-                        if let data = ProtocalTools.setDate_request(eDevice) {
-                            peripheral.writeValue(data, for: writeReadCharacteristic, type: .withoutResponse)
-                        }
-                    }
-                case .FAIL_POWER:
-                    //NotificationCenter.default.post(name: Notification.Name(KLTAlertSelfCheckFailedNotify), object: ret.rawValue)
-                    resetBleSensorData()
-                    
-                case .FAIL:
-                    //status = .closed
-                    resetBleSensorData()
-                default:
-                    break
-                }
-
-            case "22":
-                // CT4 retransmitted data, response for pullGlucose_series_request
-                handleResendDataWithPrefix22(value)
-                
-            case "03":
-                 //CT4 set time protocol response
-                if ProtocalTools.setDate_response(value, andEDevice: eDevice) {
-                    if let writeReadCharacteristic = writeReadCharacteristic {
-                        if let data = ProtocalTools.start_init_request(eDevice) {
-                            connectedPeripheral?.writeValue(data, for: writeReadCharacteristic, type: .withoutResponse)
-                        }
-                    }
-                } else {
-                    //status = .closed
-                    resetBleSensorData()
-                }
-                break
-            case "06":
-                // Initialization protocol response
-//                if ProtocalTools.init_response(value, andEDevice: eDevice) {
-//                    KLTLocalSettingManager.shareInstance.canConnectOtherDevice = false
-//
-//                    let snLocalName = currentDevice.advertise.localName
-//                    let runLog = KLTAppDelegate.getCurrentKLTRunLog()
-//                    runLog.createNewCSV(snLocalName)
-//
-//                    status = .initialStart
-//                    isInResend = false
-//
-//                    let interval = Date().timeIntervalSinceReferenceDate + 180 * TimeInterval(eDevice.initNumber)
-//                    let newDate = Date(timeIntervalSinceReferenceDate: interval)
-//                    KLTDatabaseHandler.shared.updateDevice(currentDevice, initialBeginDate: Date().getWholeString(), endDate: newDate.getWholeString())
-//
-//                    dataType = .receiveDataBeforeSetUserReference
-//
-//                    let lowPowerData = ProtocalTools.lowPower_request(eDevice)
-//                    connectedPeripheral?.writeValue(lowPowerData, for: writeReadCharacteristic, type: .withoutResponse)
-//
-//                    let recordId = "\(snLocalName)_\(Int(Date().timeIntervalSince1970))"
-//                    UserDefaults.standard.set(recordId, forKey: "wearingRecordId")
-//                    UserDefaults.standard.synchronize()
-//                } else {
-//                    status = .closed
-//                    resetBleSensorData()
-//                }
-                break
-            case "07":
-                // Data received every 3 minutes
-                handleReceiveDataWithPrefix07(value)
-
-            case "0A":
-                // Unbind protocol response
-//                let success = ProtocalTools.unBind_response(value, andEDevice: eDevice)
-//                if success {
-//                    status = .closed
-//                    resetBleSensorData()
-//                    bluetoothDelegate?.onFindDevices(peripherals, connectedDevice: nil)
-//                }
-break
-            case "11":
-                // Reset protocol response after retransmission
-//                let resetData = ProtocalTools.reset_response2(value, andEDevice: eDevice)
-//                if resetData.isBind {
-//                    let lowPowerData = ProtocalTools.lowPower_request(eDevice)
-//                    peripheral.writeValue(lowPowerData, for: writeReadCharacteristic, type: .withoutResponse)
-//                } else {
-//                    status = .sensorLostPower
-//                }
-break
-            default:
-                break
-            }
-        }
-    }
-    
-    func peripheral(_ peripheral: CBPeripheral, didWriteValueFor characteristic: CBCharacteristic, error: (any Error)?) {
-        
-    }
-    
-    func peripheral(_ peripheral: CBPeripheral, didUpdateNotificationStateFor characteristic: CBCharacteristic, error: (any Error)?) {
-        guard let eDevice = eDevice else { return }
-        guard characteristic.uuid == CBUUID(string: eDevice.eGattMessage.uuid_READ) else {
-             return
-         }
-         
-         print(#function)  // Equivalent to KLTLog(@"%s", __FUNCTION__)
-         
-         if !characteristic.isNotifying {
-             centralManager?.cancelPeripheralConnection(peripheral)
-         }
-    }
-    // CT3/CT4 每3分钟上来的数据
-    func handleReceiveDataWithPrefix07(_ receiveData: Data) {
-        /*if status == .resendStart || isInResend {
-            // 重发数据期间不处理新收到的数据
-            return
-        }*/
-
-        //let maxGlucoseId = KLTDatabaseHandler.shared().getLatestAndMaxGlucoseId(of: currentDevice)
-        guard let gluData = ProtocalTools.getGlucose(receiveData, andEDevice: eDevice) else {
-            return
-        }
-        
-        handleReceiveDataWithPrefix07Glucose(gluData)
-        /*if gluData.gluID == maxGlucoseId + 1 {
-            handleReceiveDataWithPrefix07Glucose(gluData)
-        } else if gluData.gluID > maxGlucoseId + 1 {
-            // 如果拿到的数据大于下一条数据的gluID，证明需要重新拉取中间漏掉的数据（22拉取协议）
-            pullGlucouseSeriesRequest(withGlucoseId: maxGlucoseId)
-        }*/
-    }
-    
-    func handleReceiveDataWithPrefix07Glucose(_ gluData: Glucose) {
-        let glucoseId = gluData.gluID
-        let operatingCurrent = gluData.iw
-        let blankCurrent = gluData.ib
-        let temperature = gluData.t
-        print("glucoseId: \(glucoseId),operatingCurrent: \(operatingCurrent), blankCurrent: \(blankCurrent), temperature: \(temperature)")
-        //sendCGMLog()
-        
-        let cgmLogs = CGMLog(timeInMillis: Double(Date().timeIntervalSince1970 * 1000),
-                             countdownMinutes: 42,
-                             countdownDays: 12,
-                             hypoglycemiaEarlyWarnMinutes: 8,
-                             showGlucoseMG: 140,
-                             glucoseId: Int(glucoseId),
-                             name: connectedDeviceName,
-                             bytes: [1,2,3],
-                             showGlucose: 5.67 ,
-                             Ib: blankCurrent,
-                             Iw: operatingCurrent,
-                             countdownHours: 15,
-                             T: temperature,
-                             year: gluData.year,
-                             month: gluData.month,
-                             day: gluData.day,
-                             hour: gluData.hour,
-                             minute: gluData.minute,
-                             trendObject: TrendObject(trendId: 11, drawableId: 2103818652, widgetImg: -1, apsChangeRate: "FLAT"),
-                             glucoseStatusObject: GlucoseStatusObject(statusId: 1),
-                             errorObject: ErrorObject(errorId: 1, sound: "None"))
-        let payload = Payload(logs: [cgmLogs])
-        API.shared.postCGMData(environment: .stage, data: payload) {
-            print("Success")
-        } onFailure: { error in
-            print("Error")
-        }
-
-        /*let receive = handleCommonReceiveGluData(gluData, commandText: "07")
-        
-        NotificationCenter.default.post(name: Notification.Name("didReceiveNewData"), object: receive)
-        
-        handleCommonCT3GlucoseData(withReceiveData: receive)
-        
-        NotificationCenter.default.post(name: Notification.Name("DidHandleResendDataNoReload"), object: nil)
-        
-        let remainPoints = KLTDatabaseHandler.shared().numberOfLifeCycleSensor(
-            withDevice: currentDevice,
-            endNumber: eDevice.endNumber
-        )
-        
-        if remainPoints <= 0 {
-            closeBleSensor()
-        }*/
-    }
-
-    func resetBleSensorData() {
-        // Disconnect from peripheral and stop listening to characteristics
-        terminateConnection()
-
-        /*if let currentDevice = self.currentDevice {
-            currentDevice.userBG = nil
-            currentDevice.connectedDateTime = nil
-            currentDevice.disconnectedDateTime = nil
-            currentDevice.initialBeginDate = nil
-            currentDevice.initialEndDate = nil
-
-            KLTDatabaseHandler.shared().appDelegate.saveContext()
-        }*/
-
-        //self.currentDevice = nil
-        //self.dataType = .receiveDataBeforeSetUserReference
-        //self.resendType = .resendDataBeforeSetUserBG
-
-        self.peripherals.removeAll()
-        self.connectedPeripheral = nil
-
-        //connectTimer?.invalidate()
-        //connectTimer = nil
-        //rescanTimer?.invalidate()
-        //rescanTimer = nil
-
-        //UserDefaults.standard.removeObject(forKey: KLTLocalDeviceQRCodeInfoKey)
-        //KLTLocalSettingManager.shared.canConnectOtherDevice = true
-        UserDefaults.standard.set(nil, forKey: "silenceStart")
-        UserDefaults.standard.set(nil, forKey: "alertKindOnSilence")
-        UserDefaults.standard.synchronize()
-    }
-    func terminateConnection() {
-        for peripheral in peripherals {
-            if let services = peripheral.services {
-                for service in services {
-                    if let characteristics = service.characteristics {
-                        for characteristic in characteristics {
-                            if let eDevice = eDevice {
-                                if characteristic.uuid == CBUUID(string: eDevice.eGattMessage.uuid_READ) {
-                                    if characteristic.isNotifying {
-                                        peripheral.setNotifyValue(false, for: characteristic)
-                                        return
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if let connectedPeripheral = connectedPeripheral {
-            centralManager.cancelPeripheralConnection(connectedPeripheral)
-        }
-    }
-    func handleResendDataWithPrefix22(_ resendData: Data) {
-        //eDevice = EDevice.getEnumDevice(connectedPeripheral?.name ?? "")
-        let glucoseList: [Glucose] = ProtocalTools.getGlucose_series(resendData, andEDevice: eDevice)
-         
-        if glucoseList.isEmpty {
-            // Resend finished
-            //self.isInResend = false
-            //self.status = .resendEnd
-            
-            NotificationCenter.default.post(name: Notification.Name("DidHandleResendData"), object: nil)
-            
-            // Send reset command (0x11) to end resend state
-            if let peripheral = connectedPeripheral, let characteristic = writeReadCharacteristic {
-                if let resetCommand = ProtocalTools.reset_request(eDevice) {
-                    peripheral.writeValue(resetCommand, for: characteristic, type: .withoutResponse)
-                }
-            }
-            
-        } else {
-            for glucose in glucoseList {
-                let glucoseId = glucose.gluID
-                let operatingCurrent = glucose.iw
-                let blankCurrent = glucose.ib
-                let temperature = glucose.t
-                
-                print(glucose)
-            }
-           
-        }
-    }
-
-}

package/ios/Support/EnumDebouncer.swift

@@ -18,6 +18,7 @@ class EnumDebouncer<T: Equatable> {
     func update(with newValue: T) {
         if storedValue == nil || storedValue != newValue {
             reset(newValue: newValue)
+            onDebounceSuccess?(newValue)
         } else if let startTime = startTime {
             let elapsed = Date().timeIntervalSince(startTime)
             if elapsed >= debounceInterval {

package/ios/ViewControllers/ConnectToSensorViewController.swift

@@ -36,14 +36,15 @@ class ConnectToSensorViewController: UIViewController {
         case image
         case watchVideo
     }
-
+    
     enum enumScreenType {
         case camera
         case success
         case error
     }
-  
-   var connectedTime: Date?
+    
+    var isFromReconnect: Bool = false
+    var connectedTime: Date?
     var connected:(()->())?
     var screenType: enumScreenType = .camera
     var isCodeDetected = false
@@ -58,7 +59,7 @@ class ConnectToSensorViewController: UIViewController {
     
     func setupLayout() {
         manager?.addObserver(self, forKeyPath: "status", options: [.new], context: nil)
-
+        
         
         tableView.delegate = self
         tableView.dataSource = self
@@ -87,7 +88,7 @@ class ConnectToSensorViewController: UIViewController {
             let vc = PutOnTheSensorViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             self.navigationController?.pushViewController(vc, animated: false)
         }
-
+        
         customTopView.onCloseTapped = {
             let vc = ExitJourneyViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             vc.modalPresentationStyle = .overFullScreen
@@ -103,7 +104,7 @@ class ConnectToSensorViewController: UIViewController {
     
     func checkCameraPermission() {
         let status = AVCaptureDevice.authorizationStatus(for: .video)
-
+        
         switch status {
         case .authorized:
             self.isPermissionGiven = true
@@ -146,7 +147,7 @@ class ConnectToSensorViewController: UIViewController {
                 UIApplication.shared.open(settingsURL)
             }
         })
-
+        
         DispatchQueue.main.async {
             self.present(alert, animated: true)
         }
@@ -155,10 +156,10 @@ class ConnectToSensorViewController: UIViewController {
     func connectSensor(value: String, controller: ConnectToSensorViewController) {
         UserDefaults.standard.set(value, forKey: "sensorId")
         var isMatch = false
-
+        
         var regex = #"^[A-Z0-9][0-9](0[1-9]|[1-9][0-9]|[A-Z][1-9A-Z])(00[1-9]|0[1-9][0-9]|[1-9][0-9][0-9]){2}[0-9]{4,5}[0-9A-Z]{3}$"#
         var predicate = NSPredicate(format: "SELF MATCHES %@", regex)
-
+        
         if predicate.evaluate(with: value) {
             isMatch = true
         } else {
@@ -168,10 +169,10 @@ class ConnectToSensorViewController: UIViewController {
                 isMatch = true
             }
         }
-
+        
         if isMatch {
             let data = AlgorithmTools.decodeCT(value)
-
+            
             if data.k > 0 || data.r > 0 {
                 //KLTLocalSettingManager.shareInstance.deviceInfoSensor = value
                 UserDefaults.standard.set(data.k, forKey: "algo_k")
@@ -184,17 +185,17 @@ class ConnectToSensorViewController: UIViewController {
                 return
             }
         }
-
+        
         //controller.resumeScanning()
     }
     func connectThisSensor() {
         // Connect the transmitter
         manager?.connectPeripheral(manager?.readyToConnectedPeripheral)
     }
-
+    
     func showConfirmInsulinUser() {
         let typeOfDiabetes = UserDefaults.standard.object(forKey: "profilePatientType") as? NSNumber
-
+        
         if let diabetesType = typeOfDiabetes {
             // LocalizedString(@"user_diabete_no") index is 0
             if diabetesType.intValue == 0 {
@@ -208,9 +209,9 @@ class ConnectToSensorViewController: UIViewController {
             // Not selected
             UserDefaults.standard.set(0, forKey: "algo_user_type")
         }
-
+        
         UserDefaults.standard.synchronize() // Optional, rarely needed in modern iOS
-
+        
         connectThisSensor()
     }
     override func observeValue(forKeyPath keyPath: String?,
@@ -221,16 +222,27 @@ class ConnectToSensorViewController: UIViewController {
             if let newValue = change?[.newKey] as? Int {
                 //let btStatus = newValue
                 let btStatus: BluetoothManagerStatus = BluetoothManagerStatus(rawValue: newValue) ?? .scanStart
-
+                
                 if btStatus == .initialStart {
-                  self.connectedTime = Date()
+                    self.connectedTime = Date()
                     print("Success")
                     screenType = .success
                     tableView.reloadData()
                     bottomButton.enable()
+                    if self.isFromReconnect {
+                        let _ = FinalViewModelManager.shared
+                        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 })
+                            .first {
+                            rootVC.dismiss(animated: true, completion: nil)
+                        } else if let rootViewController = UIApplication.shared.keyWindow?.rootViewController {
+                            rootViewController.dismiss(animated: true, completion: nil)
+                        }
+                    }
                 } else if btStatus == .closed || btStatus == .modifyVoltageFailed {
                     // Handle failed or closed status
-        
+                    
                     navigationController?.popToRootViewController(animated: true)
                 }
             }
@@ -238,7 +250,7 @@ class ConnectToSensorViewController: UIViewController {
             if let playerItem = object as? AVPlayerItem {
                 if playerItem.status == .readyToPlay {
                     if UserDefaults.standard.integer(forKey: "bgmode") == 0 {
-                       // player?.play()
+                        // player?.play()
                     }
                 }
             }
@@ -246,7 +258,7 @@ class ConnectToSensorViewController: UIViewController {
             super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
         }
     }
-
+    
 }
 
 extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSource {
@@ -330,24 +342,24 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
                 return cell
             }
         case .success:
-          switch enumSuccessTableRow(rawValue: indexPath.row)! {
-          case .success:
-            let cell: ConnectSuccessTVC = tableView.dequeueReusableCell(for: indexPath)
-            let dateFormatter = DateFormatter()
-            dateFormatter.dateFormat = "dd-MM-yyyy hh:mm a"
-            dateFormatter.timeZone = TimeZone.current
-            if let connectedTime = connectedTime {
-              // Convert the Date to a String
-              let dateString = dateFormatter.string(from: connectedTime)
-              cell.labelDate.text = "Connected on \(String(describing: dateString))"
-            } else {
-              cell.labelDate.text = ""
+            switch enumSuccessTableRow(rawValue: indexPath.row)! {
+            case .success:
+                let cell: ConnectSuccessTVC = tableView.dequeueReusableCell(for: indexPath)
+                let dateFormatter = DateFormatter()
+                dateFormatter.dateFormat = "dd-MM-yyyy hh:mm a"
+                dateFormatter.timeZone = TimeZone.current
+                if let connectedTime = connectedTime {
+                    // Convert the Date to a String
+                    let dateString = dateFormatter.string(from: connectedTime)
+                    cell.labelDate.text = "Connected on \(String(describing: dateString))"
+                } else {
+                    cell.labelDate.text = ""
+                }
+                cell.labelDesc.isHidden = true
+                cell.labelTitle.text = "Sensor Connected Successfully"
+                cell.setImageForCGM()
+                return cell
             }
-            cell.labelDesc.isHidden = true
-            cell.labelTitle.text = "Sensor Connected Successfully"
-            cell.setImageForCGM()
-            return cell
-          }
         case .error:
             switch enumFailureTableRow(rawValue: indexPath.row)! {
             case .failAnimation:

package/ios/ViewControllers/ConnectToTransmitterViewController.swift

@@ -95,14 +95,20 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
         }
         bottomButton.buttonTapCallback = {
             if self.isForReconnect {
-                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 })
-                    .first {
-                    rootVC.dismiss(animated: true, completion: nil)
-                } else if let rootViewController = UIApplication.shared.keyWindow?.rootViewController {
-                    rootViewController.dismiss(animated: true, completion: nil)
+                let vc = ConnectToSensorViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
+                vc.connected = {
+                    //self.showConfirmInsulinUser()
                 }
+                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 })
+//                    .first {
+//                    rootVC.dismiss(animated: true, completion: nil)
+//                } else if let rootViewController = UIApplication.shared.keyWindow?.rootViewController {
+//                    rootViewController.dismiss(animated: true, completion: nil)
+//                }
             } else {
                 if self.screenType == .error {
                     self.bottomButton.disable()
@@ -130,9 +136,9 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
         }
         
         if isForReconnect {
-            customTopView.showOnlyClose()
-            customStepProgressBar.isHidden = true
-            customStepProgressHeightConstraint.constant = 0
+            //customTopView.showOnlyClose()
+            //customStepProgressBar.isHidden = true
+            //customStepProgressHeightConstraint.constant = 0
             bottomButton.labelText = "Complete"
             bottomButton.showRightArrow()
            
@@ -176,6 +182,20 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
             super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
         }
     }
+    
+    func sensorForceEnd() {
+        if let manager = manager {
+            if ((manager.connectedPeripheral) != nil) {
+                if (manager.status == .resendEnd || manager.status == .getGLU || manager.status == .initialStart) {
+                    manager.closeBleSensor()
+                }
+            } else {
+                if (manager.currentDevice != nil) {
+                    manager.forceEndBleSensor()
+                }
+            }
+        }
+    }
 }
 
 extension ConnectToTransmitterViewController: UITableViewDelegate, UITableViewDataSource {
@@ -270,22 +290,27 @@ extension ConnectToTransmitterViewController: UITableViewDelegate, UITableViewDa
             
             //cell.labelDesc.text = "Sno:\(devices[indexPath.row].name)"
             cell.button.buttonTapCallback = {
+                if self.isForReconnect {
+                    self.sensorForceEnd()
+                }
+                
                 if !KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
                     return
                 }
 
                 self.manager?.stopScan()
-
-                let peripheral = self.foundDevices[indexPath.row] as! CBPeripheral
-                if let device = KLTDatabaseHandler.shared().queryDevice(withId: peripheral.identifier.uuidString) {
-                    //let snLocalName = device.advertise?.localName?.trimmingCharacters(in: .whitespacesAndNewlines)
-                    self.connectedTime = Date()
-                    print("Connected device", device)
-                    self.manager?.readyToConnectedPeripheral = peripheral
-                    self.screenType = .success
-                    API.shared.sendStatus(status: .connected)
-                    self.bottomButton.enable()
-                    tableView.reloadData()
+                if self.foundDevices.count > indexPath.row {
+                    let peripheral = self.foundDevices[indexPath.row] as! CBPeripheral
+                    if let device = KLTDatabaseHandler.shared().queryDevice(withId: peripheral.identifier.uuidString) {
+                        //let snLocalName = device.advertise?.localName?.trimmingCharacters(in: .whitespacesAndNewlines)
+                        self.connectedTime = Date()
+                        print("Connected device", device)
+                        self.manager?.readyToConnectedPeripheral = peripheral
+                        self.screenType = .success
+                        //API.shared.sendStatus(status: .connected)
+                        self.bottomButton.enable()
+                        tableView.reloadData()
+                    }
                 }
             }
             return cell
@@ -340,31 +365,3 @@ extension ConnectToTransmitterViewController: UITableViewDelegate, UITableViewDa
     }
     
 }
-
-extension ConnectToTransmitterViewController: BluetoothManagerDelegate {
-    func didDiscoverDevice(_ device: CBPeripheral) {
-        DispatchQueue.main.async {
-            self.devices = BluetoothManager.shared.discoveredDevices
-            self.screenType = .listOfDevice
-            self.tableView.reloadData()
-        }
-    }
-
-    func didConnectDevice(_ device: CBPeripheral) {
-        DispatchQueue.main.async {
-            self.screenType = .success
-            self.tableView.reloadData()
-        }
-    }
-
-    func didFailToConnect(_ device: CBPeripheral, error: Error?) {
-        DispatchQueue.main.async {
-            self.screenType = .error
-            self.tableView.reloadData()
-        }
-    }
-
-    func didDisconnectDevice(_ device: CBPeripheral, error: Error?) {
-        print("Disconnected from device: \(device.name ?? "Unknown")")
-    }
-}

package/ios/ViewControllers/StartConnectionViewController.swift

@@ -24,7 +24,7 @@ class StartConnectionViewController: UIViewController {
         super.viewDidLoad()
         // Do any additional setup after loading the view.
         setupLayout()
-        checkForDevice()
+        //checkForDevice()
     }
     
     func setupLayout() {

package/ios/ViewModel/FinalViewModel.swift

@@ -43,34 +43,58 @@ class FinalViewModel: NSObject {
      }
 
     @objc public func initialize() {
+  
         startCountDown()
+    
         if ((manager.connectedPeripheral == nil) && !KLTLocalSettingManager.shareInstance().canConnectOtherDevice) {
             manager.startScan()
         }  else {
-            debouncer.update(with: .connected)
-            API.shared.sendStatus(status: .connected)
+            print("here")
+            //debouncer.update(with: .connected)
+            //API.shared.sendStatus(status: .connected)
+            if let last = manager.currentDevice { }
+            else {
+                //self.manager.closeBleSensor()
+                //manager.startScan()
+                debouncer.update(with: .disconnected)
+                //debouncer.update(with: .transmitterDisconnectBox)
+            }
         }
     }
     func startCountDown() {
+        
         // Most recently connected device
         if let last = manager.currentDevice {
+            let eDevice = EDevice.getEnumDevice(last.advertise?.localName ?? "")
+            initialPeriod = Int(eDevice.initNumber * 3 * 60)
             // Calculate initialization countdown time
             if let beginDate = KLTDateFormatter.shared.getDateFromWholeString(last.initialBeginDate ?? "") {
                 let time = Date().timeIntervalSince(beginDate)
-                totalSeconds = Double(initialPeriod) - TimeInterval(time)
-            }
-        }
-
-        //for countdownlabel
-        print(String.getTimeString(with: Int(totalSeconds)))
+                if Int(time) > self.initialPeriod {
+                    // Initialization completed, normal use
+                    
+                } else {
+                    
+                    // During initialization, notify the initialization page to restart the countdown
+                    totalSeconds = Double(initialPeriod) - TimeInterval(time)
+                    
+                    //for countdownlabel
+                    print(String.getTimeString(with: Int(totalSeconds)))
+
+                    if countdownTimer != nil {
+                        countdownTimer?.invalidate()
+                        countdownTimer = nil
+                    }
+
+                    countdownTimer = Timer.scheduledTimer(timeInterval: 1.0, target: self, selector: #selector(countdown), userInfo: nil, repeats: true)
 
-        if countdownTimer != nil {
-            countdownTimer?.invalidate()
-            countdownTimer = nil
+                }
+            }
+        } else {
+            // no device is connected
         }
 
-        countdownTimer = Timer.scheduledTimer(timeInterval: 1.0, target: self, selector: #selector(countdown), userInfo: nil, repeats: true)
-
+     
         addAllObservers()
     }
     func addAllObservers() {
@@ -147,14 +171,18 @@ class FinalViewModel: NSObject {
 
         let errorCode = ErrorCode(rawValue: Int32(receiveData.error?.intValue ?? 0))
         if errorCode == ErrorCode.ERROR_CODE_FLOODING_WATER {
-            API.shared.sendStatus(status: .moistureDetect)
+            debouncer.update(with: CGMConnectionStatus.moistureDetect)
+            //API.shared.sendStatus(status: .moistureDetect)
         } else if errorCode == ErrorCode.ERROR_CODE_CURRENT_SMALL || errorCode == ErrorCode.ERROR_CODE_NOISE || errorCode == ErrorCode.ERROR_CODE_SENSITIVITY_ATTENUATION {
-            API.shared.sendStatus(status: .weakSignal)
+            debouncer.update(with: CGMConnectionStatus.weakSignal)
+            //API.shared.sendStatus(status: .weakSignal)
         } else if errorCode != ErrorCode.ERROR_CODE_NONE {
-            API.shared.sendStatus(status: .errorCommon)
+            debouncer.update(with: CGMConnectionStatus.errorCommon)
+            //API.shared.sendStatus(status: .errorCommon)
         }
         if receiveData.countdownDays == 0 && receiveData.countdownHours == 0 && receiveData.countdownMinutes == 0 {
-            API.shared.sendStatus(status: .expired)
+            debouncer.update(with: CGMConnectionStatus.expired)
+            //API.shared.sendStatus(status: .expired)
         }
     }
     
@@ -190,7 +218,8 @@ class FinalViewModel: NSObject {
     @objc func bluetoothEnable(_ notification: Notification) {
         if let isBluetoothEnabled = notification.object as? Bool {
             if !isBluetoothEnabled {
-                API.shared.sendStatus(status: .bluetoothOff)
+                debouncer.update(with: CGMConnectionStatus.bluetoothOff)
+                //API.shared.sendStatus(status: .bluetoothOff)
             }
         }
         if ((manager.connectedPeripheral == nil) && !KLTLocalSettingManager.shareInstance().canConnectOtherDevice) {
@@ -212,7 +241,7 @@ class FinalViewModel: NSObject {
             startScanTimer?.invalidate()
             startScanTimer = nil
 
-            removeAllObservers()
+            //removeAllObservers()
 
             //KLTLaunchConfiguration.sharedManager.resetRootViewController(type: .normalUsed)
             return
@@ -234,7 +263,10 @@ class FinalViewModel: NSObject {
             return
         }
 
+        print("===>device status is -> \(status)")
+
         switch status {
+
         case .disconnected:
             if KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
                 // Unbind then disconnect
@@ -244,34 +276,45 @@ class FinalViewModel: NSObject {
                     manager.startScan()
                 }
             }
-            API.shared.sendStatus(status: .disconnected)
+            //API.shared.sendStatus(status: .disconnected)
             print("===>device is disconnected")
-            debouncer.update(with: CGMConnectionStatus.connected)
+            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
             }
-            API.shared.sendStatus(status: .connected)
+            //API.shared.sendStatus(status: .connected)
             print("===>device is connected")
-            debouncer.update(with: CGMConnectionStatus.disconnected)
+            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)
-            }
-
+//            if !KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
+//                startScanTimer = Timer.scheduledTimer(timeInterval: 20,
+//                                                      target: self,
+//                                                      selector: #selector(startScan),
+//                                                      userInfo: nil,
+//                                                      repeats: false)
+//            }
+            print("===>time out")
+            break
         case .sensorLostPower:
             sensorLostPower()
-
+            print("===>sensor lost power")
         case .updateBindWatchSuccess:
             //KLTLaunchConfiguration.sharedManager.bindSuccessRootViewController()
-            print("Success done")
+            startCountDown()
+            print("===>Success done")
         case .closed:
-            API.shared.sendStatus(status: .transmitterDisconnectBox)
+            debouncer.update(with: CGMConnectionStatus.transmitterDisconnectBox)
+            //API.shared.sendStatus(status: .transmitterDisconnectBox)
+            print("===>closed")
         default:
             break
         }
@@ -297,12 +340,7 @@ class FinalViewModel: NSObject {
 
         print("initial State all end")
        // KLTLaunchConfiguration.sharedManager.resetRootViewController(.beforeUse)
-
-        
     }
-    
-   
-
 }
 
 

package/package.json

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