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

package/ios/Database/KLTBluetoothManager.m

@@ -383,6 +383,7 @@
 #pragma mark - 发射器通用接受数据处理、算法计算处理
 
 // 发射器处理单条血糖数据的算法调用保存
+//Is the algorithm used by the transmitter to process a single glucose data point also responsible for saving it?
 - (void)handleCommonCT3GlucoseDataWithReceiveData:(ReceiveData *)receiveData {
     int glucoseId = receiveData.glucoseId.intValue;
     if (glucoseId >= self.eDevice.initNumber - 1) {
@@ -508,6 +509,7 @@
 }
 
 // CT3 CT4重传的数据，pullGlucose_series_request 22的返回
+//Retransmitted data from CT3 and CT4, response of pullGlucose_series_request 0x22
 - (void)handleResendDataWithPrefix22:(NSData *)resendData {
     NSArray<Glucose *> *glucoseList = [ProtocalTools getGlucose_series:resendData andEDevice:self.eDevice];
     if (glucoseList.count == 0) {
@@ -524,8 +526,7 @@
             self.isFromPrefix22 = YES;
             [self handleCommonCT3GlucoseDataWithReceiveData:receive];
         }
-        
-       
+    
         [Notification_Center postNotificationName:KLTUpdateDataNotify object:NULL];
         NSLog(@"----------------------------------------------called handleResendDataWithPrefix22 for KLTUpdateDataNotify");
         NSInteger maxGlucoseId = [KLTDatabaseHandler.shared getLatestAndMaxGlucoseIdOfDevice:self.currentDevice];

package/ios/Database/KLTDatabaseHandler.m

@@ -396,6 +396,7 @@
 }
 
 // 查询最近一次连接的最大的血糖ID
+//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) {
@@ -406,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];
@@ -415,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) {
@@ -459,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/Support/API.swift

@@ -10,6 +10,7 @@ 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-uat.mytatva.in/api/v8"
 
@@ -41,23 +42,23 @@ let envType = UserDefaults.standard.string(forKey: "envType") ?? "uat"
 
 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
@@ -97,6 +98,7 @@ class API {
     
     func postCGMData(
         data: Payload,
+        environment: TatvaEnvironment,
         token: String = TOKEN,
         encryptionKey: String = PROD_ENC_KEY,
         encryptionIv: String = PROD_ENC_IV,
@@ -124,6 +126,7 @@ class API {
                 }
                 
                 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)
                 }
@@ -131,10 +134,11 @@ class API {
                 var request = URLRequest(url: url)
                 request.httpMethod = "POST"
                 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 {
@@ -144,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)")
                     }
                     
                 }
@@ -165,13 +169,16 @@ 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 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"
@@ -179,15 +186,15 @@ class API {
         // Set headers
         request.addValue("text/plain", forHTTPHeaderField: "Content-Type")
         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

@@ -72,13 +72,15 @@ class AttachTransmitterViewController: UIViewController {
             print(data)
             print("===> all data count: ", data.count)
 //            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 })

package/ios/ViewModel/FinalViewModel.swift

@@ -153,7 +153,7 @@ class FinalViewModel: NSObject {
         super.init()
         debouncer.onDebounceSuccess = { value in
             print("Blutooth is------------------->>>>>>>>>> \(value)")
-            API.shared.sendStatus(status: value)
+            API.shared.sendStatus(environment: .stage, status: value)
 //            if value == .errorCommon {
 //                self.manager.startScan()
 //            }
@@ -331,7 +331,7 @@ class FinalViewModel: NSObject {
     }
     
    
-    func uploadData(data: [ReceiveData]) {
+    func uploadData(data: [GlucoseData]) {
         let batchSize = 40
         let batches = stride(from: 0, to: data.count, by: batchSize).map {
             Array(data[$0..<min($0 + batchSize, data.count)])
@@ -340,7 +340,7 @@ class FinalViewModel: NSObject {
         uploadBatch(batches: batches, index: 0)
     }
 
-    private func uploadBatch(batches: [[ReceiveData]], index: Int) {
+    private func uploadBatch(batches: [[GlucoseData]], index: Int) {
         guard index < batches.count else {
             print("====================================> All batches uploaded")
             print("✅ All batches uploaded")
@@ -352,7 +352,7 @@ class FinalViewModel: NSObject {
         let payload = Payload(logs: cgmLogs)
 
         print("====================================> called uploadBatch")
-        API.shared.postCGMData(data: payload) {//environment: .stage
+        API.shared.postCGMData(data: payload, environment: .stage) {
             print("====================================> uploaded successfully")
             print("✅ Batch \(index + 1) uploaded successfully")
             KLTDatabaseHandler.shared().deleteReceiveDataArray(batch)
@@ -362,19 +362,48 @@ class FinalViewModel: NSObject {
             // Optionally retry or stop here
         }
     }
-
+//
+//    @objc func updateData(_ notification: Notification) {
+//        let data = KLTDatabaseHandler.shared().queryAllReceiveData() as! [ReceiveData]
+//        print(data)
+//        print("===> all data count: ", data.count)
+////        KLTDatabaseHandler.shared().reloadQueryHistoryData()
+//        if let device = KLTBluetoothManager.shared().currentDevice {
+//            let arrayFromInitial = KLTDatabaseHandler.shared().queryGlucoseData(with: device) as! [GlucoseData]
+//            print(arrayFromInitial)
+//            print("======================> arrayFromInitial count: ", arrayFromInitial.count)
+//            self.uploadData(data: arrayFromInitial)
+//        }
+//    }
+    
     @objc func updateData(_ notification: Notification) {
-        let data = KLTDatabaseHandler.shared().queryAllReceiveData() as! [ReceiveData]
+        // Safely cast to [ReceiveData]
+        guard let data = KLTDatabaseHandler.shared().queryAllReceiveData() as? [ReceiveData] else {
+            print("⚠️ Failed to cast queryAllReceiveData() to [ReceiveData]")
+            return
+        }
+
         print(data)
-        print("===> all data count: ", data.count)
-//        KLTDatabaseHandler.shared().reloadQueryHistoryData()
-        if let device = KLTBluetoothManager.shared().currentDevice {
-            let arrayFromInitial = KLTDatabaseHandler.shared().queryReceiveData(with: device, needUserBG: true) as! [ReceiveData]
-            print(arrayFromInitial)
-            print("======================> arrayFromInitial count: ", arrayFromInitial.count)
-            self.uploadData(data: arrayFromInitial)
+        print("===> all data count: \(data.count)")
+
+        // Ensure device exists
+        guard let device = KLTBluetoothManager.shared().currentDevice else {
+            print("⚠️ No current device found")
+            return
+        }
+
+        // Get glucose data array
+        guard let arrayFromInitial = KLTDatabaseHandler.shared().queryGlucoseData(with: device) else {
+            print("⚠️ Failed to cast queryGlucoseData to [GlucoseData]")
+            return
         }
+
+        print("======================> arrayFromInitial count: \(arrayFromInitial.count)")
+
+        // Call upload
+        self.uploadData(data: arrayFromInitial)
     }
+
     
     @objc func errorStatusFromTransmitter(_ notification: Notification) {
         guard let receiveData = notification.object as? ReceiveData else { return }

package/package.json

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