react-native-mytatva-rn-sdk 1.2.26 → 1.2.28

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

@@ -144,6 +144,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
 
                                 val pocDevice =
                                     RepositoryDevice.getInstance(BApplication.getContext()).latestDeviceIoThread
+                                   Log.d("pocDevice logsss", pocDevice.toString())
                                 if (pocDevice != null) {
                                     if (pocDevice.isUnBind) {
                                         postEventDataToAPI(
@@ -462,6 +463,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                         token = userToken,
                         responseListener = object : AuthenticateSDKService.ResponseListener {
                             override fun onResponseSuccess(response: String) {
+                                updateSyncMetadata(pocGlucose)
                                 Log.d("CGM Data", "Single glucose data uploaded successfully")
                             }
 

package/ios/Database/KLTDatabaseHandler.m

@@ -130,20 +130,6 @@
     glucose.temperature = data.temperature;
     float algo_k = [[User_Defaults objectForKey:@"algo_k"] floatValue];
     float algo_r = [[User_Defaults objectForKey:@"algo_r"] floatValue];
-    
-    NSString *dateString = data.receiveDateTime;
-    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-    [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
-    [dateFormatter setTimeZone:[NSTimeZone timeZoneWithAbbreviation:@"UTC"]];
-    NSDate *date = [dateFormatter dateFromString:dateString];
-    if (date) {
-        NSTimeInterval timeMillis = [date timeIntervalSince1970] * 1000; // Convert to milliseconds
-        NSLog(@"Milliseconds since epoch: %.0f", timeMillis);
-        NSNumber *numberFromTimeMillis = [NSNumber numberWithDouble:timeMillis]; // Wrap the NSTimeInterval into an NSNumber
-    } else {
-        NSLog(@"Invalid date string format");
-    }
-
 
     LatestData *d = nil;
     NSString *localName = data.device.advertise.localName;
@@ -151,24 +137,13 @@
     if (userBG > 0) {
         d = [[LatestData alloc] initWithParameters:glucose.dataId.intValue andIw:[glucose.operatingCurrent floatValue] andIb:[glucose.blankCurrent floatValue] andT:[glucose.temperature floatValue] andK0:algo_k andR:algo_r andDay:[data.day intValue] andHour:[data.hour intValue] andMinute:[data.minute intValue] andNewBgToGlucoseId:glucose.dataId.intValue andNewBgValue:userBG andName:localName];
     } else {
-        d = [[LatestData alloc] initWithParameters:([glucose.dataId intValue]) andIw:[glucose.operatingCurrent floatValue] andIb:[glucose.blankCurrent floatValue] andT:[glucose.temperature floatValue] andK0:algo_k andR:algo_r andDay:[data.day intValue] andHour:[data.hour intValue] andMinute:[data.minute intValue] andName:localName ];
+        d = [[LatestData alloc] initWithParameters:([glucose.dataId intValue]) andIw:[glucose.operatingCurrent floatValue] andIb:[glucose.blankCurrent floatValue] andT:[glucose.temperature floatValue] andK0:algo_k andR:algo_r andDay:[data.day intValue] andHour:[data.hour intValue] andMinute:[data.minute intValue] andName:localName];
     }
     d.algorithm = AlgorithmType_CT4;
-    
-
-   
-    NSLog( @"sensorInfosensorInf %f", d.R);
-
-    NSLog( @"sensorInfosensorInfosensorInfosensorInfo %@", d.sensorInfo);
-    
-    NSLog(@"算法入参dataId=%@, operatingCurrent=%@, blankCurrent=%@, temperature=%@, algo_k=%@, algo_r=%@, day=%@, hour=%@, minute=%@, localName=%@, algorithm=%@, year=%@, milles=%@", @(d.glucoseId), @(d.Iw), @(d.Ib), @(d.T), @(d.K0), @(d.R), @(d.day), @(d.hour), @(d.minute), d.name, @(d.algorithm), @(d.year), @(d.timeMillis));
-    
- 
-
 
+    KLTLog(@"算法入参dataId=%@, operatingCurrent=%@, blankCurrent=%@, temperature=%@, algo_k=%@, algo_r=%@, day=%@, hour=%@, minute=%@, localName=%@, newBgValue=%@, algorithm=%@", @(d.glucoseId), @(d.Iw), @(d.Ib), @(d.T), @(d.K0), @(d.R), @(d.day), @(d.hour), @(d.minute), d.name, @(d.newBgValue), @(d.algorithm));
     CurrentGlucose *currentGlucose = [AlgorithmTools algorithmLatestGlucose:d];
     
-
     if (currentGlucose.errorCode == ERROR_CODE_ALGORITHM_DATA) {
         [self reloadQueryHistoryData];
         
@@ -178,35 +153,11 @@
             d = [[LatestData alloc] initWithParameters:([glucose.dataId intValue]) andIw:[glucose.operatingCurrent floatValue] andIb:[glucose.blankCurrent floatValue] andT:[glucose.temperature floatValue] andK0:algo_k andR:algo_r andDay:[data.day intValue] andHour:[data.hour intValue] andMinute:[data.minute intValue] andName:localName];
         }
         d.algorithm = AlgorithmType_CT4;
-       
 
-        NSLog(@"ERROR_CODE_ALGORITHM_DATA:dataId=%@, operatingCurrent=%@, blankCurrent=%@, temperature=%@, algo_k=%@, algo_r=%@, day=%@, hour=%@, minute=%@, localName=%@, newBgValue=%@, algorithm=%@", @(d.glucoseId), @(d.Iw), @(d.Ib), @(d.T), @(d.K0), @(d.R), @(d.day), @(d.hour), @(d.minute), d.name, @(d.newBgValue), @(d.algorithm));
+        KLTLog(@"ERROR_CODE_ALGORITHM_DATA:dataId=%@, operatingCurrent=%@, blankCurrent=%@, temperature=%@, algo_k=%@, algo_r=%@, day=%@, hour=%@, minute=%@, localName=%@, newBgValue=%@, algorithm=%@", @(d.glucoseId), @(d.Iw), @(d.Ib), @(d.T), @(d.K0), @(d.R), @(d.day), @(d.hour), @(d.minute), d.name, @(d.newBgValue), @(d.algorithm));
         currentGlucose = [AlgorithmTools algorithmLatestGlucose:d];
-        
-        NSString *logString = [NSString stringWithFormat:@"glucoseId=%@, Iw=%@, Ib=%@, T=%@,dayCount=%@, hour=%@, minute=%@, milles=%@, GluMG=%@,BGCount=%@, BGICount=%@, errorCode=%@  trend=%@  calibrationStatus=%@,  countdownDays=%@, countdownHours=%@, countdownMinutes=%@ ",
-            @(d.glucoseId),
-            @(d.Iw),
-            @(d.Ib),
-            @(d.T),
-            @(d.day),
-            @(d.hour),
-            @(d.minute),
-            @(d.timeMillis),
-            @(currentGlucose.GluMG),
-            @(currentGlucose.BGCount),
-            @(currentGlucose.BGICount),
-            @(currentGlucose.errorCode),
-            @(currentGlucose.trend),
-            @(currentGlucose.BGMG),
-            @(currentGlucose.countdownDays),
-            @(currentGlucose.countdownHours),
-            @(currentGlucose.countdownHours)
-                               
-        ];
-        
     }
 
-    
     glucose.errorCode = @(currentGlucose.errorCode);
     glucose.trend = @(currentGlucose.trend);
     /* glucose.glu 保存 ADC 算法结果 单位mmol */
@@ -221,29 +172,11 @@
     data.calibration = @(currentGlucose.BGMG);
     data.error = @(currentGlucose.errorCode);
     data.trend = @(currentGlucose.trend);
+    data.countdownDays = @(currentGlucose.countdownDays);
+    data.countdownHours = @(currentGlucose.countdownHours);
+    data.countdownMinutes = @(currentGlucose.countdownMinutes);
     
-    NSString *logString = [NSString stringWithFormat:@"glucoseId=%@, Iw=%@, Ib=%@, T=%@,dayCount=%@, hour=%@, minute=%@, milles=%@, GluMG=%@,BGCount=%@, BGICount=%@, errorCode=%@  trend=%@  calibrationStatus=%@,  countdownDays=%@, countdownHours=%@, countdownMinutes=%@ ",
-        @(d.glucoseId),
-        @(d.Iw),
-        @(d.Ib),
-        @(d.T),
-        @(d.day),
-        @(d.hour),
-        @(d.minute),
-        @(d.timeMillis),
-        @(currentGlucose.GluMG),
-        @(currentGlucose.BGCount),
-        @(currentGlucose.BGICount),
-        @(currentGlucose.errorCode),
-        @(currentGlucose.trend),
-        @(currentGlucose.BGMG),
-        @(currentGlucose.countdownDays),
-        @(currentGlucose.countdownHours),
-        @(currentGlucose.countdownHours)
-                           
-    ];
-    
-    
+    [Notification_Center postNotificationName:@"ErrorStatusFromTransmitter" object:data];
     [self.appDelegate saveContext];
     return glucose;
 }
@@ -334,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];
     }
@@ -356,7 +289,7 @@
     allData = [allData sortedArrayUsingDescriptors:@[
         [NSSortDescriptor sortDescriptorWithKey:@"receiveDateTime" ascending:YES]
     ]];
-
+    
     return allData;
 }
 
