react-native-mytatva-rn-sdk 1.2.41 → 1.2.42

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

@@ -251,7 +251,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                 }
 
                 if (status.isNotEmpty()) {
-                    if (status !== lastDeviceStatus) {
+                    if (status != lastDeviceStatus) {
 
                         lastDeviceStatus = status
 

package/ios/MyReactNativeBridge.h

@@ -10,7 +10,7 @@
 
 
 #endif /* MyReactNativeBridge_h */
-
+#import "KLTAppDelegate.h"
 #import <Foundation/Foundation.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>

package/ios/MyReactNativeBridge.m

@@ -104,6 +104,7 @@ RCT_EXPORT_METHOD(startCgmTracky:(NSString *)token)
 
     // Save token
     [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
+    [[NSUserDefaults standardUserDefaults] setBool:false forKey:@"isForReconnect"];
     [[NSUserDefaults standardUserDefaults] synchronize];
 
 
@@ -121,38 +122,85 @@ RCT_EXPORT_METHOD(startCgmTracky:(NSString *)token)
             [rootVC presentViewController:navController animated:YES completion:nil];
         }
     });
-}
+   
+    
+//    NSLog(@"Received token: %@", token);
+//
+//    [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
+//    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"isForReconnect"];
+//    [[NSUserDefaults standardUserDefaults] synchronize];
+//
+//    dispatch_async(dispatch_get_main_queue(), ^{
+//        UIWindow *keyWindow = [UIApplication sharedApplication].delegate.window;
+//        UIViewController *rootVC = keyWindow.rootViewController;
+//
+//        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"MainCGM" bundle:[NSBundle mainBundle]];
+//        UIViewController *reconnectVC = [storyboard instantiateViewControllerWithIdentifier:@"StartConnectionViewController"];
+//        
+//        reconnectVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
+//
+//        UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:reconnectVC];
+//        navController.modalPresentationStyle = UIModalPresentationOverFullScreen;
+//
+//        if (reconnectVC) {
+//            [rootVC presentViewController:navController animated:YES completion:nil];
+//        }
+//    });
 
