react-native-mytatva-rn-sdk 1.2.39 → 1.2.40

package/android/src/main/AndroidManifestNew.xml

@@ -124,7 +124,8 @@
 
         <activity
             android:name=".activity.VideoActivity"
-            android:exported="false"/>
+            android:configChanges="orientation|screenSize|keyboardHidden|smallestScreenSize|screenLayout"
+            android:exported="false" />
 
         <receiver
             android:name=".receiver.BootCompleteReceiver"

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

@@ -70,8 +70,7 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
     private val apiScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
     private var debounceJob: Job? = null
 
-    @Volatile
-    private var lastDeviceStatus: PocDevice? = null
+    private var lastDeviceStatus: String? = null
 
     private var glucoseObserver: Observer<PocGlucose?>? = null
     private var isObserving = false
@@ -107,13 +106,9 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
 
             Handler(Looper.getMainLooper()).post {
                 mModel.device.observeForever { device ->
-                    if (device != lastDeviceStatus) {
-                        lastDeviceStatus = device
-                        postEventDataToAPI(device, "", lastDeviceStatus?.qrMessage ?: "")
-                        resetDebounceTimer()
-                    }
-
                     if (device != null) {
+                        postEventDataToAPI(device, "", device?.qrMessage ?: "")
+
                         Log.d("observeDeviceStatus: ", device.toString())
                     }
                 }
@@ -256,30 +251,36 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                 }
 
                 if (status.isNotEmpty()) {
-                    val rawData = JSONObject().apply {
-                        put("transmitterName", device?.name ?: "")
-                        put("SensorId", sensorId ?: "")
-                        put("Sensor", sensorId ?: "")
-                        put("timeInMillis", Date().time)
-                    }
+                    if (status !== lastDeviceStatus) {
 
-                    val obj = JSONObject().apply {
-                        put("sensorId", sensorId ?: "")
-                        put("status", status)
-                        put("rawData", rawData)
-                    }
+                        lastDeviceStatus = status
 
-                    authenticateSDKService.postDeviceData(
-                        environment = if ("uat".uppercase() == "PROD") TATVA_ENVIRONMENT.PROD else TATVA_ENVIRONMENT.STAGE,
-                        data = obj.toString(),
-                        token = userToken,
-                        loaderListener = object : LoaderListener {
-                            override fun onShowLoader() {}
-                            override fun onHideLoader() {}
+                        val rawData = JSONObject().apply {
+                            put("transmitterName", device?.name ?: "")
+                            put("SensorId", sensorId ?: "")
+                            put("Sensor", sensorId ?: "")
+                            put("timeInMillis", Date().time)
+                        }
+
+                        val obj = JSONObject().apply {
+                            put("sensorId", sensorId ?: "")
+                            put("status", status)
+                            put("rawData", rawData)
                         }
-                    )
-                }
 
+                        authenticateSDKService.postDeviceData(
+                            environment = if ("uat".uppercase() == "PROD") TATVA_ENVIRONMENT.PROD else TATVA_ENVIRONMENT.STAGE,
+                            data = obj.toString(),
+                            token = userToken,
+                            loaderListener = object : LoaderListener {
+                                override fun onShowLoader() {}
+                                override fun onHideLoader() {}
+                            }
+                        )
+
+                        resetDebounceTimer()
+                    }
+                }
             } catch (e: Exception) {
                 e.printStackTrace()
             }
@@ -496,7 +497,6 @@ class CgmTrackyLibModule(reactContext: ReactApplicationContext) :
                 }
 
                 postEventDataToAPI(it, statusId, it.qrMessage)
