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

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

@@ -63,7 +63,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
     var authenticateSDKService: AuthenticateSDKService
     private val job = Job()
     private val scope = CoroutineScope(Dispatchers.IO + job)
-    var prefsHelper: SharedPreferencesLibraryUtil
+    var prefsHelper: SharedPreferencesLibraryUtil? = null
     private val apiScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
     private var debounceJob: Job? = null
     private var isBatchProcessing = false
@@ -184,18 +184,17 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                     }
                   }
                 )*/
-
                 val response = Gson().fromJson(apiResponse, 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
                     val currentPatientId = patientId
-
-                    val lastPatientId = prefsHelper.lastPatientId
-                    val lastSensorId = prefsHelper.qrInformation.sensor
+                    val lastPatientId = prefsHelper?.lastPatientId
+                    val lastSensorId = prefsHelper?.qrInformation?.sensor
 
                     if (lastPatientId != null && lastSensorId != null && (lastPatientId != currentPatientId || lastSensorId != sensorId)) {
                         mModel.clearAllGlucoseAndDeviceData()
@@ -216,8 +215,8 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                                     pocDevice.qrMessage, envType
                                 )
                             } else {
-                                prefsHelper.lastPatientId = currentPatientId
-                                prefsHelper.qrInformation.sensor = sensorId
+                                prefsHelper?.lastPatientId = currentPatientId
+                                prefsHelper?.qrInformation?.sensor = sensorId
                             }
                         } else {
                             postEventDataToAPI(
@@ -425,7 +424,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                     val currentTime = System.currentTimeMillis()
                     var dataAge = System.currentTimeMillis()
 
-                    val lastSyncData = prefsHelper.lastSyncData
+                    val lastSyncData = prefsHelper?.lastSyncData
                     val currentSyncTimeInMillis = lastSyncData?.timeInMillis
 
                     if (lastSyncData != null) {
@@ -606,7 +605,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
 
                 Handler(Looper.getMainLooper()).postDelayed({
                     try {
-                        val lastSyncData = prefsHelper.lastSyncData
+                        val lastSyncData = prefsHelper?.lastSyncData
                         Log.d("lastSyncData: ", Gson().toJson(lastSyncData).toString())
 
                         val currentTime = System.currentTimeMillis()
@@ -720,7 +719,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
             lastDeviceStatus = null
 
             // Clear any cached data if needed
-            prefsHelper.clearQRInformation() // if you have such method
+            prefsHelper?.clearQRInformation() // if you have such method
 
             // Reset last processed sync time
             lastProcessedSyncTimeInMillis = null
@@ -915,7 +914,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                     it.deviceId,
                     it.glucoseId
                 )
-                prefsHelper.lastSyncData = syncData
+                prefsHelper?.lastSyncData = syncData
                 lastProcessedSyncTimeInMillis = null
                 Log.d(
                     "Sync Metadata",

package/ios/Database/GlucoseData+CoreDataProperties.h

@@ -31,7 +31,17 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nullable, nonatomic, copy) NSNumber *trend;
 @property (nullable, nonatomic, copy) NSNumber *userBG;
 @property (nullable, nonatomic, retain) Device *device;
-
+@property (nullable, nonatomic, copy) NSNumber *glucoseId;
+@property (nullable, nonatomic, copy) NSNumber *isDelete;
+@property (nullable, nonatomic, copy) NSNumber *year;
+@property (nullable, nonatomic, copy) NSNumber *countdownDays;
+@property (nullable, nonatomic, copy) NSNumber *countdownHours;
+@property (nullable, nonatomic, copy) NSNumber *countdownMinutes;
+@property (nullable, nonatomic, copy) NSNumber *minute;
+@property (nullable, nonatomic, copy) NSNumber *month;
+@property (nullable, nonatomic, copy) NSNumber *day;
+@property (nullable, nonatomic, copy) NSNumber *hour;
+@property (nullable, nonatomic, copy) NSNumber *error;
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/Database/GlucoseData+CoreDataProperties.m

@@ -24,11 +24,21 @@
 @dynamic initialBeginDate;
 @dynamic iw;
 @dynamic k;
+@dynamic error;
 @dynamic operatingCurrent;
 @dynamic receiveDateTime;
 @dynamic temperature;
 @dynamic trend;
 @dynamic userBG;
 @dynamic device;
-
+@dynamic year;
+@dynamic countdownDays;
+@dynamic countdownHours;
+@dynamic countdownMinutes;
+@dynamic isDelete;
+@dynamic glucoseId;
+@dynamic minute;
+@dynamic month;
+@dynamic day;
+@dynamic hour;
 @end

package/ios/Database/KLTDatabaseHandler.m

@@ -63,7 +63,7 @@
     data.countdownHours = @(currentGlucose.countdownHours);
     data.countdownMinutes = @(currentGlucose.countdownMinutes);
     
-    [Notification_Center postNotificationName:@"ErrorStatusFromTransmitter" object:data];
+   // [Notification_Center postNotificationName:@"ErrorStatusFromTransmitter" object:data];
     [self.appDelegate saveContext];
 }
 
@@ -123,6 +123,8 @@
     GlucoseData *glucose = [NSEntityDescription insertNewObjectForEntityForName:@"GlucoseData" inManagedObjectContext:self.context];
     glucose.userBG = data.userBG;
     glucose.dataId = data.glucoseId;
+    glucose.device = data.device;
+    glucose.isDelete = 0;
     
     glucose.receiveDateTime = [NSString stringWithFormat:@"%@-%02d-%02d %02d:%02d",data.year,[data.month intValue],[data.day intValue],[data.hour intValue],[data.minute intValue]];
     glucose.initialBeginDate = data.device.initialBeginDate;
@@ -177,7 +179,20 @@
     data.countdownHours = @(currentGlucose.countdownHours);
     data.countdownMinutes = @(currentGlucose.countdownMinutes);
     
-    [Notification_Center postNotificationName:@"ErrorStatusFromTransmitter" object:data];
+    glucose.countdownDays = @(currentGlucose.countdownDays);
+    glucose.countdownHours = @(currentGlucose.countdownHours);
+    glucose.countdownMinutes = @(currentGlucose.countdownMinutes);
+    glucose.year = data.year;
+    glucose.glucoseId = data.glucoseId;
+    glucose.month = data.month;
+    glucose.day = data.day;
+    glucose.minute = data.minute;
+    glucose.hour = data.hour;
+    glucose.error = data.error;
+    
+  //  [Notification_Center postNotificationName:@"ErrorStatusFromTransmitter" object: glucose];
+    [Notification_Center postNotificationName:@"CheckErrorStatusFromLastBatchData" object: glucose];
+    
     [self.appDelegate saveContext];
     return glucose;
 }
@@ -216,7 +231,7 @@
     // 🖨️ Add single-line logging for each GlucoseData entry
     NSLog(@"==== GlucoseData (Fetched %lu records) for Device: %@ ====", (unsigned long)resendDatas.count, currentDevice.identifier);
     for (GlucoseData *g in resendDatas) {
-        NSLog(@"[ID:%@] Date:%@ | glu:%@ mmol/L | gluADC:%@ mg/dL | BG:%@ | T:%@°C | Ib:%@ | Iw:%@ | Trend:%@ | Err:%@ | CalStatus:%@",
+        NSLog(@"[ID:%@] Date:%@ | glu:%@ mmol/L | gluADC:%@ mg/dL | BG:%@ | T:%@°C | Ib:%@ | Iw:%@ | Trend:%@ | Err:%@ | CalStatus:%@ | countdownMinut:%@ | countdownHours:%@ | countdownDays:%@" ,
               g.dataId,
               g.receiveDateTime,
               g.glu,
@@ -227,7 +242,11 @@
               g.operatingCurrent,
               g.trend,
               g.errorCode,
-              g.calibrationStatus
+              g.calibrationStatus,
+              g.countdownMinutes,
+              g.countdownHours,
+              g.countdownDays
+              
         );
     }
 

package/ios/Database/MyTatva.xcdatamodeld/MyTatva.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23605" systemVersion="24C101" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23788.4" systemVersion="24F74" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
     <entity name="Advertise" representedClassName="Advertise" syncable="YES">
         <attribute name="advertiseDateTime" optional="YES" attributeType="String"/>
         <attribute name="isConnectable" optional="YES" attributeType="Boolean" usesScalarValueType="NO"/>
@@ -24,18 +24,29 @@
     <entity name="GlucoseData" representedClassName="GlucoseData" syncable="YES">
         <attribute name="blankCurrent" optional="YES" attributeType="Double" defaultValueString="0" usesScalarValueType="NO"/>
         <attribute name="calibrationStatus" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="countdownDays" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="countdownHours" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="countdownMinutes" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="dataId" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="NO"/>
+        <attribute name="day" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="error" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="errorCode" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
         <attribute name="glu" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO"/>
         <attribute name="gluADC" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="glucoseId" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="hour" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="initialBeginDate" optional="YES" attributeType="String"/>
+        <attribute name="isDelete" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="iw" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO"/>
         <attribute name="k" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="minute" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="month" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="operatingCurrent" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO"/>
         <attribute name="receiveDateTime" optional="YES" attributeType="String"/>
         <attribute name="temperature" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO"/>
         <attribute name="trend" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO"/>
         <attribute name="userBG" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO"/>
+        <attribute name="year" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
         <relationship name="device" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Device"/>
     </entity>
     <entity name="ReceiveDataInfo" representedClassName="ReceiveData" syncable="YES">

package/ios/Support/API.swift

@@ -42,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

package/ios/Support/Converter/DataConverter.swift

@@ -10,23 +10,23 @@ import Foundation
 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,
+        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),
+        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,
+        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,
+        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,

package/ios/ViewControllers/ConnectToSensorViewController.swift

@@ -214,6 +214,7 @@ class ConnectToSensorViewController: UIViewController {
     
     func connectSensor(value: String, controller: ConnectToSensorViewController) {
         UserDefaults.standard.set(value, forKey: "sensorId")
+        
         var isMatch = false
         
         var regex = #"^[A-Z0-9][0-9](0[1-9]|[1-9][0-9]|[A-Z][1-9A-Z])(00[1-9]|0[1-9][0-9]|[1-9][0-9][0-9]){2}[0-9]{4,5}[0-9A-Z]{3}$"#

package/ios/ViewModel/FinalViewModel.swift

@@ -123,6 +123,8 @@ import Foundation
                     if device.connectedDateTime == nil && device.disconnectedDateTime == nil {
                         viewModel.manager.startScan()
                         viewModel.debouncer.update(with: .transmitterDisconnect)
+                    } else {
+                        
                     }
                 } else {
                     print("⚠️ currentDevice is nil")
@@ -311,11 +313,13 @@ class FinalViewModel: NSObject {
         
         NotificationCenter.default.addObserver(self, selector: #selector(bluetoothEnable(_:)), name: NSNotification.Name("BluetoothEnable"), object: nil)
         
-        NotificationCenter.default.addObserver(self, selector: #selector(errorStatusFromTransmitter(_:)), name: NSNotification.Name("ErrorStatusFromTransmitter"), object: nil)
+      //  NotificationCenter.default.addObserver(self, selector: #selector(errorStatusFromTransmitter(_:)), name: NSNotification.Name("ErrorStatusFromTransmitter"), object: nil)
         
         NotificationCenter.default.addObserver(self, selector: #selector(handleLatestReceiveData(_:)), name: NSNotification.Name(KLTAlertCurrentInInitialNotify), object: nil)
         
         NotificationCenter.default.addObserver(self, selector: #selector(updateData(_:)), name: NSNotification.Name(KLTUpdateDataNotify), object: nil)
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(checkErrorStatusFromLastBatchData(_:)), name: NSNotification.Name("CheckErrorStatusFromLastBatchData"), object: nil)
     }
 
     func removeAllObservers() {
@@ -323,11 +327,13 @@ class FinalViewModel: NSObject {
         
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name("BluetoothEnable"), object: nil)
         
-        NotificationCenter.default.removeObserver(self, name: NSNotification.Name("ErrorStatusFromTransmitter"), object: nil)
+       // NotificationCenter.default.removeObserver(self, name: NSNotification.Name("ErrorStatusFromTransmitter"), object: nil)
         
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name(KLTAlertCurrentInInitialNotify), object: nil)
         
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name(KLTUpdateDataNotify), object: nil)
+        
+        NotificationCenter.default.removeObserver(self, name: NSNotification.Name("CheckErrorStatusFromLastBatchData"), object: nil)
     }
     
    
@@ -342,7 +348,9 @@ class FinalViewModel: NSObject {
 
     private func uploadBatch(batches: [[GlucoseData]], index: Int) {
         guard index < batches.count else {
-            print("====================================> All batches uploaded")
+            if index != 0 {
+                NotificationCenter.default.post(name: Notification.Name("CheckErrorStatusFromLastBatchData"), object: batches.last?.last)
+            }
             print("✅ All batches uploaded")
             return
         }
@@ -404,9 +412,8 @@ class FinalViewModel: NSObject {
         self.uploadData(data: arrayFromInitial)
     }
 
-    
-    @objc func errorStatusFromTransmitter(_ notification: Notification) {
-        guard let receiveData = notification.object as? ReceiveData else { return }
+    @objc func checkErrorStatusFromLastBatchData(_ notification: Notification) {
+        guard let receiveData = notification.object as? GlucoseData else { return }
 
         let errorCode = ErrorCode(rawValue: Int32(receiveData.error?.intValue ?? 0))
         if errorCode == ErrorCode.ERROR_CODE_FLOODING_WATER {
@@ -425,6 +432,26 @@ class FinalViewModel: NSObject {
         }
     }
     
+//    @objc func errorStatusFromTransmitter(_ notification: Notification) {
+//        guard let receiveData = notification.object as? ReceiveData else { return }
+//
+//        let errorCode = ErrorCode(rawValue: Int32(receiveData.error?.intValue ?? 0))
+//        if errorCode == ErrorCode.ERROR_CODE_FLOODING_WATER {
+//            debouncer.update(with: CGMConnectionStatus.moistureDetect)
+//            //API.shared.sendStatus(status: .moistureDetect)
+//        } else if errorCode == ErrorCode.ERROR_CODE_CURRENT_SMALL || errorCode == ErrorCode.ERROR_CODE_NOISE || errorCode == ErrorCode.ERROR_CODE_SENSITIVITY_ATTENUATION {
+//            debouncer.update(with: CGMConnectionStatus.weakSignal)
+//            //API.shared.sendStatus(status: .weakSignal)
+//        } else if errorCode != ErrorCode.ERROR_CODE_NONE {
+//            debouncer.update(with: CGMConnectionStatus.errorCommon)
+//            //API.shared.sendStatus(status: .errorCommon)
+//        }
+//        if receiveData.countdownDays == 0 && receiveData.countdownHours == 0 && receiveData.countdownMinutes == 0 {
+//            debouncer.update(with: CGMConnectionStatus.expired)
+//            //API.shared.sendStatus(status: .expired)
+//        }
+//    }
+    
     @objc func handleLatestReceiveData(_ notification: Notification) {
         print("====> handleLatestReceiveData")
         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.54",
+  "version": "1.2.55",
   "description": "a package to inject data into visit health pwa",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",