react-native-mytatva-rn-sdk 1.2.55 → 1.2.57

package/ios/Database/KLTBluetoothManager.m

@@ -317,6 +317,7 @@
         
         if ([command isEqualToString:@"06"]) {
             // 06：CT3初始化协议响应后发射低功耗
+            //After CT3 initialization protocol response, the transmitter enters low power mode.
             if ([ProtocalTools init_response:characteristic.value andEDevice:self.eDevice]) {
                 KLTLocalSettingManager.shareInstance.canConnectOtherDevice = NO;
                 
@@ -349,6 +350,7 @@
         if ([command isEqualToString:@"07"]) {
             // CT3/CT4 每3分钟上来的数据
             //Data uploaded every 3 minutes from CT3/CT4
+            KLTLog(@"==============>>> Data uploaded every 3 minutes from CT3/CT4");
             [self handleReceiveDataWithPrefix07:characteristic.value];
         }
 

package/ios/Database/KLTDatabaseHandler.m

@@ -253,9 +253,6 @@
     return resendDatas;
 }
 
-
-
-
 // 如果不是第一次连接发射器，更新device连接次数和连接时间
 - (void)updateDeviceWithDeviceId:(NSString *)identify
                      scannedTime:(NSString *)scannedTime
@@ -380,7 +377,6 @@
     allData = [allData sortedArrayUsingDescriptors:@[
         [NSSortDescriptor sortDescriptorWithKey:@"receiveDateTime" ascending:YES]
     ]];
-    
     return allData;
 }
 

package/ios/Database/KLTLocalSettingManager.h

@@ -31,9 +31,10 @@ 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
+//“Whether another transmitter can be connected”
+//NO – a transmitter is already bound.
+//YES – no transmitter is currently bound.
+
 @property (nonatomic, assign) BOOL canConnectOtherDevice;
 
 @end

package/ios/MyReactNativeBridge.m