@@ -463,7 +396,7 @@
             ReceiveData *receiveModel = needUserBgs[i];
             bgToGlucoseIds[i] = receiveModel.glucoseId.intValue;
             bgValues[i] = roundf(receiveModel.userBG.floatValue * 18);
-            NSLog(@"newBgToGlucoseIds: bgToGlucoseIds=%@, userBG=%@", receiveModel.glucoseId, receiveModel.userBG);
+            KLTLog(@"newBgToGlucoseIds: bgToGlucoseIds=%@, userBG=%@", receiveModel.glucoseId, receiveModel.userBG);
         }
         data.newBgToGlucoseIds = bgToGlucoseIds;
         data.newBgToGlucoseIdsCount = (int)numberOfUserBgs;
@@ -478,7 +411,7 @@
     data.R = algo_r;
 
     CurrentGlucose *currentGlucose = [AlgorithmTools algorithmGlucose:data];
-    NSLog(@"rerunADCAlgo: algorithm=%@, currentGlucose.errorCode = %@", @(data.algorithm), @(currentGlucose.errorCode));
+    KLTLog(@"rerunADCAlgo: algorithm=%@, currentGlucose.errorCode = %@", @(data.algorithm), @(currentGlucose.errorCode));
     if (Iws != nil) {
         free(Iws);
         Iws = nil;

package/ios/Support/API.swift

@@ -230,7 +230,7 @@ class API {
         
     }
     
-    func getStatus(encryptionKey: String = PROD_ENC_KEY,
+    /*func getStatus(encryptionKey: String = PROD_ENC_KEY,
                    encryptionIv: String = PROD_ENC_IV) {
         print("ios token:", TOKEN)
         let url = URL(string: "https://api-feature2.mytatva.in/api/v8/cgm/status")!
@@ -289,7 +289,7 @@ class API {
         }
         task.resume()
         
-    }
+    }*/
     
     // Example date range check function (assumes yyyy-MM-dd format)
     func isCurrentDateInRange(startDate: String, endDate: String) -> Bool {

package/ios/ViewModel/FinalViewModel.swift

@@ -17,7 +17,7 @@ import Foundation
     @objc public func callForObserveTransmitterUnbindStatus() {
         let sensorID = UserDefaults.standard.string(forKey: "sensorId") ?? ""
         if !sensorID.isEmpty {
-            API.shared.getStatus()
+            viewModel.getStatus()
         }
     }
 }
@@ -43,15 +43,16 @@ class FinalViewModel: NSObject {
      }
 
     @objc public func initialize() {
-  
+        //getStatus()
         startCountDown()
     
         if ((manager.connectedPeripheral == nil) && !KLTLocalSettingManager.shareInstance().canConnectOtherDevice) {
             manager.startScan()
+            debouncer.update(with: .disconnected)
         }  else {
             print("here")
             //debouncer.update(with: .connected)
-            //API.shared.sendStatus(status: .connected)
+            //API.shared.sendStatus(status: .connected) 计算 算法入参
             if let last = manager.currentDevice { }
             else {
                 //self.manager.closeBleSensor()
@@ -61,6 +62,93 @@ class FinalViewModel: NSObject {
             }
         }
     }
+    func getStatus(encryptionKey: String = PROD_ENC_KEY,
+                   encryptionIv: String = PROD_ENC_IV) {
+        print("ios token:", TOKEN)
+        let url = URL(string: "https://api-feature2.mytatva.in/api/v8/cgm/status")!
+        var request = URLRequest(url: url)
+        request.httpMethod = "GET"
+        
+        // Set headers
+        //request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.addValue(PROD_API_KEY, forHTTPHeaderField: "api-key")
+        request.addValue(TOKEN, forHTTPHeaderField: "token")
+        
+      
+        // Set request body
+        
+        // Perform request
+        let task = URLSession.shared.dataTask(with: request) { data, response, error in
+            if let error = error {
+                print("Error: \(error)")
+                return
+            }
+            guard let data = data else {
+                print("No data received")
+                return
+            }
+            if let responseString = String(data: data, encoding: .utf8) {
+                print("===>Server Response: \(responseString)")
+                if let decrypted = Crypto.shared.getDecryptedData(cipherText: responseString, encryptionKey: encryptionKey, encryptionIv: encryptionIv) {
+                    print("===>Decrypted response (for verification): \(decrypted)")
+                    
+                    if let decrptedData = decrypted.data(using: .utf8) {
+                        let decoded = try? JSONDecoder().decode(CGMStatusResponse.self, from: decrptedData)
+                        
+                        guard let sensor = decoded?.data.first,
+                              !sensor.startDate.isEmpty,
+                              !sensor.endDate.isEmpty else {
+                            print("No valid sensor data")
+                            return
+                        }
+                        
+                        let startDateStr = sensor.startDate
+                        let endDateStr = sensor.endDate
+                        
+                        print("Start Date: \(startDateStr)")
+                        print("End Date: \(endDateStr)")
+                        UserDefaults.standard.set(sensor.sensorId, forKey: "sensorId")
+                        if self.isCurrentDateInRange(startDate: startDateStr, endDate: endDateStr) {
+                            print("Current date is in range")
+                            if ((self.manager.connectedPeripheral == nil) && !KLTLocalSettingManager.shareInstance().canConnectOtherDevice) {
+                                self.manager.startScan()
+                                self.debouncer.update(with: .disconnected)
+                            }  else {
+                                print("here")
+                                //debouncer.update(with: .connected)
+                                //API.shared.sendStatus(status: .connected) 计算 算法入参
+                                if let last = self.manager.currentDevice { }
+                                else {
+                                    //self.manager.closeBleSensor()
+                                    //manager.startScan()
+                                    //self.debouncer.update(with: .disconnected)
+                                    //debouncer.update(with: .transmitterDisconnectBox)
+                                }
+                            }
+//                            if KLTBluetoothManager.shared().currentDevice.initialEndDate != nil  {
+//                                self.sendStatus(status: .transmitterDisconnect)
+//                            }
+                        }
+                    }
+                }
+            }
+        }
+        task.resume()
+        
+    }
+    
+    func isCurrentDateInRange(startDate: String, endDate: String) -> Bool {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd"
+        guard let start = formatter.date(from: startDate),
+              let end = formatter.date(from: endDate) else {
+            return false
+        }
+        
+        let now = Date()
+        return (now >= start) && (now <= end)
+    }
+    
     func startCountDown() {
         
         // Most recently connected device

package/package.json

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