+}
 
 
 RCT_EXPORT_METHOD(reconnectCgmTracky:(NSString *)token)
 {
-    NSLog(@"Received token: %@", token);
+//    NSLog(@"Received token: %@", token);
+//    
+//    [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
+//    [[NSUserDefaults standardUserDefaults] synchronize];
+//    dispatch_async(dispatch_get_main_queue(), ^{
+//        UIWindow *keyWindow = [UIApplication sharedApplication].delegate.window;
+//        UIViewController *rootVC = keyWindow.rootViewController;
+//        // Load the storyboard
+//        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"MainCGM" bundle:[NSBundle mainBundle]];
+//        
+//        // Instantiate the target ViewController
+//        UIViewController *reconnectVC = [storyboard instantiateViewControllerWithIdentifier:@"StartConnectionViewController"];
+//        
+//        // Set presentation style
+//        reconnectVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
+//        // Set isForReconnect = YES
+//        if ([reconnectVC respondsToSelector:@selector(setIsForReconnect:)]) {
+//            [reconnectVC setValue:@(YES) forKey:@"isForReconnect"];
+//        }
+//        // Present it directly without navigation
+////        if (reconnectVC) {
+////            [rootVC presentViewController:reconnectVC animated:YES completion:nil];
+////        }
+//        
+//        UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:reconnectVC];
+//        navController.modalPresentationStyle = UIModalPresentationOverFullScreen;
+//        if (reconnectVC) {
+//            [rootVC presentViewController:navController animated:YES completion:nil];
+//        }
+//    });
     
+    NSLog(@"Received token: %@", token);
+
     [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
+    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"isForReconnect"];
     [[NSUserDefaults standardUserDefaults] synchronize];
+
     dispatch_async(dispatch_get_main_queue(), ^{
         UIWindow *keyWindow = [UIApplication sharedApplication].delegate.window;
         UIViewController *rootVC = keyWindow.rootViewController;
-        // Load the storyboard
+
         UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"MainCGM" bundle:[NSBundle mainBundle]];
-        
-        // Instantiate the target ViewController
         UIViewController *reconnectVC = [storyboard instantiateViewControllerWithIdentifier:@"StartConnectionViewController"];
         
-        // Set presentation style
         reconnectVC.modalPresentationStyle = UIModalPresentationOverFullScreen;
-        // Set isForReconnect = YES
-        if ([reconnectVC respondsToSelector:@selector(setIsForReconnect:)]) {
-            [reconnectVC setValue:@(YES) forKey:@"isForReconnect"];
-        }
-        // Present it directly without navigation
-//        if (reconnectVC) {
-//            [rootVC presentViewController:reconnectVC animated:YES completion:nil];
-//        }
-        
+
         UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:reconnectVC];
         navController.modalPresentationStyle = UIModalPresentationOverFullScreen;
+
         if (reconnectVC) {
             [rootVC presentViewController:navController animated:YES completion:nil];
         }

package/ios/Support/API.swift

@@ -173,6 +173,7 @@ class API {
         if sensorId.isEmpty { return }
        
         let url = URL(string: "https://api-feature2.mytatva.in/api/v8/cgm/connection")!
+        print("===>Api: https://api-feature2.mytatva.in/api/v8/cgm/connection")
         var request = URLRequest(url: url)
         request.httpMethod = "POST"
         

package/ios/ViewControllers/AttachTransmitterViewController.swift

@@ -55,6 +55,7 @@ class AttachTransmitterViewController: UIViewController {
                 let arrayFromInitial = KLTDatabaseHandler.shared().queryReceiveData(with: device, needUserBG: true) as! [ReceiveData]
                 print(arrayFromInitial)
                 print("===> arrayFromInitial count: ", arrayFromInitial.count)
+                
                 self.viewModel.uploadData(data: arrayFromInitial)
             }
             NotificationCenter.default.post(name: Notification.Name("cgmDeviceEvent"), object: nil, userInfo: ["a":"a"])

package/ios/ViewControllers/StartConnectionViewController.swift

@@ -10,12 +10,15 @@ import WebKit
 import CoreBluetooth
 import CoreLocation
 
+@objc(StartConnectionViewController)
 class StartConnectionViewController: UIViewController {
 
     @IBOutlet weak var customTopView: CustomTopUIView!
     @IBOutlet weak var tableView: UITableView!
     @IBOutlet weak var startConnectionJourneyButton: CustomOverlayButton!
-    @objc var isForReconnect: Bool = false
+    
+    
+   // @objc var isForReconnect: Bool = false
     var webView: WKWebView!
     // Declare the CBCentralManager
     var centralManager: CBCentralManager?
@@ -48,7 +51,7 @@ class StartConnectionViewController: UIViewController {
                                 ImageTVC.self,
                                 ChargingIndicatorTVC.self])
         tableView.reloadData()
-        UserDefaults.standard.set(isLocationEnabled, forKey: "isForReconnect")
+       // UserDefaults.standard.set(isLocationEnabled, forKey: "isForReconnect")
 
         let isForReconnect = UserDefaults.standard.bool(forKey: "isForReconnect")
         if isForReconnect{
@@ -56,11 +59,13 @@ class StartConnectionViewController: UIViewController {
             centralManager = CBCentralManager(delegate: self, queue: nil)
             // If the switch is turned on, check if Bluetooth is powered on
             checkBluetoothPermission()
+            startConnectionJourneyButton.labelText = "Start Reconnection Journey"
+        } else {
+            startConnectionJourneyButton.labelText = "Start Connection Journey"
         }
-        startConnectionJourneyButton.labelText = "Start Connection Journey"
+        
         startConnectionJourneyButton.buttonTapCallback = {
-           
-            if isForReconnect{
+            if isForReconnect {
                 self.updateBottomButtonState()
             } else {
                 let vc = ProvidePermissionViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)

package/ios/ViewModel/FinalViewModel.swift

@@ -111,25 +111,34 @@ import Foundation
             print("Current date is in range")
             if ((viewModel.manager.connectedPeripheral == nil) && !KLTLocalSettingManager.shareInstance().canConnectOtherDevice) {
                 viewModel.manager.startScan()
-                viewModel.debouncer.update(with: .disconnected)
+                viewModel.debouncer.update(with: .transmitterDisconnect)
             }  else {
                 print("here")
                 //debouncer.update(with: .connected)
                 //API.shared.sendStatus(status: .connected) 计算 算法入参
-                if let last = viewModel.manager.currentDevice { }
+                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.connectedDateTime == nil  && KLTBluetoothManager.shared().currentDevice.disconnectedDateTime == nil {
+                    viewModel.manager.startScan()
+                    viewModel.debouncer.update(with: .transmitterDisconnect)
+                }
             }
-//                            if KLTBluetoothManager.shared().currentDevice.initialEndDate != nil  {
-//
         }
 
         return updatedResponse
     }
+    
+  
+
 }
 
 class FinalViewModel: NSObject {

package/package.json

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