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

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

@@ -121,64 +121,58 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
         try {
             userToken = token
 
-            val sharedPreferencesLibraryUtil =
-                SharedPreferencesLibraryUtil(BApplication.getContext())
-            val information = sharedPreferencesLibraryUtil.qrInformation
-            if (information != null) {
-                Log.e("observeTransmitterUnbindStatus", Gson().toJson(information).toString())
+            authenticateSDKService.getCGMData(
+                environment = if ("uat".uppercase() == "PROD") TATVA_ENVIRONMENT.PROD else TATVA_ENVIRONMENT.STAGE,
+                token = userToken,
+                responseListener = object : AuthenticateSDKService.ResponseListener {
+                    override fun onResponseSuccess(response: String) {
 
-                authenticateSDKService.getCGMData(
-                    environment = if ("uat".uppercase() == "PROD") TATVA_ENVIRONMENT.PROD else TATVA_ENVIRONMENT.STAGE,
-                    token = userToken,
-                    responseListener = object : AuthenticateSDKService.ResponseListener {
-                        override fun onResponseSuccess(response: String) {
+                        val response = Gson().fromJson(response, CgmSensorResponse::class.java)
+                        val sensor = response.data?.firstOrNull()
 
-                            val response = Gson().fromJson(response, CgmSensorResponse::class.java)
-                            val sensor = response.data?.firstOrNull()
-
-                            if (sensor != null && !sensor.startDate.isNullOrEmpty() && !sensor.endDate.isNullOrEmpty()) {
-                                val startDate = sensor.startDate
-                                val endDate = sensor.endDate
-                                val sensorId = sensor.sensorId
-
-                                println("Start Date: $startDate")
-                                println("End Date: $endDate")
-
-                                if (isCurrentDateInRange(startDate, endDate)) {
-
-                                    println("Current date is in range")
-
-                                    val pocDevice =
-                                        RepositoryDevice.getInstance(BApplication.getContext()).latestDeviceIoThread
-                                    if (pocDevice != null) {
-                                        if (pocDevice.isUnBind) {
-                                            postEventDataToAPI(
-                                                pocDevice,
-                                                DeviceStatus.TRANSMITTER_DISCONNECT.id,
-                                                pocDevice.qrMessage
-                                            )
-                                        } else {
-                                            postEventDataToAPI(
-                                                pocDevice,
-                                                DeviceStatus.TRANSMITTER_DISCONNECT.id,
-                                                sensorId
-                                            )
-                                        }
-                                    }
+                        if (sensor != null && !sensor.startDate.isNullOrEmpty() && !sensor.endDate.isNullOrEmpty()) {
+                            val startDate = sensor.startDate
+                            val endDate = sensor.endDate
+                            val sensorId = sensor.sensorId
+
+                            println("Start Date: $startDate")
+                            println("End Date: $endDate")
+
+                            if (isCurrentDateInRange(startDate, endDate)) {
+
+                                println("Current date is in range")
 
+                                val pocDevice =
+                                    RepositoryDevice.getInstance(BApplication.getContext()).latestDeviceIoThread
+                                if (pocDevice != null) {
+                                    if (pocDevice.isUnBind) {
+                                        postEventDataToAPI(
+                                            pocDevice,
+                                            DeviceStatus.TRANSMITTER_DISCONNECT.id,
+                                            pocDevice.qrMessage
+                                        )
+                                    }
                                 } else {
-                                    println("Current date is out of range")
+                                    postEventDataToAPI(
+                                        pocDevice,
+                                        DeviceStatus.TRANSMITTER_DISCONNECT.id,
+                                        sensorId
+                                    )
                                 }
+
                             } else {
-                                println("Start or End date not available")
+                                println("Current date is out of range")
                             }
+                        } else {
+                            println("Start or End date not available")
                         }
+                    }
 
-                        override fun onResponseFail() {
-                        }
+                    override fun onResponseFail() {
                     }
-                )
-            }
+                }
+            )
+
         } catch (e: Exception) {
             Log.e("observeTransmitterUnbindStatus", "observeTransmitterUnbindStatus: ${e.message}")
         }

package/ios/Database/KLTDatabaseHandler.m

@@ -130,6 +130,20 @@
     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;
@@ -137,13 +151,24 @@
     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];
         
@@ -153,11 +178,35 @@
             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;
+       
 
-        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));
+        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));
         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 */
@@ -172,11 +221,29 @@
     data.calibration = @(currentGlucose.BGMG);
     data.error = @(currentGlucose.errorCode);
     data.trend = @(currentGlucose.trend);
-    data.countdownDays = @(currentGlucose.countdownDays);
-    data.countdownHours = @(currentGlucose.countdownHours);
-    data.countdownMinutes = @(currentGlucose.countdownMinutes);
     
-    [Notification_Center postNotificationName:@"ErrorStatusFromTransmitter" object:data];
+    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)
+                           
+    ];
+    
+    
     [self.appDelegate saveContext];
     return glucose;
 }
@@ -267,7 +334,7 @@
     NSFetchRequest *request = [[NSFetchRequest alloc] init];
     NSPredicate *predicate;
     if (needUserBG) {
-        predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ && gluADC > 0 && gluADC != NIL AND isDelete == NIL",currentDevice.identifier, currentDevice.initialBeginDate];
+        predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ && userBG > 0 && userBG != NIL AND isDelete == NIL",currentDevice.identifier, currentDevice.initialBeginDate];
     } else {
         predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ AND isDelete == NIL",currentDevice.identifier, currentDevice.initialBeginDate];
     }
@@ -396,7 +463,7 @@
             ReceiveData *receiveModel = needUserBgs[i];
             bgToGlucoseIds[i] = receiveModel.glucoseId.intValue;
             bgValues[i] = roundf(receiveModel.userBG.floatValue * 18);
-            KLTLog(@"newBgToGlucoseIds: bgToGlucoseIds=%@, userBG=%@", receiveModel.glucoseId, receiveModel.userBG);
+            NSLog(@"newBgToGlucoseIds: bgToGlucoseIds=%@, userBG=%@", receiveModel.glucoseId, receiveModel.userBG);
         }
         data.newBgToGlucoseIds = bgToGlucoseIds;
         data.newBgToGlucoseIdsCount = (int)numberOfUserBgs;
@@ -411,7 +478,7 @@
     data.R = algo_r;
 
     CurrentGlucose *currentGlucose = [AlgorithmTools algorithmGlucose:data];
-    KLTLog(@"rerunADCAlgo: algorithm=%@, currentGlucose.errorCode = %@", @(data.algorithm), @(currentGlucose.errorCode));
+    NSLog(@"rerunADCAlgo: algorithm=%@, currentGlucose.errorCode = %@", @(data.algorithm), @(currentGlucose.errorCode));
     if (Iws != nil) {
         free(Iws);
         Iws = nil;

package/package.json

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