-                resetDebounceTimer()
             } ?: run {
                 Log.e(
                     "handleGlucoseError",

package/android/src/main/java/com/mytatvarnsdk/activity/PlaceSensorActivity.kt

@@ -73,7 +73,7 @@ class PlaceSensorActivity : AppCompatActivity() {
 
         binding.ivPlay.setOnClickListener {
             startActivity(
-                Intent(this, VideoActivity::class.java).putExtra("VideoId", "1C7VK2d5niY")
+                Intent(this, VideoActivity::class.java).putExtra("VideoId", "O01BBxzxGmE")
             )
         }
 

package/android/src/main/java/com/mytatvarnsdk/activity/PlaceTransmitterActivity.kt

@@ -81,7 +81,7 @@ class PlaceTransmitterActivity : AppCompatActivity() {
 
         binding.ivPlay.setOnClickListener {
             startActivity(
-                Intent(this, VideoActivity::class.java).putExtra("VideoId", "1C7VK2d5niY")
+                Intent(this, VideoActivity::class.java).putExtra("VideoId", "6m3pxl5BK9A")
             )
         }
 

package/android/src/main/java/com/mytatvarnsdk/activity/SearchTransmitterActivity.kt

@@ -531,11 +531,7 @@ class SearchTransmitterActivity : BaseBleActivity() {
 
             Log.d("onDeviceConnect--->", "onDeviceConnect: " + transmitterDeviceInfo.toString())
             if (enumDevice.getEnumDevice(transmitterDeviceInfo!!.pocDevice.name).isAbleScanQRCode) {
-                if (isForReconnect) {
-                    proceedToNextStep()
-                } else {
-                    bindSuccess()
-                }
+                bindSuccess()
             } else {
                 bind(transmitterDeviceInfo!!.pocDevice)
             }

package/android/src/main/java/com/mytatvarnsdk/activity/StartCGMActivity.kt

@@ -103,7 +103,6 @@ class StartCGMActivity : AppCompatActivity() {
         // Add location permissions
         requiredPermissions.addAll(PermissionUtils.LOCAL_PERMISSION)
 
-
         return requiredPermissions.all {
             ContextCompat.checkSelfPermission(
                 mReactContext!!,

package/android/src/main/res/layout/activity_place_sensor.xml

@@ -206,18 +206,6 @@
 
         </androidx.cardview.widget.CardView>
 
-        <com.pierfrancescosoffritti.androidyoutubeplayer.core.player.views.YouTubePlayerView
-            android:id="@+id/youtube_player_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:visibility="gone"
-            app:autoPlay="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvInstructions"
-            app:videoId="r5Zemc4R044" />
-
         <TextView
             android:id="@+id/tvNote"
             android:layout_width="match_parent"

package/android/src/main/res/layout/activity_place_transmitter.xml

@@ -205,18 +205,6 @@
 
         </androidx.cardview.widget.CardView>
 
-        <com.pierfrancescosoffritti.androidyoutubeplayer.core.player.views.YouTubePlayerView
-            android:id="@+id/youtube_player_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:visibility="gone"
-            app:autoPlay="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvInstructions"
-            app:videoId="r5Zemc4R044" />
-
         <include
             android:id="@+id/commonButton"
             layout="@layout/layout_button"

package/ios/MyReactNativeBridge.m

@@ -100,55 +100,24 @@ RCT_EXPORT_MODULE();
 
 RCT_EXPORT_METHOD(startCgmTracky:(NSString *)token)
 {
-//    NSLog(@"Received token: %@", token);
-//
-//    // Save token
-//    [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
-//    [[NSUserDefaults standardUserDefaults] synchronize];
-//
-//
-//    // Show native view
-//    dispatch_async(dispatch_get_main_queue(), ^{
-//        UIWindow *keyWindow = [UIApplication sharedApplication].delegate.window;
-//        UIViewController *rootVC = keyWindow.rootViewController;
-//
-//        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"MainCGM" bundle:nil];
-//        UIViewController *nativeVC = [storyboard instantiateViewControllerWithIdentifier:@"StartConnectionViewController"];
-//
-//        if (nativeVC) {
-//            UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:nativeVC];
-//            navController.modalPresentationStyle = UIModalPresentationOverFullScreen;
-//            [rootVC presentViewController:navController animated:YES completion:nil];
-//        }
-//    });
-    
     NSLog(@"Received token: %@", token);
-    
+
+    // Save token
     [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
     [[NSUserDefaults standardUserDefaults] synchronize];
+
+
+    // Show native view
     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) {
+
+        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"MainCGM" bundle:nil];
+        UIViewController *nativeVC = [storyboard instantiateViewControllerWithIdentifier:@"StartConnectionViewController"];
+
+        if (nativeVC) {
+            UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:nativeVC];
+            navController.modalPresentationStyle = UIModalPresentationOverFullScreen;
             [rootVC presentViewController:navController animated:YES completion:nil];
         }
     });
@@ -190,7 +159,6 @@ RCT_EXPORT_METHOD(reconnectCgmTracky:(NSString *)token)
     });
 }
 
-
 RCT_EXPORT_METHOD(openHelpSupport)
 {
     dispatch_async(dispatch_get_main_queue(), ^{
@@ -243,52 +211,68 @@ RCT_EXPORT_METHOD(observeAllGlucoseData:(NSString *)token)
     });
 }
 
-//RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token)
-//{
-//    NSLog(@"Received token: %@", token);
-//    [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
-//    [[NSUserDefaults standardUserDefaults] synchronize];
-//    FinalViewModelManager *manager = [FinalViewModelManager shared];
-//    [manager callForObserveTransmitterUnbindStatus];
-//}
-
-RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token response:(NSString *)responseJsonString)
+// Internal method — can be kept private using a class extension
+- (void)observeTransmitterUnbindStatus:(NSString *)token
+                                       response:(NSDictionary *)responseDict
+                                     completion:(void (^)(NSDictionary *response, NSError *error))completion
 {
-    // Optional: Parse the JSON string if needed
-    NSData *jsonData = [responseJsonString dataUsingEncoding:NSUTF8StringEncoding];
-    NSError *jsonError;
-    NSDictionary *responseDict = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&jsonError];
-
-    if (jsonError) {
-        NSLog(@"Failed to parse JSON: %@", jsonError.localizedDescription);
-        [self sendEventWithName:@"observeTransmitterUnbindStatusHandler" body:@{
-            @"token": token ?: @"",
-            @"success": @NO,
-            @"error": @"Invalid JSON response from JS"
-        }];
-        return;
+    // Save token
+    [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+
+    // Save CGM status item to UserDefaults (if needed by Swift)
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:responseDict options:0 error:nil];
+    if (jsonData) {
+        [[NSUserDefaults standardUserDefaults] setObject:jsonData forKey:@"CGMStatusItem"];
+        [[NSUserDefaults standardUserDefaults] synchronize];
     }
 
-    // Now you have responseDict, you can use it
-    [self observeTransmitterUnbindStatusInternal:token response:responseDict completion:^(NSDictionary *response, NSError *error) {
-        if (error) {
-            NSDictionary *errorPayload = @{
-                @"token": token ?: @"",
-                @"success": @NO,
-                @"error": error.localizedDescription ?: @"Unknown error"
-            };
-            [self sendEventWithName:@"observeTransmitterUnbindStatusHandler" body:errorPayload];
-        } else {
-            NSDictionary *successPayload = @{
-                @"token": token ?: @"",
-                @"responseFromBackend": response ?: @{},
-                @"responseFromJS": responseDict ?: @{},
-                @"success": @YES
-            };
-            [self sendEventWithName:@"observeTransmitterUnbindStatusHandler" body:successPayload];
+    // Call Swift method which reads CGMStatusItem from UserDefaults
+    FinalViewModelManager *manager = [FinalViewModelManager shared];
+    [manager callForObserveTransmitterUnbindStatusWithCompletion:^(NSDictionary *response, NSError *error) {
+        if (completion) {
+            completion(response, error);
         }
     }];
-
 }
 
+//RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token response:(NSString *)responseJsonString)
+//{
+//    // Optional: Parse the JSON string if needed
+//    NSData *jsonData = [responseJsonString dataUsingEncoding:NSUTF8StringEncoding];
+//    NSError *jsonError;
+//    NSDictionary *responseDict = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&jsonError];
+//
+//    if (jsonError) {
+//        NSLog(@"Failed to parse JSON: %@", jsonError.localizedDescription);
+//        [self sendEventWithName:@"observeTransmitterUnbindStatusHandler" body:@{
+//            @"token": token ?: @"",
+//            @"success": @NO,
+//            @"error": @"Invalid JSON response from JS"
+//        }];
+//        return;
+//    }
+//
+//    // Now you have responseDict, you can use it
+//    [self observeTransmitterUnbindStatusInternal:token response:responseDict completion:^(NSDictionary *response, NSError *error) {
+//        if (error) {
+//            NSDictionary *errorPayload = @{
+//                @"token": token ?: @"",
+//                @"success": @NO,
+//                @"error": error.localizedDescription ?: @"Unknown error"
+//            };
+//            [self sendEventWithName:@"observeTransmitterUnbindStatusHandler" body:errorPayload];
+//        } else {
+//            NSDictionary *successPayload = @{
+//                @"token": token ?: @"",
+//                @"responseFromBackend": response ?: @{},
+//                @"responseFromJS": responseDict ?: @{},
+//                @"success": @YES
+//            };
+//            [self sendEventWithName:@"observeTransmitterUnbindStatusHandler" body:successPayload];
+//        }
+//    }];
+//
+//}
+
 @end

package/ios/Support/API.swift

@@ -227,7 +227,6 @@ class API {
             }
         }
         task.resume()
-        
     }
     
     /*func getStatus(encryptionKey: String = PROD_ENC_KEY,

package/ios/TableViewCell/VIdeoTVC/VideoTVC.swift

@@ -20,15 +20,10 @@ class VideoTVC: UITableViewCell {
         // Initialization code
         imageViewPlay.loadGif(named: "play")
         imageViewBackground.contentMode = .scaleAspectFill
-        imageViewPlay.isUserInteractionEnabled = true
-        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(playButtonTapped))
-        imageViewPlay.addGestureRecognizer(tapGesture)
-
+        buttonPlay.addTarget(self, action: #selector(playButtonTapped), for: .touchUpInside)
     }
 
     @objc func playButtonTapped() {
         onPlayVideo?()
     }
-
-    
 }

package/ios/ViewControllers/ConnectToSensorViewController.swift

@@ -85,9 +85,17 @@ class ConnectToSensorViewController: UIViewController {
         if screenType == .error {
             bottomButton.hideRightArrow()
         }
+        
         bottomButton.buttonTapCallback = {
-            let vc = PutOnTheSensorViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
-            self.navigationController?.pushViewController(vc, animated: false)
+            let isForReconnect = UserDefaults.standard.bool(forKey: "isForReconnect")
+            if isForReconnect{
+                let vc = AttachTransmitterViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
+                self.navigationController?.pushViewController(vc, animated: false)
+            } else {
+                let vc = PutOnTheSensorViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
+                self.navigationController?.pushViewController(vc, animated: false)
+            }
+         
         }
         
         customTopView.onDemoTapped = {

package/ios/ViewControllers/StartConnectionViewController.swift

@@ -7,6 +7,8 @@
 
 import UIKit
 import WebKit
+import CoreBluetooth
+import CoreLocation
 
 class StartConnectionViewController: UIViewController {
 
@@ -15,7 +17,13 @@ class StartConnectionViewController: UIViewController {
     @IBOutlet weak var startConnectionJourneyButton: CustomOverlayButton!
     @objc var isForReconnect: Bool = false
     var webView: WKWebView!
-
+    // Declare the CBCentralManager
+    var centralManager: CBCentralManager?
+    var isBluetoothEnabled: Bool = false
+    
+    // Declare the CLLocationManager
+    var locationManager: CLLocationManager?
+    var isLocationEnabled: Bool = false
     
     enum enumTableRow: Int, CaseIterable {
         case separator
@@ -40,11 +48,24 @@ class StartConnectionViewController: UIViewController {
                                 ImageTVC.self,
                                 ChargingIndicatorTVC.self])
         tableView.reloadData()
-        
+        UserDefaults.standard.set(isLocationEnabled, forKey: "isForReconnect")
+
+        let isForReconnect = UserDefaults.standard.bool(forKey: "isForReconnect")
+        if isForReconnect{
+            checkLocationPermission()
+            centralManager = CBCentralManager(delegate: self, queue: nil)
+            // If the switch is turned on, check if Bluetooth is powered on
+            checkBluetoothPermission()
+        }
         startConnectionJourneyButton.labelText = "Start Connection Journey"
         startConnectionJourneyButton.buttonTapCallback = {
-            let vc = ProvidePermissionViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
-            self.navigationController?.pushViewController(vc, animated: false)
+           
+            if isForReconnect{
+                self.updateBottomButtonState()
+            } else {
+                let vc = ProvidePermissionViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
+                self.navigationController?.pushViewController(vc, animated: false)
+            }
         }
 
         customTopView.onDemoTapped = {
@@ -66,6 +87,61 @@ class StartConnectionViewController: UIViewController {
             self.navigationController?.pushViewController(vc, animated: false)
         }
     }
+    
+    private func updateBottomButtonState() {
+        if isBluetoothEnabled && isLocationEnabled {
+            let vc = ConnectToTransmitterViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
+            self.navigationController?.pushViewController(vc, animated: false)
+        } else {
+            let vc = ProvidePermissionViewController.instantiate(fromStoryboard: Enum_stroyboard.Main.rawValue)
+            self.navigationController?.pushViewController(vc, animated: false)
+        }
+    }
+    
+    private func checkBluetoothPermission() {
+        isBluetoothEnabled = false
+        switch centralManager?.state {
+        case .unknown:
+            print("Bluetooth state is unknown.")
+        case .resetting:
+            print("Bluetooth state is resetting.")
+        case .unsupported:
+            print("Bluetooth is unsupported on this device.")
+        case .unauthorized:
+            print("Bluetooth is unauthorized.")
+            
+        case .poweredOff:
+            print("Bluetooth is powered off.")
+        case .poweredOn:
+            print("Bluetooth is powered on and available.")
+            isBluetoothEnabled = true
+        case .none:
+            print("Unknown Bluetooth state.")
+        @unknown default:
+            print("Unknown Bluetooth state.")
+        }
+    }
+
+    // Function to check Location Permission and State
+    private func checkLocationPermission() {
+        // Check if location services are enabled
+        
+        let status = CLLocationManager.authorizationStatus()
+        
+        switch status {
+        case .notDetermined:
+            print("Location permission is not determined.")
+            // Request permission to use location services
+            locationManager?.requestWhenInUseAuthorization()
+        case .restricted, .denied:
+            print("Location permission is restricted or denied.")
+        case .authorizedWhenInUse, .authorizedAlways:
+            print("Location is authorized.")
+            isLocationEnabled = true
+        @unknown default:
+            print("Unknown location status.")
+        }
+    }
 
     func checkForDevice() {
         let manager = KLTBluetoothManager.shared()
@@ -127,3 +203,11 @@ extension StartConnectionViewController: UITableViewDelegate, UITableViewDataSou
         }
     }
 }
+
+
+extension StartConnectionViewController: CBCentralManagerDelegate, CLLocationManagerDelegate {
+    // Delegate method called when Bluetooth state changes
+    func centralManagerDidUpdateState(_ central: CBCentralManager) {
+        checkBluetoothPermission()
+    }
+}

package/package.json

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