react-native-mytatva-rn-sdk 1.2.14 → 1.2.15

package/ios/MyReactNativeBridge.m

@@ -10,7 +10,7 @@
 #import <UIKit/UIKit.h>
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTEventEmitter.h>
-
+#import "react_native_mytatva_rn_sdk-Swift.h"
 @implementation MyEventEmitterManager
 
 RCT_EXPORT_MODULE();
@@ -144,6 +144,7 @@ RCT_EXPORT_METHOD(openHelpSupport)
 
 RCT_EXPORT_METHOD(observeAllGlucoseData:(NSString *)token)
 {
+    FinalViewModelManager *manager = [FinalViewModelManager shared];
      [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
    [[NSUserDefaults standardUserDefaults] synchronize];
     

package/ios/ViewControllers/AttachTransmitterViewController.swift

@@ -57,10 +57,15 @@ class AttachTransmitterViewController: UIViewController {
                 print("===> arrayFromInitial count: ", arrayFromInitial.count)
                 self.viewModel.uploadData(data: arrayFromInitial)
             }
-            
             NotificationCenter.default.post(name: Notification.Name("cgmDeviceEvent"), object: nil, userInfo: ["a":"a"])
-            self.navigationController?.presentingViewController?.dismiss(animated: true, completion: nil)
-
+            if let rootVC = UIApplication.shared.connectedScenes
+                .compactMap({ ($0 as? UIWindowScene)?.windows.first?.rootViewController })
+                .first {
+                rootVC.dismiss(animated: true, completion: nil)
+            } else if let rootViewController = UIApplication.shared.keyWindow?.rootViewController {
+                rootViewController.dismiss(animated: true, completion: nil)
+            }
+            
             //let vc = ConnectToTransmitterViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             //self.navigationController?.pushViewController(vc, animated: true)
         }

package/ios/ViewControllers/ConnectToSensorViewController.swift

@@ -336,7 +336,6 @@ extension ConnectToSensorViewController: UITableViewDelegate, UITableViewDataSou
             let dateFormatter = DateFormatter()
             dateFormatter.dateFormat = "dd-MM-yyyy hh:mm a"
             dateFormatter.timeZone = TimeZone.current
-            
             if let connectedTime = connectedTime {
               // Convert the Date to a String
               let dateString = dateFormatter.string(from: connectedTime)

package/ios/ViewControllers/ConnectToTransmitterViewController.swift

@@ -92,19 +92,26 @@ class ConnectToTransmitterViewController: UIViewController, KLTBluetoothDelegate
             bottomButton.hideRightArrow()
         }
         bottomButton.buttonTapCallback = {
-             if self.isForReconnect {
-                 NotificationCenter.default.post(name: Notification.Name("cgmDeviceEvent"), object: nil, userInfo: ["a":"a"])
-                 self.navigationController?.presentingViewController?.dismiss(animated: true, completion: nil)
+            if self.isForReconnect {
+                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 })
+                    .first {
+                    rootVC.dismiss(animated: true, completion: nil)
+                } else if let rootViewController = UIApplication.shared.keyWindow?.rootViewController {
+                    rootViewController.dismiss(animated: true, completion: nil)
+                }
             } else {
-
-            let vc = ConnectToSensorViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
-            vc.connected = {
-                //self.showConfirmInsulinUser()
-            }
-            self.navigationController?.pushViewController(vc, animated: false)
+                
+                let vc = ConnectToSensorViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
+                vc.connected = {
+                    //self.showConfirmInsulinUser()
+                }
+                self.navigationController?.pushViewController(vc, animated: false)
             }
         }
 
+
         customTopView.onCloseTapped = {
             let vc = ExitJourneyViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
             vc.modalPresentationStyle = .overFullScreen
@@ -253,7 +260,7 @@ extension ConnectToTransmitterViewController: UITableViewDelegate, UITableViewDa
                     let dateFormatter = DateFormatter()
                     dateFormatter.dateFormat = "dd-MM-yyyy hh:mm a"
                     dateFormatter.timeZone = TimeZone.current
-                    
+                    cell.parentImageView.loadGif(named: "success")
                     if let connectedTime = connectedTime {
                         // Convert the Date to a String
                         let dateString = dateFormatter.string(from: connectedTime)

package/ios/ViewModel/FinalViewModel.swift

@@ -6,6 +6,15 @@
 //
 
 import Foundation
+@objc public class FinalViewModelManager: NSObject {
+    @objc public static let shared = FinalViewModelManager()
+    @objc let viewModel = FinalViewModel()
+
+    private override init() {
+        super.init()
+        viewModel.initialize()
+    }
+}
 
 class FinalViewModel: NSObject {
     var initialPeriod = 0
@@ -18,18 +27,16 @@ class FinalViewModel: NSObject {
     
     let debouncer = EnumDebouncer<CGMConnectionStatus>()
 
-    // Wait an hour, then you’ll get the success callback if type hasn't changed
-    override init() {
+    @objc public override init() {
         self.manager = KLTBluetoothManager.shared()
         super.init()
         debouncer.onDebounceSuccess = { value in
             API.shared.sendStatus(status: value)
             print("Same type held for an hour!")
         }
+     }
 
-    }
-    
-    func initialize() {
+    @objc public func initialize() {
         startCountDown()
         if ((manager.connectedPeripheral == nil) && !KLTLocalSettingManager.shareInstance().canConnectOtherDevice) {
             manager.startScan()
@@ -257,6 +264,8 @@ class FinalViewModel: NSObject {
         case .updateBindWatchSuccess:
             //KLTLaunchConfiguration.sharedManager.bindSuccessRootViewController()
             print("Success done")
+        case .closed:
+            API.shared.sendStatus(status: .transmitterDisconnectBox)
         default:
             break
         }

package/package.json

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