react-native-mytatva-rn-sdk 1.2.34 → 1.2.35

package/ios/ViewControllers/AttachTransmitterViewController.swift

@@ -70,6 +70,12 @@ class AttachTransmitterViewController: UIViewController {
             //self.navigationController?.pushViewController(vc, animated: true)
         }
 
+        customTopView.onDemoTapped = {
+            let webVC = WebViewController()
+            webVC.modalPresentationStyle = .formSheet
+            webVC.videoURL = URL(string: watchCGMVideo)
+            self.present(webVC, animated: true, completion: nil)
+        }
         customTopView.onCloseTapped = {
             let vc = ExitJourneyViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             vc.modalPresentationStyle = .overFullScreen
@@ -116,6 +122,12 @@ extension AttachTransmitterViewController: UITableViewDelegate, UITableViewDataS
         case .video:
             let cell: VideoTVC = tableView.dequeueReusableCell(for: indexPath)
             cell.imageViewBackground.image = loadImage(named: "step5")
+            cell.onPlayVideo = {
+                let webVC = WebViewController()
+                webVC.modalPresentationStyle = .formSheet
+                webVC.videoURL = URL(string: applyingTheSensor)
+                self.present(webVC, animated: true, completion: nil)
+            }
             return cell
         }
     }

package/ios/ViewControllers/ChatWithExpertViewController.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+
 class ChatWithExpertViewController: UIViewController {
     
     @IBOutlet weak var tableView: UITableView!

package/ios/ViewControllers/ConnectToSensorViewController.swift

@@ -28,6 +28,7 @@ class ConnectToSensorViewController: UIViewController {
     
     enum enumSuccessTableRow: Int, CaseIterable {
         case success
+        case note
     }
     
     enum enumFailureTableRow: Int, CaseIterable {
@@ -89,6 +90,12 @@ class ConnectToSensorViewController: UIViewController {
             self.navigationController?.pushViewController(vc, animated: false)
         }
         
+        customTopView.onDemoTapped = {
+            let webVC = WebViewController()
+            webVC.modalPresentationStyle = .formSheet
+            webVC.videoURL = URL(string: watchCGMVideo)
+            self.present(webVC, animated: true, completion: nil)
+        }
         customTopView.onCloseTapped = {
             let vc = ExitJourneyViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             vc.modalPresentationStyle = .overFullScreen
@@ -359,6 +366,11 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
                 cell.labelTitle.text = "Sensor Connected Successfully"
                 cell.setImageForCGM()
                 return cell
+                
+            case .note:
+                let cell: NoteTVC = tableView.dequeueReusableCell(for: indexPath)
+                cell.setImportantNote(isFromSuccessConnection: true)
+                return cell
             }
         case .error:
             switch enumFailureTableRow(rawValue: indexPath.row)! {
@@ -382,6 +394,12 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
                 return cell
             case .watchVideo:
                 let cell: WatchVideoTVC = tableView.dequeueReusableCell(for: indexPath)
+                cell.onPlayVideo = {
+                    let webVC = WebViewController()
+                    webVC.modalPresentationStyle = .formSheet
+                    webVC.videoURL = URL(string: qrScanFailed)
+                    self.present(webVC, animated: true, completion: nil)
+                }
                 return cell
             }
         }

package/ios/ViewControllers/ConnectToTransmitterViewController.swift

@@ -88,6 +88,7 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
         contactSupport.buttonTapCallback = {
         }
         
+        
         bottomButton.labelText = screenType == .error ? "Retry" : "Proceed"
         
         if screenType == .searching {
@@ -124,7 +125,13 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
             }
         }
 
-
+        customTopView.onDemoTapped = {
+            let webVC = WebViewController()
+            webVC.modalPresentationStyle = .formSheet
+            webVC.videoURL = URL(string: watchCGMVideo)
+            self.present(webVC, animated: true, completion: nil)
+        }
+        
         customTopView.onCloseTapped = {
             let vc = ExitJourneyViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             vc.modalPresentationStyle = .overFullScreen
@@ -336,6 +343,7 @@ extension ConnectToTransmitterViewController: UITableViewDelegate, UITableViewDa
                 return cell
             case .importantNote:
                 let cell: NoteTVC = tableView.dequeueReusableCell(for: indexPath)
+                cell.setImportantNote(isFromSuccessConnection: false)
                 return cell
             }
         case .error:
@@ -359,6 +367,12 @@ extension ConnectToTransmitterViewController: UITableViewDelegate, UITableViewDa
                 return cell
             case .watchVideo:
                 let cell: WatchVideoTVC = tableView.dequeueReusableCell(for: indexPath)
+                cell.onPlayVideo = {
+                    let webVC = WebViewController()
+                    webVC.modalPresentationStyle = .formSheet 
+                    webVC.videoURL = URL(string: connectionJourneyError)
+                    self.present(webVC, animated: true, completion: nil)
+                }
                 return cell
             }
         }

