react-native-mytatva-rn-sdk 1.2.62 → 1.2.64

package/ios/Database/KLTAppDelegate.m

@@ -76,6 +76,9 @@
 }
 
 
+
+
+
 - (NSManagedObjectContext *)managedObjectContext {
     // Returns the managed object context for the application (which is already bound to the persistent store coordinator for the application.)
     if (_managedObjectContext != nil) {

package/ios/Database/KLTDatabaseHandler.h

@@ -56,4 +56,5 @@
 
 - (void)reloadQueryHistoryData;
 - (void)deleteSQLiteDataArray;
+- (BOOL)hasDeviceData;
 @end

package/ios/Database/KLTDatabaseHandler.m

@@ -197,6 +197,24 @@
     return glucose;
 }
 
+- (BOOL)hasDeviceData {
+    NSManagedObjectContext *context = self.context;
+    NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:@"Device"];
+    
+    // We're only interested in knowing if there's at least one record
+    [fetchRequest setFetchLimit:1];
+
+    NSError *error = nil;
+    NSUInteger count = [context countForFetchRequest:fetchRequest error:&error];
+
+    if (error) {
+        NSLog(@"Error fetching Device data: %@", error.localizedDescription);
+        return NO;
+    }
+
+    return count > 0;
+}
+
 // 查询某一张表name
 - (NSArray *)queryTableWithName:(NSString *)name {
     NSEntityDescription *entity = [NSEntityDescription entityForName:name inManagedObjectContext:self.context];

package/ios/ViewModel/FinalViewModel.swift

@@ -127,16 +127,26 @@ import Foundation
 
             let canConnectOther = KLTLocalSettingManager.shareInstance().canConnectOtherDevice
             let connectedPeripheral = viewModel.manager.connectedPeripheral
-
+            
+            
             if connectedPeripheral == nil && !canConnectOther {
-                viewModel.manager.startScan()
                 let bluetoothOff = UserDefaults.standard.bool(forKey: "bluetoothOff")
+//                if bluetoothOff {
+//                    viewModel.debouncer.update(with: .bluetoothOff)
+//                }
+                
                 if bluetoothOff == false {
-                    viewModel.debouncer.update(with: .transmitterDisconnect)
+                    let data = KLTDatabaseHandler.shared().hasDeviceData
+                    if data() {
+                        viewModel.manager.startScan()
+                       // viewModel.debouncer.update(with: .transmitterDisconnect)
+                    } else {
+                        viewModel.debouncer.update(with: .transmitterDisconnect)
+                    }
+                    
                 } else {
                     viewModel.debouncer.update(with: .bluetoothOff)
                 }
-            
             } else {
                 if let device = KLTBluetoothManager.shared().currentDevice {
                     if device.connectedDateTime == nil && device.disconnectedDateTime == nil {
@@ -146,7 +156,7 @@ import Foundation
                         UserDefaults.standard.set(sensorId, forKey: "sensorId")
                         UserDefaults.standard.set(patientId, forKey: "patientId")
                     }
-                } else {
+                } else { //when user app unistall and then install
                     print("⚠️ currentDevice is nil")
                     viewModel.manager.startScan()
                     viewModel.debouncer.update(with: .transmitterDisconnect)
@@ -189,9 +199,17 @@ class FinalViewModel: NSObject {
         startCountDown()
         
         if ((manager.connectedPeripheral == nil) && !KLTLocalSettingManager.shareInstance().canConnectOtherDevice) {
-            
-            manager.startScan()
-            debouncer.update(with: .disconnected)
+
+            let data = KLTDatabaseHandler.shared().hasDeviceData
+            if data() {
+                manager.startScan()
+              //  debouncer.update(with: .disconnected)
+                print("✅ Device data exists")
+            } else{
+                debouncer.update(with: .transmitterDisconnect)
+                print("❌ Failed to get app delegate or context")
+            }
+        
         }  else {
             print("here")
             //debouncer.update(with: .connected)
@@ -206,6 +224,19 @@ class FinalViewModel: NSObject {
         }
     }
     
+    func isDeviceDataAvailable(context: NSManagedObjectContext) -> Bool {
+        let fetchRequest: NSFetchRequest<NSFetchRequestResult> = NSFetchRequest(entityName: "Device")
+        fetchRequest.fetchLimit = 1
+        
+        do {
+            let count = try context.count(for: fetchRequest)
+            return count > 0
+        } catch {
+            print("❌ Failed to fetch Device count: \(error.localizedDescription)")
+            return false
+        }
+    }
+    
     func getStatus(encryptionKey: String = PROD_ENC_KEY,
                    encryptionIv: String = PROD_ENC_IV) {
         print("ios token:", TOKEN)
@@ -389,12 +420,19 @@ class FinalViewModel: NSObject {
         let batch = batches[index]
         
         // Filter out data where gluADC is 0
+//        let filteredBatch = batch.filter {
+//            if let gluADC = $0.gluADC as? Int {
+//                return gluADC != 0
+//            }
+//            return false
+//        }
+        
         let filteredBatch = batch.filter {
-            if let gluADC = $0.gluADC as? Int {
-                return gluADC != 0
-            }
-            return false
+            let gluADCValue = ($0.gluADC as? Int) ?? 0
+            let isDeleteValue = ($0.isDelete as? Int) ?? 0
+            return gluADCValue != 0 && isDeleteValue == 0
         }
+
         
         let cgmLogs = filteredBatch.map { ReceiveDataToLog(data: $0) }
         let payload = Payload(logs: cgmLogs)

package/package.json

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