react-native-mytatva-rn-sdk 1.2.52 → 1.2.54

package/ios/Database/KLTDatabaseHandler.m

@@ -118,6 +118,7 @@
 }
 
 // ------------- 保存血糖数据 -------------
+//Save blood glucose data
 - (GlucoseData *)addCT3GlucoseDataWithReceiveData:(ReceiveData *)data {
     GlucoseData *glucose = [NSEntityDescription insertNewObjectForEntityForName:@"GlucoseData" inManagedObjectContext:self.context];
     glucose.userBG = data.userBG;
@@ -130,20 +131,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 +138,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 +154,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 +173,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;
 }
@@ -304,7 +238,7 @@
 
 
 // 如果不是第一次连接发射器，更新device连接次数和连接时间
-- (void)updateDeviceWithDeviceId:(NSString *)identify 
+- (void)updateDeviceWithDeviceId:(NSString *)identify
                      scannedTime:(NSString *)scannedTime
                      connectTime:(NSString *)connectTime
                   disConnectTime:(NSString *)disconnectTime {
@@ -362,42 +296,56 @@
 
 // 根据条件查询Receivedata表
 
+//- (NSArray *)queryReceiveDataWithDevice:(Device *)currentDevice needUserBG:(BOOL)needUserBG {
+//    if (!self.context) {
+//        NSLog(@"Core Data context is nil");
+//        return @[];
+//    }
+//
+//    NSEntityDescription *entity = [NSEntityDescription entityForName:@"ReceiveDataInfo" inManagedObjectContext:self.context];
+//    if (!entity) {
+//        NSLog(@"Entity 'ReceiveDataInfo' not found in Core Data model");
+//        return @[];
+//    }
+//
+//    NSFetchRequest *request = [[NSFetchRequest alloc] init];
+//    request.entity = entity;
+//
+//    NSPredicate *predicate;
+//    if (needUserBG) {
+//        predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ AND gluADC > 0 AND gluADC != nil AND isDelete == nil", currentDevice.identifier, currentDevice.initialBeginDate];
+//    } else {
+//        predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ AND isDelete == nil", currentDevice.identifier, currentDevice.initialBeginDate];
+//    }
+//    request.predicate = predicate;
+//
+//    NSError *fetchError = nil;
+//    NSArray *resendDatas = [self.context executeFetchRequest:request error:&fetchError];
+//
+//    if (fetchError) {
+//        NSLog(@"❌ Fetch error: %@", fetchError.localizedDescription);
+//        return @[];
+//    }
+//
+//    resendDatas = [resendDatas sortedArrayUsingDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"receiveDateTime" ascending:YES]]];
+//    NSLog(@"📡 resendDatas: %@", resendDatas);
+//
+//    return resendDatas;
+//}
+
 - (NSArray *)queryReceiveDataWithDevice:(Device *)currentDevice needUserBG:(BOOL)needUserBG {
-    if (!self.context) {
-        NSLog(@"Core Data context is nil");
-        return @[];
-    }
-    
     NSEntityDescription *entity = [NSEntityDescription entityForName:@"ReceiveDataInfo" inManagedObjectContext:self.context];
-    if (!entity) {
-        NSLog(@"Entity 'ReceiveDataInfo' not found in Core Data model");
-        return @[];
-    }
-    
     NSFetchRequest *request = [[NSFetchRequest alloc] init];
-    request.entity = entity;
-
     NSPredicate *predicate;
     if (needUserBG) {
-        predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ AND gluADC > 0 AND gluADC != nil AND isDelete == nil", currentDevice.identifier, currentDevice.initialBeginDate];
+        predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ && userBG > 0 && userBG != NIL",currentDevice.identifier, currentDevice.initialBeginDate];
     } else {
-        predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@ AND isDelete == nil", currentDevice.identifier, currentDevice.initialBeginDate];
+        predicate = [NSPredicate predicateWithFormat:@"device.identifier = %@ AND initialBeginDate = %@",currentDevice.identifier, currentDevice.initialBeginDate];
     }
+    request.entity = entity;
     request.predicate = predicate;
-
-    NSError *fetchError = nil;
-    NSArray *resendDatas = [self.context executeFetchRequest:request error:&fetchError];
-    
-    if (fetchError) {
-        NSLog(@"❌ Fetch error: %@", fetchError.localizedDescription);
-        return @[];
-    }
-
+    NSArray *resendDatas = [self.context executeFetchRequest:request error:nil];
     resendDatas = [resendDatas sortedArrayUsingDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"receiveDateTime" ascending:YES]]];