package/ios/ViewControllers/ProvidePermissionViewController.swift

@@ -49,6 +49,13 @@ class ProvidePermissionViewController: UIViewController {
             self.navigationController?.pushViewController(vc, animated: false)
         }
         
+        customTopView.onDemoTapped = {
+            let webVC = WebViewController()
+            webVC.modalPresentationStyle = .formSheet
+            webVC.videoURL = URL(string: watchCGMVideo)
+            self.present(webVC, animated: true, completion: nil)
+        }
+        
         customTopView.onCloseTapped = {
             let vc = ExitJourneyViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             vc.modalPresentationStyle = .overFullScreen

package/ios/ViewControllers/PutOnTheSensorViewController.swift

@@ -41,6 +41,13 @@ class PutOnTheSensorViewController: UIViewController {
             self.navigationController?.pushViewController(vc, animated: false)
         }
 
+        customTopView.onDemoTapped = {
+            let webVC = WebViewController()
+            webVC.modalPresentationStyle = .formSheet
+            webVC.videoURL = URL(string: watchCGMVideo)
+            self.present(webVC, animated: true, completion: nil)
+        }
+        
         customTopView.onCloseTapped = {
             let vc = ExitJourneyViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             vc.modalPresentationStyle = .overFullScreen
@@ -87,10 +94,17 @@ extension PutOnTheSensorViewController: UITableViewDelegate, UITableViewDataSour
         case .video:
             let cell: VideoTVC = tableView.dequeueReusableCell(for: indexPath)
             cell.imageViewBackground.image = loadImage(named: "step4")
+            cell.onPlayVideo = {
+                let webVC = WebViewController()
+                webVC.modalPresentationStyle = .formSheet
+                webVC.videoURL = URL(string: applyingTheSensor)
+                self.present(webVC, animated: true, completion: nil)
+            }
             return cell
         case .importantNote:
             let cell: NoteTVC = tableView.dequeueReusableCell(for: indexPath)
-            cell.labelDesc.text = "Don’t unlock your sensor before putting it the sensor on your skin"
+            cell.setImportantNote()
+//            cell.labelDesc.text = "Don’t unlock your sensor before putting it the sensor on your skin"
             cell.imageViewLeft.isHidden = true
             cell.heightConstraint.constant = 64
             return cell

package/ios/ViewControllers/StartConnectionViewController.swift

@@ -6,12 +6,16 @@
 //
 
 import UIKit
+import WebKit
 
 class StartConnectionViewController: UIViewController {
 
     @IBOutlet weak var customTopView: CustomTopUIView!
     @IBOutlet weak var tableView: UITableView!
     @IBOutlet weak var startConnectionJourneyButton: CustomOverlayButton!
+    @objc var isForReconnect: Bool = false
+    var webView: WKWebView!
+
     
     enum enumTableRow: Int, CaseIterable {
         case separator
@@ -43,6 +47,14 @@ class StartConnectionViewController: UIViewController {
             self.navigationController?.pushViewController(vc, animated: false)
         }
 
+        customTopView.onDemoTapped = {
+            let webVC = WebViewController()
+            webVC.modalPresentationStyle = .formSheet // or .pageSheet, .fullScreen
+            webVC.videoURL = URL(string: watchCGMVideo)
+            self.present(webVC, animated: true, completion: nil)
+            
+        }
+        
         customTopView.onCloseTapped = {
             let vc = ExitJourneyViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             vc.modalPresentationStyle = .overFullScreen

package/ios/ViewModel/FinalViewModel.swift

@@ -14,11 +14,121 @@ import Foundation
         super.init()
         viewModel.initialize()
     }
-    @objc public func callForObserveTransmitterUnbindStatus() {
-        let sensorID = UserDefaults.standard.string(forKey: "sensorId") ?? ""
-        if !sensorID.isEmpty {
-            viewModel.getStatus()
+    
+//    @objc public func callForObserveTransmitterUnbindStatus() {
+//        let sensorID = UserDefaults.standard.string(forKey: "sensorId") ?? ""
+//        if !sensorID.isEmpty {
+//            viewModel.getStatus()
+//        }
+//    }
+    
+    @objc public func callForObserveTransmitterUnbindStatusWithCompletion(
+        _ completion: @escaping (_ finalResponse: [String: Any]?, _ error: Error?) -> Void
+    ) {
+        // Load JSON data from UserDefaults
+        guard let data = UserDefaults.standard.data(forKey: "CGMStatusItem") else {
+            let error = NSError(
+                domain: "SensorData",
+                code: 404,
+                userInfo: [NSLocalizedDescriptionKey: "No cached response found"]
+            )
+            completion(nil, error)
+            return
+        }
+
+        do {
+            let json = try JSONSerialization.jsonObject(with: data, options: [])
+            // Forward to actual handler, which includes a safety check
+            self.callForObserveTransmitterUnbindStatusWithResponse(json, completion: completion)
+        } catch {
+            completion(nil, NSError(domain: "SensorData", code: 405, userInfo: [NSLocalizedDescriptionKey: "Failed to parse cached JSON"]))
+        }
+    }
+
+
+    @objc public func callForObserveTransmitterUnbindStatusWithResponse(
+        _ response: Any,  // Changed from [String: Any] to Any to add type safety
+        completion: @escaping (_ finalResponse: [String: Any]?, _ error: Error?) -> Void
+    ) {
+        // Ensure response is a dictionary
+        guard let responseDict = response as? [String: Any] else {
+            let error = NSError(
+                domain: "SensorData",
+                code: 406,
+                userInfo: [NSLocalizedDescriptionKey: "Response is not a dictionary"]
+            )
+            completion(nil, error)
+            return
+        }
+
+        guard let status = responseDict["status"] as? String, status == "success",
+              let dataArray = responseDict["data"] as? [[String: Any]],
+              let data = dataArray.first else {
+            let error = NSError(
+                domain: "SensorData",
+                code: 400,
+                userInfo: [NSLocalizedDescriptionKey: "Invalid status or missing data"]
+            )
+            completion(nil, error)
+            return
+        }
+
+        guard let sensorId = data["sensorId"] as? String,
+              let startDate = data["startDate"] as? String,
+              let endDate = data["endDate"] as? String,
+              let statusValue = data["status"] as? String,
+              let daysToExpire = data["daysToExpire"] as? Int else {
+            let error = NSError(
+                domain: "SensorData",
+                code: 401,
+                userInfo: [NSLocalizedDescriptionKey: "Missing or invalid sensor data in 'data'"]
+            )
+            completion(nil, error)
+            return
+        }
+
+        let baseResponse: [String: Any] = [
+            "sensorId": sensorId,
+            "startDate": startDate,
+            "endDate": endDate,
+            "status": statusValue,
+            "daysToExpire": daysToExpire
+        ]
+
+        let finalResponse = self.evaluateUnbindStatus(response: baseResponse, startDate: startDate, endDate: endDate)
+        completion(finalResponse, nil)
+    }
+
+       // MARK: - Main Logic
+    @objc public func evaluateUnbindStatus(
+        response: [String: Any],
+        startDate: String,
+        endDate: String
+    ) -> [String: Any] {
+        let updatedResponse = response
+
+        if viewModel.isCurrentDateInRange(startDate: startDate, endDate: endDate) {
+            print("Current date is in range")
+            if ((viewModel.manager.connectedPeripheral == nil) && !KLTLocalSettingManager.shareInstance().canConnectOtherDevice) {
+                viewModel.manager.startScan()
+                viewModel.debouncer.update(with: .disconnected)
+            }  else {
+                print("here")
+                //debouncer.update(with: .connected)
+                //API.shared.sendStatus(status: .connected) 计算 算法入参
+                if let last = viewModel.manager.currentDevice { }
+                else {
+                    //self.manager.closeBleSensor()
+                    //manager.startScan()
+                    //self.debouncer.update(with: .disconnected)
+                    //debouncer.update(with: .transmitterDisconnectBox)
+                }
+            }
+//                            if KLTBluetoothManager.shared().currentDevice.initialEndDate != nil  {
+//
         }
+
+        return updatedResponse
     }
 }
 
@@ -62,6 +172,7 @@ class FinalViewModel: NSObject {
             }
         }
     }
+    
     func getStatus(encryptionKey: String = PROD_ENC_KEY,
                    encryptionIv: String = PROD_ENC_IV) {
         print("ios token:", TOKEN)
@@ -173,18 +284,18 @@ class FinalViewModel: NSObject {
                         countdownTimer?.invalidate()
                         countdownTimer = nil
                     }
-
                     countdownTimer = Timer.scheduledTimer(timeInterval: 1.0, target: self, selector: #selector(countdown), userInfo: nil, repeats: true)
-
+                     
                 }
             }
         } else {
             // no device is connected
+            print("no device is connected")
         }
-
-     
+        
         addAllObservers()
     }
+    
     func addAllObservers() {
         manager.addObserver(self, forKeyPath: "status", options: .new, context: nil)
         
@@ -195,7 +306,6 @@ class FinalViewModel: NSObject {
         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)
-        
     }
 
     func removeAllObservers() {
@@ -208,7 +318,6 @@ class FinalViewModel: NSObject {
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name(KLTAlertCurrentInInitialNotify), object: nil)
         
         NotificationCenter.default.removeObserver(self, name: NSNotification.Name(KLTUpdateDataNotify), object: nil)
-        
     }
     
    
@@ -303,6 +412,7 @@ class FinalViewModel: NSObject {
             }
         }
     }
