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

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

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

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

@@ -103,8 +103,6 @@ class StartCGMActivity : AppCompatActivity() {
         // Add location permissions
         requiredPermissions.addAll(PermissionUtils.LOCAL_PERMISSION)
 
-        // Add camera permission
-        requiredPermissions.addAll(PermissionUtils.CAMERA_PERMISSION)
 
         return requiredPermissions.all {
             ContextCompat.checkSelfPermission(

package/android/src/main/res/color/radio_text_selector.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@android:color/white" android:state_checked="true"/>
+  <item android:color="#000000" android:state_checked="true"/>
   <item android:color="#333333"/>
 </selector>

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

@@ -102,7 +102,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="12dp"
-            android:drawableStart="@drawable/custom_radio_icon_selector"
             android:drawablePadding="10dp"
             android:text="Purchasing New CGM" />
 
@@ -112,7 +111,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="12dp"
-            android:drawableStart="@drawable/custom_radio_icon_selector"
             android:drawablePadding="10dp"
             android:text="Connecting My CGM" />
 
@@ -121,7 +119,6 @@
             style="@style/CustomRadioButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/custom_radio_icon_selector"
             android:drawablePadding="10dp"
             android:text="Having troubles after connection" />
     </RadioGroup>

package/android/src/main/res/values/styles.xml

@@ -1,109 +1,110 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-  <style name="MyTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    <!--    <style name="MyTheme" parent="@android:style/Theme.Holo.NoActionBar.Fullscreen">-->
-    <!--        底部导航栏透明，但是会有一层灰度-->
-    <!--        <item name="android:windowTranslucentNavigation">false</item>-->
-
-    <!--        <item name="android:windowFullscreen">true</item>-->
-    <!--        顶部状态栏透明，但是会有一层灰度-->
-    <!--        <item name="android:windowTranslucentStatus">false</item>-->
-    <!--        界面控件文字显示在顶部状态栏直下，底部导航栏之上-->
-    <!--        <item name="android:fitsSystemWindows">true</item>-->
-    <!--        ActionBar 标题栏的颜色-->
-    <!--        <item name="android:windowBackground">@drawable/star</item>-->
-    <item name="colorPrimary">@color/transparent</item>
-    <!--        顶部状态栏的背景颜色-->
-    <item name="colorPrimaryDark">@color/color_33353F67</item>
-    <!--        statusBarColor 比 colorPrimaryDark高级，同时存在时会覆盖 colorPrimaryDark-->
-    <item name="android:statusBarColor">@color/color_33353F67</item>
-    <!--        底部导航栏的颜色-->
-    <item name="android:navigationBarColor">@color/color_33353F67</item>
-    <!--        默认控件的颜色 比如说CheckBox 等-->
-    <item name="colorAccent">@color/colorAccent</item>
-    <!--        默认按钮的颜色-->
-    <item name="colorButtonNormal">@color/colorAccent</item>
-    <!--        默认文字的颜色-->
-    <item name="android:textColor">@color/textColor</item>
-    <!--        是否默认文字全部大写-->
-    <item name="textAllCaps">false</item>
-
-    <item name="android:autofilledHighlight" tools:targetApi="o">@color/transparent</item>
-
-    <item name="android:windowAnimationStyle">@style/Animation.None</item>
-
-  </style>
-
-  <style name="Animation.None" parent="@android:style/Animation">
-    <item name="android:activityOpenEnterAnimation">@null</item>
-    <item name="android:activityOpenExitAnimation">@null</item>
-    <item name="android:activityCloseEnterAnimation">@null</item>
-    <item name="android:activityCloseExitAnimation">@null</item>
-  </style>
-
-  <style name="AnimBottom" parent="@android:style/Animation">
-    <item name="android:windowEnterAnimation">@anim/pop_up_in</item>
-    <item name="android:windowExitAnimation">@anim/pop_down_out</item>
-  </style>
-
-  <style name="AnimSide" parent="@android:style/Animation">
-    <item name="android:windowEnterAnimation">@anim/pop_left_right</item>
-    <item name="android:windowExitAnimation">@anim/pop_right_left</item>
-  </style>
-
-  <style name="WarnDialog" parent="android:style/Theme.Dialog">
-    <!--背景颜色及和透明程度-->
-    <item name="android:background">@android:color/transparent</item>
-    <item name="android:windowBackground">@android:color/transparent</item>
-    <!--是否去除标题 -->
-    <item name="android:windowNoTitle">true</item>
-    <!--是否去除边框-->
-    <item name="android:windowFrame">@null</item>
-    <!--是否浮现在activity之上-->
-    <item name="android:windowIsFloating">true</item>
-    <!--是否模糊-->
-    <item name="android:backgroundDimEnabled">true</item>
-  </style>
-
-  <declare-styleable name="MaxHeightRecyclerView">
-    <attr name="maxHeight" format="dimension" />
-  </declare-styleable>
-
-  <style name="RoundedCornerImage">
-    <item name="cornerFamily">rounded</item>
-    <item name="cornerSize">20dp</item>
-  </style>
-
-  <style name="CustomBottomSheetDialogTheme" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
-    <item name="bottomSheetStyle">@style/CustomBottomSheetStyle</item>
-    <item name="android:windowIsFloating">false</item>
-    <item name="android:windowSoftInputMode">adjustResize</item>
-  </style>
-
-  <!-- Style for the bottom sheet itself -->
-  <style name="CustomBottomSheetStyle" parent="Widget.MaterialComponents.BottomSheet">
-    <item name="android:background">@android:color/transparent</item>
-    <item name="behavior_peekHeight">0dp</item>
-    <item name="behavior_fitToContents">true</item>
-    <item name="behavior_hideable">true</item>
-    <item name="behavior_skipCollapsed">true</item>
-    <item name="shapeAppearance">@style/CustomShapeAppearance</item>
-  </style>
-
-  <!-- Shape appearance for rounded corners -->
-  <style name="CustomShapeAppearance" parent="">
-    <item name="cornerFamily">rounded</item>
-    <item name="cornerSizeTopLeft">16dp</item>
-    <item name="cornerSizeTopRight">16dp</item>
-    <item name="cornerSizeBottomLeft">0dp</item>
-    <item name="cornerSizeBottomRight">0dp</item>
-  </style>
-
-  <style name="CustomRadioButton" parent="Widget.AppCompat.CompoundButton.RadioButton">
-        <item name="android:button">@null</item>
+    <style name="MyTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!--    <style name="MyTheme" parent="@android:style/Theme.Holo.NoActionBar.Fullscreen">-->
+        <!--        底部导航栏透明，但是会有一层灰度-->
+        <!--        <item name="android:windowTranslucentNavigation">false</item>-->
+
+        <!--        <item name="android:windowFullscreen">true</item>-->
+        <!--        顶部状态栏透明，但是会有一层灰度-->
+        <!--        <item name="android:windowTranslucentStatus">false</item>-->
+        <!--        界面控件文字显示在顶部状态栏直下，底部导航栏之上-->
+        <!--        <item name="android:fitsSystemWindows">true</item>-->
+        <!--        ActionBar 标题栏的颜色-->
+        <!--        <item name="android:windowBackground">@drawable/star</item>-->
+        <item name="colorPrimary">@color/transparent</item>
+        <!--        顶部状态栏的背景颜色-->
+        <item name="colorPrimaryDark">@color/color_33353F67</item>
+        <!--        statusBarColor 比 colorPrimaryDark高级，同时存在时会覆盖 colorPrimaryDark-->
+        <item name="android:statusBarColor">@color/color_33353F67</item>
+        <!--        底部导航栏的颜色-->
+        <item name="android:navigationBarColor">@color/color_33353F67</item>
+        <!--        默认控件的颜色 比如说CheckBox 等-->
+        <item name="colorAccent">@color/colorAccent</item>
+        <!--        默认按钮的颜色-->
+        <item name="colorButtonNormal">@color/colorAccent</item>
+        <!--        默认文字的颜色-->
+        <item name="android:textColor">@color/textColor</item>
+        <!--        是否默认文字全部大写-->
+        <item name="textAllCaps">false</item>
+
+        <item name="android:autofilledHighlight" tools:targetApi="o">@color/transparent</item>
+
+        <item name="android:windowAnimationStyle">@style/Animation.None</item>
+
+    </style>
+
+    <style name="Animation.None" parent="@android:style/Animation">
+        <item name="android:activityOpenEnterAnimation">@null</item>
+        <item name="android:activityOpenExitAnimation">@null</item>
+        <item name="android:activityCloseEnterAnimation">@null</item>
+        <item name="android:activityCloseExitAnimation">@null</item>
+    </style>
+
+    <style name="AnimBottom" parent="@android:style/Animation">
+        <item name="android:windowEnterAnimation">@anim/pop_up_in</item>
+        <item name="android:windowExitAnimation">@anim/pop_down_out</item>
+    </style>
+
+    <style name="AnimSide" parent="@android:style/Animation">
+        <item name="android:windowEnterAnimation">@anim/pop_left_right</item>
+        <item name="android:windowExitAnimation">@anim/pop_right_left</item>
+    </style>
+
+    <style name="WarnDialog" parent="android:style/Theme.Dialog">
+        <!--背景颜色及和透明程度-->
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <!--是否去除标题 -->
+        <item name="android:windowNoTitle">true</item>
+        <!--是否去除边框-->
+        <item name="android:windowFrame">@null</item>
+        <!--是否浮现在activity之上-->
+        <item name="android:windowIsFloating">true</item>
+        <!--是否模糊-->
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
+
+    <declare-styleable name="MaxHeightRecyclerView">
+        <attr name="maxHeight" format="dimension" />
+    </declare-styleable>
+
+    <style name="RoundedCornerImage">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">20dp</item>
+    </style>
+
+    <style name="CustomBottomSheetDialogTheme" parent="Theme.MaterialComponents.Light.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/CustomBottomSheetStyle</item>
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:windowSoftInputMode">adjustResize</item>
+    </style>
+
+    <!-- Style for the bottom sheet itself -->
+    <style name="CustomBottomSheetStyle" parent="Widget.MaterialComponents.BottomSheet">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="behavior_peekHeight">0dp</item>
+        <item name="behavior_fitToContents">true</item>
+        <item name="behavior_hideable">true</item>
+        <item name="behavior_skipCollapsed">true</item>
+        <item name="shapeAppearance">@style/CustomShapeAppearance</item>
+    </style>
+
+    <!-- Shape appearance for rounded corners -->
+    <style name="CustomShapeAppearance" parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSizeTopLeft">16dp</item>
+        <item name="cornerSizeTopRight">16dp</item>
+        <item name="cornerSizeBottomLeft">0dp</item>
+        <item name="cornerSizeBottomRight">0dp</item>
+    </style>
+
+    <style name="CustomRadioButton" parent="Widget.AppCompat.CompoundButton.RadioButton">
+        <item name="android:button">@drawable/custom_radio_icon_selector</item>
         <item name="android:padding">10dp</item>
         <item name="android:fontFamily">@font/roboto_regular</item>
-  </style>
+        <item name="android:textColor">@color/radio_text_selector</item>
+    </style>
 
 
 </resources>

package/ios/MyReactNativeBridge.m

@@ -11,6 +11,9 @@
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTEventEmitter.h>
 #import "react_native_mytatva_rn_sdk-Swift.h"
+
+#import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
 @implementation MyEventEmitterManager
 
 RCT_EXPORT_MODULE();
@@ -63,6 +66,31 @@ RCT_EXPORT_MODULE();
     [self sendEventWithName:@"cgmDeviceEvent" body:@{@"status": @"WARM_PERIOD_STARTED"}];
 }
 
+// Private helper
+- (void)observeTransmitterUnbindStatusInternal:(NSString *)token
+                                       response:(NSDictionary *)responseDict
+                                     completion:(void (^)(NSDictionary *response, NSError *error))completion;
+{
+    // 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];
+    }
+
+    // Call Swift method which reads CGMStatusItem from UserDefaults
+    FinalViewModelManager *manager = [FinalViewModelManager shared];
+    [manager callForObserveTransmitterUnbindStatusWithCompletion:^(NSDictionary *response, NSError *error) {
+        if (completion) {
+            completion(response, error);
+        }
+    }];
+}
+
 // Clean up the observer when the module is deallocated
 - (void)dealloc
 {
@@ -72,29 +100,62 @@ 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);
     
     [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
     [[NSUserDefaults standardUserDefaults] synchronize];
-    [self observeTransmitterUnbindStatus:token];
     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]];
         
-        // Try to get the topmost navigation controller
-        
-        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"MainCGM" bundle:nil];
-        UIViewController *nativeVC = [storyboard instantiateViewControllerWithIdentifier:@"StartConnectionViewController"];
+        // 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:nativeVC];
+        UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:reconnectVC];
         navController.modalPresentationStyle = UIModalPresentationOverFullScreen;
-        if (nativeVC) {
+        if (reconnectVC) {
             [rootVC presentViewController:navController animated:YES completion:nil];
         }
     });
 }
 
+
+
 RCT_EXPORT_METHOD(reconnectCgmTracky:(NSString *)token)
 {
     NSLog(@"Received token: %@", token);
@@ -182,13 +243,52 @@ 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)
+RCT_EXPORT_METHOD(observeTransmitterUnbindStatus:(NSString *)token response:(NSString *)responseJsonString)
 {
-    NSLog(@"Received token: %@", token);
-    [[NSUserDefaults standardUserDefaults] setObject:token forKey:@"authToken"];
-    [[NSUserDefaults standardUserDefaults] synchronize];
-    FinalViewModelManager *manager = [FinalViewModelManager shared];
-    [manager callForObserveTransmitterUnbindStatus];
+    // 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