@@ -541,8 +541,8 @@ RCT_EXPORT_METHOD(observeAllGlucoseData:(NSString *)token isForClearData:(BOOL)i
 
 RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token
                   response:(NSString *)responseJsonString
-                  patientId: (NSString *)patientId
-                  envType: (NSString *)envType
+                  patientId:(NSString *)patientId
+                  envType:(NSString *)envType
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     if (responseJsonString == nil || ![responseJsonString isKindOfClass:[NSString class]]) {
@@ -570,7 +570,7 @@ RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token
     [defaults synchronize];
 
     FinalViewModelManager *manager = [FinalViewModelManager shared];
-    [manager callForObserveTransmitterUnbindStatusWithCompletion:^(NSDictionary *response, NSError *error) {
+    [manager callForObserveTransmitterUnbindStatusWithCompletionWithPatientId:patientId completion:^(NSDictionary *response, NSError *error) {
         if (error) {
             reject([NSString stringWithFormat:@"%ld", (long)error.code], error.localizedDescription, error);
         } else {
@@ -582,4 +582,5 @@ RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token
 }
 
 
+
 @end

package/ios/ViewModel/FinalViewModel.swift

@@ -24,7 +24,10 @@ import Foundation
 //        }
 //    }
     
-    @objc public func callForObserveTransmitterUnbindStatusWithCompletion(
+    
+    @objc(callForObserveTransmitterUnbindStatusWithCompletionWithPatientId:completion:)
+    public func callForObserveTransmitterUnbindStatusWithCompletion(
+        patientId: String,
         _ completion: @escaping (_ finalResponse: [String: Any]?, _ error: Error?) -> Void
     ) {
         // Load JSON data from UserDefaults
@@ -41,7 +44,7 @@ import Foundation
         do {
             let json = try JSONSerialization.jsonObject(with: data, options: [])
             // Forward to actual handler, which includes a safety check
-            self.callForObserveTransmitterUnbindStatusWithResponse(json, completion: completion)
+            self.callForObserveTransmitterUnbindStatusWithResponse(patientId: patientId, json, completion: completion)
         } catch {
             completion(nil, NSError(domain: "SensorData", code: 405, userInfo: [NSLocalizedDescriptionKey: "Failed to parse cached JSON"]))
         }
@@ -49,6 +52,7 @@ import Foundation
 
 
     @objc public func callForObserveTransmitterUnbindStatusWithResponse(
+        patientId: String,
         _ response: Any,  // Changed from [String: Any] to Any to add type safety
         completion: @escaping (_ finalResponse: [String: Any]?, _ error: Error?) -> Void
     ) {
@@ -97,7 +101,7 @@ import Foundation
             "daysToExpire": daysToExpire
         ]
 
-        let finalResponse = self.evaluateUnbindStatus(response: baseResponse, startDate: startDate, endDate: endDate)
+        let finalResponse = self.evaluateUnbindStatus(response: baseResponse, startDate: startDate, endDate: endDate, sensorId: sensorId, patientId: patientId)
         completion(finalResponse, nil)
     }
 
@@ -105,7 +109,9 @@ import Foundation
     @objc public func evaluateUnbindStatus(
         response: [String: Any],
         startDate: String,
-        endDate: String
+        endDate: String,
+        sensorId: String,
+        patientId: String
     ) -> [String: Any] {
         let updatedResponse = response
 
@@ -124,7 +130,8 @@ import Foundation
                         viewModel.manager.startScan()
                         viewModel.debouncer.update(with: .transmitterDisconnect)
                     } else {
-                        
+                        UserDefaults.standard.set(sensorId, forKey: "sensorId")
+                        UserDefaults.standard.set(patientId, forKey: "patientId")
                     }
                 } else {
                     print("⚠️ currentDevice is nil")
@@ -155,6 +162,7 @@ class FinalViewModel: NSObject {
         super.init()
         debouncer.onDebounceSuccess = { value in
             print("Blutooth is------------------->>>>>>>>>> \(value)")
+            let envType = UserDefaults.standard.string(forKey: "envType") ?? "uat"
             API.shared.sendStatus(environment: .stage, status: value)
 //            if value == .errorCommon {
 //                self.manager.startScan()
@@ -349,6 +357,7 @@ class FinalViewModel: NSObject {
     private func uploadBatch(batches: [[GlucoseData]], index: Int) {
         guard index < batches.count else {
             if index != 0 {
+                print("Last batch ===>>> \(batches.last?.last)")
                 NotificationCenter.default.post(name: Notification.Name("CheckErrorStatusFromLastBatchData"), object: batches.last?.last)
             }
             print("✅ All batches uploaded")
@@ -356,7 +365,16 @@ class FinalViewModel: NSObject {
         }
 
         let batch = batches[index]
-        let cgmLogs = batch.map { ReceiveDataToLog(data: $0) }
+        
+        // Filter out data where gluADC is 0
+        let filteredBatch = batch.filter {
+            if let gluADC = $0.gluADC as? Int {
+                return gluADC != 0
+            }
+            return false
+        }
+        
+        let cgmLogs = filteredBatch.map { ReceiveDataToLog(data: $0) }
         let payload = Payload(logs: cgmLogs)
 
         print("====================================> called uploadBatch")
@@ -370,19 +388,34 @@ class FinalViewModel: NSObject {
             // Optionally retry or stop here
         }
     }
+
+    
+//    private func uploadBatch(batches: [[GlucoseData]], index: Int) {
+//        guard index < batches.count else {
+//            if index != 0 {
+//                print("Last batch ===>>> \(batches.last?.last)")
+//                NotificationCenter.default.post(name: Notification.Name("CheckErrorStatusFromLastBatchData"), object: batches.last?.last)
+//            }
+//            print("✅ All batches uploaded")
+//            return
+//        }
 //
-//    @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)
+//        let batch = batches[index]
+//        let cgmLogs = batch.map { ReceiveDataToLog(data: $0) }
+//        let payload = Payload(logs: cgmLogs)
+//
+//        print("====================================> called uploadBatch")
+//        API.shared.postCGMData(data: payload, environment: .stage) {
+//            print("====================================> uploaded successfully")
+//            print("✅ Batch \(index + 1) uploaded successfully")
+//            KLTDatabaseHandler.shared().deleteReceiveDataArray(batch)
+//            self.uploadBatch(batches: batches, index: index + 1)
+//        } onFailure: { error in
+//            print("❌ Failed to upload batch \(index + 1): \(String(describing: error?.localizedDescription))")
+//            // Optionally retry or stop here
 //        }
 //    }
+
     
     @objc func updateData(_ notification: Notification) {
         // Safely cast to [ReceiveData]
@@ -608,7 +641,6 @@ class FinalViewModel: NSObject {
         default:
             break
         }
-        
     }
 
     

package/package.json

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