+    
     @objc func bluetoothEnable(_ notification: Notification) {
         if let isBluetoothEnabled = notification.object as? Bool {
             if !isBluetoothEnabled {
@@ -314,6 +424,7 @@ class FinalViewModel: NSObject {
             manager.startScan()
         }
     }
+    
     @objc func countdown() {
         if let last = KLTDatabaseHandler.shared().isLatestDeviceDisconnected() {
             if let beginDate = KLTDateFormatter.shared.getDateFromWholeString(last.initialBeginDate ?? "") {
@@ -339,6 +450,7 @@ class FinalViewModel: NSObject {
         print(String.getTimeString(with: Int(totalSeconds)))
         //countDownValueLabel.text =
     }
+    
     override func observeValue(
         forKeyPath keyPath: String?,
         of object: Any?,
@@ -350,11 +462,11 @@ class FinalViewModel: NSObject {
               let status = BluetoothManagerStatus(rawValue: newValue) else {
             return
         }
-
+        
         print("===>device status is -> \(status)")
-
+        
         switch status {
-
+            
         case .disconnected:
             if KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
                 // Unbind then disconnect
@@ -368,11 +480,11 @@ class FinalViewModel: NSObject {
             print("===>device is disconnected")
             debouncer.update(with: CGMConnectionStatus.disconnected)
         case .tryToConnect:
-//            if UserDefaults.standard.integer(forKey: "bgmode") != 1 {
-//                DispatchQueue.main.asyncAfter(deadline: .now() + 20) {
-//                    self.manager.startScan()
-//                }
-//            }
+            //            if UserDefaults.standard.integer(forKey: "bgmode") != 1 {
+            //                DispatchQueue.main.asyncAfter(deadline: .now() + 20) {
+            //                    self.manager.startScan()
+            //                }
+            //            }
             break
         case .connected:
             if let timer = startScanTimer {
@@ -383,13 +495,13 @@ class FinalViewModel: NSObject {
             print("===>device is connected")
             debouncer.update(with: CGMConnectionStatus.connected)
         case .timeOut:
-//            if !KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
-//                startScanTimer = Timer.scheduledTimer(timeInterval: 20,
-//                                                      target: self,
-//                                                      selector: #selector(startScan),
-//                                                      userInfo: nil,
-//                                                      repeats: false)
-//            }
+            //            if !KLTLocalSettingManager.shareInstance().canConnectOtherDevice {
+            //                startScanTimer = Timer.scheduledTimer(timeInterval: 20,
+            //                                                      target: self,
+            //                                                      selector: #selector(startScan),
+            //                                                      userInfo: nil,
+            //                                                      repeats: false)
+            //            }
             print("===>time out")
             break
         case .sensorLostPower:
@@ -407,6 +519,7 @@ class FinalViewModel: NSObject {
             break
         }
     }
+    
     func sensorLostPower() {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
             // Will trigger `BluetoothManagerStatusDisconnected` due to forced disconnection

package/ios/icon.xcassets/do_not_throw_sensor.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "image with cross.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "image with cross@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "image with cross@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

package/package.json

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