-    NSLog(@"entity: %@", entity);
-    NSLog(@"predicate: %@", predicate);
-    NSLog(@"📡 resendDatas: %@", resendDatas);
-    
     return resendDatas;
 }
 
@@ -448,7 +396,7 @@
 }
 
 // 查询最近一次连接的最大的血糖ID
-//Query the highest blood glucose ID from the most recent connection
+//Query the highest glucose ID from the most recent connection.
 - (NSInteger)getLatestAndMaxGlucoseIdOfDevice:(Device *)currentDevice {
     NSArray *array = [self queryReceiveDataWithDevice:currentDevice needUserBG:NO];
     if (array.count > 0) {
@@ -459,6 +407,7 @@
 }
 
 // 获取距离某个设备的到期时间还剩多少数据没有接收完
+//Get how much data remains to be received before the device reaches its expiration time
 - (NSInteger)numberOfLifeCycleSensorWithDevice:(Device *)currentDevice endNumber:(int)endNumber {
     if (currentDevice) {
         NSArray *array = [self queryReceiveDataWithDevice:currentDevice needUserBG:NO];
@@ -468,7 +417,7 @@
 }
 
 #pragma mark - APP重启后需要手动调用历史数据
-
+//After restarting the app, is it necessary to manually request historical data?
 - (void)reloadQueryHistoryData {
     Device *currentDevice = KLTBluetoothManager.sharedManager.currentDevice;
     if (nil == currentDevice) {
@@ -512,6 +461,7 @@
     data.TsCount = (int)index + 1;
     
     // 校准后的点
+    //Point after calibration
     NSArray<ReceiveData*> *needUserBgs = [self queryReceiveDataWithDevice:currentDevice needUserBG:YES];
     NSUInteger numberOfUserBgs = needUserBgs.count;
     if (needUserBgs.count > 0) {

package/ios/Database/KLTLocalSettingManager.h

@@ -31,6 +31,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL hasNumberPrefix;
 
 // 是否能连其他发射器 NO:标识当前已绑定发射器 YES：当前未绑定发射器
+//Can other transmitters be connected
+//NO: Indicates that a transmitter is already bound
+//YES: Indicates that no transmitter is currently bound
 @property (nonatomic, assign) BOOL canConnectOtherDevice;
 
 @end

package/ios/MyReactNativeBridge.m

@@ -434,11 +434,14 @@ RCT_EXPORT_MODULE();
 }
 
 
-RCT_EXPORT_METHOD(startCgmTracky:(NSString *)token)
+RCT_EXPORT_METHOD(startCgmTracky:(NSString *)token  envType: (NSString *)envType)
 {
-  [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
-    [[NSUserDefaults standardUserDefaults] setBool:false forKey:@"isForReconnect"];
-  [[NSUserDefaults standardUserDefaults] synchronize];
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setObject:token forKey:@"authToken"];
+    [defaults setBool:false forKey:@"isForReconnect"];
+    [defaults setObject:envType forKey:@"envType"];
+    
+    [defaults synchronize];
 
   dispatch_async(dispatch_get_main_queue(), ^{
     UIWindow *keyWindow = [UIApplication sharedApplication].delegate.window;
@@ -459,12 +462,14 @@ RCT_EXPORT_METHOD(startCgmTracky:(NSString *)token)
 }
 
 
-RCT_EXPORT_METHOD(reconnectCgmTracky:(NSString *)token) {
+RCT_EXPORT_METHOD(reconnectCgmTracky:(NSString *)token  envType: (NSString *)envType) {
     NSLog(@"Received token: %@", token);
-
-    [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
-    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"isForReconnect"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
+    
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setObject:token forKey:@"authToken"];
+    [defaults setBool:YES forKey:@"isForReconnect"];
+    [defaults setObject:envType forKey:@"envType"];
+    [defaults synchronize];
 
     dispatch_async(dispatch_get_main_queue(), ^{
         UIWindow *keyWindow = [UIApplication sharedApplication].delegate.window;
@@ -506,10 +511,12 @@ RCT_EXPORT_METHOD(openHelpSupport)
   });
 }
 
-RCT_EXPORT_METHOD(observeAllGlucoseData:(NSString *)token)
+RCT_EXPORT_METHOD(observeAllGlucoseData:(NSString *)token isForClearData:(BOOL)isForClearData envType:(NSString *)envType)
 {
-     [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
-   [[NSUserDefaults standardUserDefaults] synchronize];
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setObject:token forKey:@"authToken"];
+    [defaults setObject:envType forKey:@"envType"];
+   [defaults synchronize];
     
     dispatch_async(dispatch_get_main_queue(), ^{
       UIWindow *keyWindow = [UIApplication sharedApplication].delegate.window;
@@ -534,6 +541,8 @@ RCT_EXPORT_METHOD(observeAllGlucoseData:(NSString *)token)
 
 RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token
                   response:(NSString *)responseJsonString
+                  patientId: (NSString *)patientId
+                  envType: (NSString *)envType
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     if (responseJsonString == nil || ![responseJsonString isKindOfClass:[NSString class]]) {
@@ -553,9 +562,12 @@ RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token
         return;
     }
 
-    [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
-    [[NSUserDefaults standardUserDefaults] setObject:data forKey:@"CGMStatusItem"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setObject:token forKey:@"authToken"];
+    [defaults setObject:data forKey:@"CGMStatusItem"];
+    [defaults setObject:patientId forKey:@"patientId"];
+    [defaults setObject:envType forKey:@"envType"];
+    [defaults synchronize];
 
     FinalViewModelManager *manager = [FinalViewModelManager shared];
     [manager callForObserveTransmitterUnbindStatusWithCompletion:^(NSDictionary *response, NSError *error) {

package/ios/Support/API.swift

@@ -10,8 +10,9 @@ import CommonCrypto
 
 let PROD_API_KEY = "lChjFRJce3bxmoS3TSQk5w=="
 let STAGE_API_KEY = "lChjFRJce3bxmoS3TSQk5w=="
+
 let PROD_BASE_URL = "https://api.mytatva.in/api/v8"
-let STAGE_BASE_URL = "https://api-feature2.mytatva.in/api/v8"
+let STAGE_BASE_URL = "https://api-uat.mytatva.in/api/v8"
 
 
 let PROD_ENC_KEY = "9Ddyaf6rfywpiTvTiax2iq6ykKpaxgJ6"
@@ -23,7 +24,7 @@ let STAGE_ENC_IV = "9Ddyaf6rfywpiTvT"
 
 let defaultToken = "ILtFcw+xtbuy8IgsBCSyD6nSpgZd5AOz7T+g3N8Tef/INZi+dxwPJhnBc2kfdq2e8Kw2yayjaKjuji64coUJsK7e4QcF7sqXCp3Cy5S2OVE+hONwCipkrn9d1yjsBWIDqfLK9ModJCWdigDj5ZeSwkWYSSeTEVoN3Dc2Y8cuqKUQvN9ZcNGmdRrXz2oo3rm4EHQrXPo1Ijufm0HfcqzSH/Gh0TC5gFKjde/GEXIm5Z2Ju1/TTXVSJg/zxNuOF4iUKNEh4UIFUYxYpnqlALRCdF75J+9WAZ7/LBGyB1Wrx+D7bsrzRiQ5sCTwxE3TCM3s66lYJizX22VIzYKOIrJ6GTOYGTINHeIJKEPEvFceR+cG54ez15V1r77ErQElevItD3xIGe0uDezfnixJYPxPhSEOPOyIpxUFInXBRdGjllHPIevzBqqHeP76nz+1U7mFNs1kofugN+5huT3/tCifTQqFyWuxD+VIhl0UJxhxPMbBgoryANgKCToWrK2FqdJwBtZKwCj3S+yp0rff0fwrbMXXsYytJyVLLY2oNviHtzDa/kih0AnMA3vEbqYkf1PQ6LZv+AmtpNYHKh7kMDrhVE3wVxH4+ga0+sfuxYgfiZXCoQW7yY0wOZTiFbgvL2TQflDZR6ttK5abtyKYV4gl5KqbFLZW+d4pKLQoZb02NbJc+5h5gAH2VclTJc6fbkd0qIWuXyqGIBEc2uYrNl2v3vmVvbcGevSqb900ozo6SbFccQLjLcEon+okmgBIDPvBEZFj8fZgQV4z8/yzayDcfqZQPc9Wrw8JNrFLCd8emvo7QHFfGttnIsAtmR8Yp3x49sjEn3hFW6nEKl9FRtRT1r3LzHmIdokL5tz3nO/T3FzLn5sqfp5QBJKKK2dgJdmAz0KC6vKtJ0PtVR4shL7pqjoZuJimFObYKyQbQudW7gLH8WjqORNG2dsplOLzDQ0y7nQdQ0tWrLJtnAch0p5PyTXtunlkNWeuzrldkqVMTUPaAtGcEnmS4RFncD3C6sq9V6lpBKLdrh99vnH3EX81DTH2Hrqm0bN5Tl3UqzUJ7n/JQCR3phDmOo+Uk81y3z3ikiGZZpZikN7c3DtSP34Vc+cNUosWrChqj1gLL4Eg/jMDxE4+bdAGr03ALxEAj2uLGEsDaZRuio6e8/iMcA0z3oqhtAxQ0nU1ivAK7cHeddjRFtvrNb0l+TgrcQI9UVffMOoGDEfAQNUpT2+R5dIysw=="
 let TOKEN = UserDefaults.standard.string(forKey: "authToken") ?? defaultToken
-
+let envType = UserDefaults.standard.string(forKey: "envType") ?? "uat"
 
 /*TatvaEncryptionConfig {
  const val STAGE_BASE_URL = "https://api-feature2.mytatva.in/api/v8"
@@ -41,23 +42,23 @@ let TOKEN = UserDefaults.standard.string(forKey: "authToken") ?? defaultToken
 
 struct CGMLog: Codable {
     let timeInMillis: Double
-    let countdownMinutes: Int
-    let countdownDays: Int
+ //   let countdownMinutes: Int
+   // let countdownDays: Int
     let hypoglycemiaEarlyWarnMinutes: Int
     let showGlucoseMG: Int
-    let glucoseId: Int
+   // let glucoseId: Int
     let name: String
     let bytes: [Int]
     let showGlucose: Float
     let Ib: Float
     let Iw: Float
-    let countdownHours: Int
+  //  let countdownHours: Int
     let T: Float
-    let year: Int32
-    let month: Int32
-    let day: Int32
-    let hour: Int32
-    let minute: Int32
+//    let year: Int32
+//    let month: Int32
+//    let day: Int32
+//    let hour: Int32
+//    let minute: Int32
     let trendObject: TrendObject
     let glucoseStatusObject: GlucoseStatusObject
     let errorObject: ErrorObject
@@ -96,14 +97,14 @@ class API {
     private init() {}
     
     func postCGMData(
-        environment: TatvaEnvironment,
         data: Payload,
+        environment: TatvaEnvironment,
         token: String = TOKEN,
         encryptionKey: String = PROD_ENC_KEY,
         encryptionIv: String = PROD_ENC_IV,
         onSuccess: @escaping () -> Void,
         onFailure: @escaping (Error?) -> Void
-    ) {
+    ) {// environment: TatvaEnvironment,
         
         print("ios token:", token)
         Task {
@@ -124,18 +125,20 @@ class API {
                     print("===>Decrypted (for verification): \(decrypted)")
                 }
                 
-                let urlString = (environment == .prod ? PROD_BASE_URL : STAGE_BASE_URL) + "/cgm/logs"
+                let urlString = (envType.lowercased() == "uat" ?  STAGE_BASE_URL : PROD_BASE_URL) + "/cgm/logs"
+              //  let urlString = (environment == .stage ?  STAGE_BASE_URL : PROD_BASE_URL) + "/cgm/logs"
                 guard let url = URL(string: urlString) else {
                     throw URLError(.badURL)
                 }
                 
                 var request = URLRequest(url: url)
                 request.httpMethod = "POST"
-                request.setValue(environment == .prod ? PROD_API_KEY : STAGE_API_KEY, forHTTPHeaderField: "api-key")
+                request.setValue(envType.lowercased() == "uat" ?  STAGE_API_KEY : PROD_API_KEY, forHTTPHeaderField: "api-key")
+               // request.setValue(environment == .stage ?  STAGE_API_KEY : PROD_API_KEY, forHTTPHeaderField: "api-key")
                 request.setValue(token, forHTTPHeaderField: "token")
                 request.setValue("text/plain", forHTTPHeaderField: "Content-Type")
                 request.httpBody = encrypted.data(using: .utf8)
-                
+                print("===>url:", urlString)
                 let (data, response) = try await URLSession.shared.data(for: request)
                 
                 if let httpResponse = response as? HTTPURLResponse {
@@ -145,7 +148,7 @@ class API {
                 if let responseStr = String(data: data, encoding: .utf8) {
                     print("===>Server Response: \(responseStr)")
                     if let decrypted = Crypto.shared.getDecryptedData(cipherText: responseStr, encryptionKey: encryptionKey, encryptionIv: encryptionIv) {
-                        print("===>Decrypted response (for verification): \(decrypted)")
+                        print("===>Decrypted post cgm data response (for verification): \(decrypted)")
                     }
                     
                 }
@@ -166,28 +169,32 @@ class API {
     //addCT3GlucoseDataWithReceiveData
     //updatePOCAlgoBeforeRef
     func sendStatus(sensorId: String = UserDefaults.standard.string(forKey: "sensorId") ?? "",
+                    environment: TatvaEnvironment,
                     status: CGMConnectionStatus,
                     transmitterName: String = KLTBluetoothManager.shared().currentDevice?.advertise?.localName ?? "",
                     encryptionKey: String = PROD_ENC_KEY,
                     encryptionIv: String = PROD_ENC_IV) {
         if sensorId.isEmpty { return }
-       
-        let url = URL(string: "https://api-feature2.mytatva.in/api/v8/cgm/connection")!
+       // let envType = UserDefaults.standard.string(forKey: "envType") ?? "uat"
+        print("envType: \(envType.lowercased())")
+        let urlString = (envType.lowercased() == "uat" ? STAGE_BASE_URL : PROD_BASE_URL) + "/cgm/connection"
+        //let urlString = (environment == .stage ? STAGE_BASE_URL : PROD_BASE_URL) + "/cgm/connection"
+        let url = URL(string: urlString)!
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
         
         // Set headers
         request.addValue("text/plain", forHTTPHeaderField: "Content-Type")
-        request.addValue(PROD_API_KEY, forHTTPHeaderField: "api-key")
+        request.setValue(envType.lowercased() == "uat" ?  STAGE_API_KEY : PROD_API_KEY, forHTTPHeaderField: "api-key")
+        //request.setValue(environment == .stage ?  STAGE_API_KEY : PROD_API_KEY, forHTTPHeaderField: "api-key")
         request.addValue(TOKEN, forHTTPHeaderField: "token")
-        print("===>url:", "https://api-feature2.mytatva.in/api/v8/cgm/connection")
+        print("===>url:", urlString)
         print("===>api-key:", PROD_API_KEY)
         print("===>httpmMethod:","POST")
         print("===>ios token:", TOKEN)
         // Set request body
         let json: [String: Any] = [
             "sensorId": sensorId,
-           // "sensorName": sensorId,
             "status": status.rawValue,
             "rawData": [
                 "transmitterName": transmitterName,
@@ -222,7 +229,7 @@ class API {
             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)")
+                    print("===>Decrypted connection api response (for verification): \(decrypted)")
                 }
             }
         }

package/ios/Support/Converter/DataConverter.swift

@@ -7,28 +7,43 @@
 
 import Foundation
 
-func ReceiveDataToLog(data: ReceiveData) -> CGMLog  {
+func ReceiveDataToLog(data: GlucoseData) -> CGMLog {
+    let cgmLogs = CGMLog(
+        timeInMillis: Double(Date().timeIntervalSince1970 * 1000),
+      //  countdownMinutes: (data.countdownMinutes as? Int) ?? 0,
+       // countdownDays: (data.countdownDays as? Int) ?? 0,
+        hypoglycemiaEarlyWarnMinutes: 0,  // still missing, you can map if available
+        showGlucoseMG: (data.gluADC as? Int) ?? 0,
+      //  glucoseId: Int(truncating: data.glucoseId ?? 0),
+        name: data.device?.advertise?.localName ?? "",
+        bytes: [],  // still missing: need raw data source
+        showGlucose: (data.glu as? Float) ?? 0,
+        Ib: (data.blankCurrent as? Float) ?? 0,
+        Iw: (data.operatingCurrent as? Float) ?? 0,
+     //   countdownHours: (data.countdownHours as? Int) ?? 0,
+        T: (data.temperature as? Float) ?? 0.0,
+//        year: (data.year as? Int32) ?? 0,
+//        month: (data.month as? Int32) ?? 0,
+//        day: (data.day as? Int32) ?? 0,
+//        hour: (data.hour as? Int32) ?? 0,
+//        minute: (data.minute as? Int32) ?? 0,
+        
+        trendObject: TrendObject(
+            trendId: (data.trend as? Int) ?? 0,
+            drawableId: 2103818652,  // customize if needed
+            widgetImg: -1,
+            apsChangeRate: "FLAT"  // you could map a real value if available
+        ),
+
+        glucoseStatusObject: GlucoseStatusObject(
+            statusId: 1  // you may derive this from a field like `calibrationStatus`
+        ),
+
+        errorObject: ErrorObject(
+            errorId: (data.errorCode as? Int) ?? 0,
+            sound: "None"
+        )
+    )
     
-    let cgmLogs = CGMLog(timeInMillis: Double(Date().timeIntervalSince1970 * 1000),
-                         countdownMinutes: (data.countdownMinutes as? Int) ?? 0,
-                         countdownDays: (data.countdownDays as? Int) ?? 0,
-                         hypoglycemiaEarlyWarnMinutes: 0, //missing
-                         showGlucoseMG: (data.gluADC as? Int) ?? 0,
-                         glucoseId: Int(truncating: data.glucoseId ?? 0),
-                         name: data.device?.advertise?.localName ?? "",
-                         bytes: [], //missing
-                         showGlucose: (data.glu as? Float) ?? 0 ,
-                         Ib: (data.blankCurrent as? Float) ?? 0,
-                         Iw: (data.operatingCurrent as? Float) ?? 0,
-                         countdownHours: (data.countdownHours as? Int) ?? 0,
-                         T: (data.temperature as? Float) ?? 0.0,
-                         year: (data.year as? Int32) ?? 0,
-                         month: (data.month as? Int32) ?? 0,
-                         day: (data.day as? Int32) ?? 0,
-                         hour: (data.hour as? Int32) ?? 0,
-                         minute: (data.minute as? Int32) ?? 0,
-                         trendObject: TrendObject(trendId: (data.trend as? Int) ?? 0, drawableId: 2103818652, widgetImg: -1, apsChangeRate: "FLAT"),  //missing
-                         glucoseStatusObject: GlucoseStatusObject(statusId: 1),  //missing
-                         errorObject: ErrorObject(errorId: (data.error as? Int) ?? 0, sound: "None"))
     return cgmLogs
 }

package/ios/ViewControllers/AttachTransmitterViewController.swift

@@ -71,14 +71,16 @@ class AttachTransmitterViewController: UIViewController {
             let data = KLTDatabaseHandler.shared().queryAllReceiveData() as! [ReceiveData]
             print(data)
             print("===> all data count: ", data.count)
-            KLTDatabaseHandler.shared().reloadQueryHistoryData()
+//            KLTDatabaseHandler.shared().reloadQueryHistoryData()
+            
             if let device = KLTBluetoothManager.shared().currentDevice {
-                let arrayFromInitial = KLTDatabaseHandler.shared().queryReceiveData(with: device, needUserBG: true) as! [ReceiveData]
+                let arrayFromInitial = KLTDatabaseHandler.shared().queryGlucoseData(with: device) as! [GlucoseData]
                 print(arrayFromInitial)
                 print("===> arrayFromInitial count: ", arrayFromInitial.count)
                 
                 self.viewModel.uploadData(data: arrayFromInitial)
             }
+            
             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 })