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

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

@@ -289,7 +289,7 @@
     allData = [allData sortedArrayUsingDescriptors:@[
         [NSSortDescriptor sortDescriptorWithKey:@"receiveDateTime" ascending:YES]
     ]];
-
+    
     return allData;
 }
 

package/ios/Support/API.swift

@@ -230,7 +230,7 @@ class API {
         
     }
     
-    func getStatus(encryptionKey: String = PROD_ENC_KEY,
+    /*func getStatus(encryptionKey: String = PROD_ENC_KEY,
                    encryptionIv: String = PROD_ENC_IV) {
         print("ios token:", TOKEN)
         let url = URL(string: "https://api-feature2.mytatva.in/api/v8/cgm/status")!
@@ -289,7 +289,7 @@ class API {
         }
         task.resume()
         
-    }
+    }*/
     
     // Example date range check function (assumes yyyy-MM-dd format)
     func isCurrentDateInRange(startDate: String, endDate: String) -> Bool {

package/ios/ViewModel/FinalViewModel.swift

@@ -17,7 +17,7 @@ import Foundation
     @objc public func callForObserveTransmitterUnbindStatus() {
         let sensorID = UserDefaults.standard.string(forKey: "sensorId") ?? ""
         if !sensorID.isEmpty {
-            API.shared.getStatus()
+            viewModel.getStatus()
         }
     }
 }
@@ -43,15 +43,16 @@ class FinalViewModel: NSObject {
      }
 
     @objc public func initialize() {
-  
+        //getStatus()
         startCountDown()
     
         if ((manager.connectedPeripheral == nil) && !KLTLocalSettingManager.shareInstance().canConnectOtherDevice) {
             manager.startScan()
+            debouncer.update(with: .disconnected)
         }  else {
             print("here")
             //debouncer.update(with: .connected)
-            //API.shared.sendStatus(status: .connected)
+            //API.shared.sendStatus(status: .connected) 计算 算法入参
             if let last = manager.currentDevice { }
             else {
                 //self.manager.closeBleSensor()
@@ -61,6 +62,93 @@ class FinalViewModel: NSObject {
             }
         }
     }
+    func getStatus(encryptionKey: String = PROD_ENC_KEY,
+                   encryptionIv: String = PROD_ENC_IV) {
+        print("ios token:", TOKEN)
+        let url = URL(string: "https://api-feature2.mytatva.in/api/v8/cgm/status")!
+        var request = URLRequest(url: url)
+        request.httpMethod = "GET"
+        
+        // Set headers
+        //request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.addValue(PROD_API_KEY, forHTTPHeaderField: "api-key")
+        request.addValue(TOKEN, forHTTPHeaderField: "token")
+        
+      
+        // Set request body
+        
+        // Perform request
+        let task = URLSession.shared.dataTask(with: request) { data, response, error in
+            if let error = error {
+                print("Error: \(error)")
+                return
+            }
+            guard let data = data else {
+                print("No data received")
+                return
+            }
+            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)")
+                    
+                    if let decrptedData = decrypted.data(using: .utf8) {
+                        let decoded = try? JSONDecoder().decode(CGMStatusResponse.self, from: decrptedData)
+                        
+                        guard let sensor = decoded?.data.first,
+                              !sensor.startDate.isEmpty,
+                              !sensor.endDate.isEmpty else {
+                            print("No valid sensor data")
+                            return
+                        }
+                        
+                        let startDateStr = sensor.startDate
+                        let endDateStr = sensor.endDate
+                        
+                        print("Start Date: \(startDateStr)")
+                        print("End Date: \(endDateStr)")
+                        UserDefaults.standard.set(sensor.sensorId, forKey: "sensorId")
+                        if self.isCurrentDateInRange(startDate: startDateStr, endDate: endDateStr) {
+                            print("Current date is in range")
+                            if ((self.manager.connectedPeripheral == nil) && !KLTLocalSettingManager.shareInstance().canConnectOtherDevice) {
+                                self.manager.startScan()
+                                self.debouncer.update(with: .disconnected)
+                            }  else {
+                                print("here")
+                                //debouncer.update(with: .connected)
+                                //API.shared.sendStatus(status: .connected) 计算 算法入参
+                                if let last = self.manager.currentDevice { }
+                                else {
+                                    //self.manager.closeBleSensor()
+                                    //manager.startScan()
+                                    //self.debouncer.update(with: .disconnected)
+                                    //debouncer.update(with: .transmitterDisconnectBox)
+                                }
+                            }
+//                            if KLTBluetoothManager.shared().currentDevice.initialEndDate != nil  {
+//                                self.sendStatus(status: .transmitterDisconnect)
+//                            }
+                        }
+                    }
+                }
+            }
+        }
+        task.resume()
+        
+    }
+    
+    func isCurrentDateInRange(startDate: String, endDate: String) -> Bool {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd"
+        guard let start = formatter.date(from: startDate),
+              let end = formatter.date(from: endDate) else {
+            return false
+        }
+        
+        let now = Date()
+        return (now >= start) && (now <= end)
+    }
+    
     func startCountDown() {
         
         // Most recently connected device

package/package.json

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