@sodyo/react-native-sodyo-sdk 4.0.0 → 5.0.0

package/README.md

@@ -1,9 +1,9 @@
 
 # React Native Sodyo SDK Plugin that wraps Sodyo sdk for Android and iOS
 
-[SodyoSDK for iOS](https://github.com/sodyo-ltd/SodyoSDKPod) v3.64.02
+[SodyoSDK for iOS](https://github.com/sodyo-ltd/SodyoSDKPod) 3.68.04
 
-[SodyoSDK for Android](https://search.maven.org/search?q=a:sodyo-android-sdk) 3.65.18
+[SodyoSDK for Android](https://search.maven.org/search?q=a:sodyo-android-sdk) 3.69.10
 
 
 ## Install

package/RNSodyoSdk.podspec

@@ -12,11 +12,11 @@ Pod::Spec.new do |s|
   s.author         = package['author']
   s.homepage       = package['homepage']
   s.platform     = :ios, "11.0"
-  s.source       = { :git => "https://github.com/sodyo-ltd/SodyoSDKPod", :commit => "992534f" }
+  s.source       = { :git => "https://github.com/sodyo-ltd/SodyoSDKPod", :commit => "65b38d6" }
   s.source_files  = "ios/**/*.{h,m}"
   s.requires_arc = true
 
   s.dependency "React"
-  s.dependency "SodyoSDK", "3.64.02"
+  s.dependency "SodyoSDK", "3.68.04"
 end
 

package/android/build.gradle

@@ -55,7 +55,7 @@ repositories {
 
 dependencies {
     implementation ('com.facebook.react:react-native:+')
-    implementation ('com.sodyo:sodyo-android-sdk:3.65.20') {
+    implementation ('com.sodyo:sodyo-android-sdk:3.69.10') {
       transitive = true
       exclude group: 'com.parse.bolts', module: 'bolts-android'
     }

package/android/src/main/java/com/sodyo/RNSodyoSdk/RNSodyoSdkModule.java

@@ -288,6 +288,15 @@ public class RNSodyoSdkModule extends ReactContextBaseJavaModule {
       Sodyo.stopScanning();
   }
 
+  @ReactMethod
+  public void setDynamicProfile(ReadableMap profile) {
+    Log.i(TAG, "setDynamicProfile()");
+    if (profile != null) {
+        HashMap<String, Object> profileMap = new HashMap<>(ConversionUtil.toMap(profile));
+        Sodyo.setDynamicProfile(profileMap);
+    }
+  }
+
   @ReactMethod
   public void setDynamicProfileValue(String key, String value) {
      Log.i(TAG, "setDynamicProfileValue()");

package/android/src/main/java/com/sodyo/RNSodyoSdk/RNSodyoSdkView.java

@@ -1,110 +1,113 @@
 package com.sodyo.RNSodyoSDK;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-
-import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.annotations.ReactProp;
 
 import android.util.Log;
 import android.widget.FrameLayout;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.app.Activity;
+
+import javax.annotation.Nullable;
 
 import com.sodyo.sdk.SodyoScannerFragment;
 
+@SuppressWarnings("deprecation")
 public class RNSodyoSdkView extends SimpleViewManager<FrameLayout> {
-    private static final String TAG = "RNSodyoSdkView";
-    private static final String TAG_FRAGMENT = "SODYO_SCANNER";
+    static final String TAG = "RNSodyoSdkView";
+
+    static final String TAG_FRAGMENT = "SODYO_SCANNER";
+
     public static final String REACT_CLASS = "RNSodyoSdkView";
 
     private final @Nullable ReactApplicationContext mCallerContext;
+
     private @Nullable SodyoScannerFragment sodyoFragment;
-    private boolean isCameraEnabled = true;
 
-    public RNSodyoSdkView(ReactApplicationContext callerContext) {
-        mCallerContext = callerContext;
-    }
+    private boolean isCameraEnabled = true;
 
-    @NonNull
     @Override
     public String getName() {
         return REACT_CLASS;
     }
 
-    @NonNull
+    public RNSodyoSdkView(ReactApplicationContext callerContext) {
+        mCallerContext = callerContext;
+    }
+
     @Override
-    public FrameLayout createViewInstance(@NonNull ThemedReactContext context) {
-        Log.i(TAG, "createViewInstance");
+    public FrameLayout createViewInstance(ThemedReactContext context) {
+        Log.i(TAG,"createViewInstance");
 
         final FrameLayout view = new FrameLayout(context);
 
-        FragmentActivity currentActivity = (FragmentActivity) mCallerContext.getCurrentActivity();
+        Activity currentActivity = mCallerContext.getCurrentActivity();
         if (currentActivity == null) {
             Log.e(TAG, "Current activity is null, cannot initialize SodyoScannerFragment");
             return view;
         }
 
-        if (sodyoFragment == null) {
-            Log.i(TAG, "init SodyoScannerFragment");
-            sodyoFragment = new SodyoScannerFragment();
+        FragmentManager fragmentManager = currentActivity.getFragmentManager();
+
+        // Clean up any previously added fragment to avoid "Fragment already added"
+        Fragment existing = fragmentManager.findFragmentByTag(TAG_FRAGMENT);
+        if (existing != null) {
+            Log.w(TAG, "Removing existing SodyoScannerFragment before re-adding");
+            fragmentManager.beginTransaction().remove(existing).commitNowAllowingStateLoss();
         }
 
-        FragmentManager fragmentManager = currentActivity.getSupportFragmentManager();
-        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+        Log.i(TAG,"init SodyoScannerFragment");
+        sodyoFragment = new SodyoScannerFragment();
 
+        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
         fragmentTransaction.add(sodyoFragment, TAG_FRAGMENT).commitAllowingStateLoss();
         fragmentManager.executePendingTransactions();
 
-        view.addView(sodyoFragment.getView(), new FrameLayout.LayoutParams(
-                FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
+        view.addView(sodyoFragment.getView(), FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT);
         return view;
     }
 
     @Override
-    public void onDropViewInstance(@NonNull FrameLayout view) {
+    public void onDropViewInstance(FrameLayout view) {
         super.onDropViewInstance(view);
 
-        Log.i(TAG, "onDropViewInstance");
+        Log.i(TAG,"onDropViewInstance");
 
         sodyoFragment = null;
         isCameraEnabled = true;
 
         try {
-            FragmentActivity currentActivity = (FragmentActivity) mCallerContext.getCurrentActivity();
-            if (currentActivity != null) {
-                FragmentManager fragmentManager = currentActivity.getSupportFragmentManager();
-                Fragment fragment = fragmentManager.findFragmentByTag(TAG_FRAGMENT);
-
-                if (fragment != null) {
-                    fragmentManager.beginTransaction().remove(fragment).commitAllowingStateLoss();
-                }
-            }
+          FragmentManager fragmentManager = mCallerContext.getCurrentActivity().getFragmentManager();
+          Fragment fragment = fragmentManager.findFragmentByTag(TAG_FRAGMENT);
+
+          if (fragment != null) {
+              fragmentManager.beginTransaction().remove(fragment).commitNowAllowingStateLoss();
+          }
         } catch (Exception e) {
-            Log.e(TAG, "Error dropping view instance", e);
+          e.printStackTrace();
         }
     }
 
-    @ReactProp(name = "isEnabled", defaultBoolean = true)
+    @ReactProp(name = "isEnabled", defaultBoolean=true)
     public void setIsEnabled(FrameLayout view, boolean isEnabled) {
-        if (sodyoFragment == null) {
-            return;
-        }
-
-        if (isEnabled && !isCameraEnabled) {
-            Log.i(TAG, "start camera");
-            isCameraEnabled = true;
-            sodyoFragment.startCamera();
-        }
+      if (sodyoFragment == null) {
+        return;
+      }
 
-        if (!isEnabled && isCameraEnabled) {
-            Log.i(TAG, "stop camera");
-            isCameraEnabled = false;
-            sodyoFragment.stopCamera();
-        }
+      if (isEnabled && !isCameraEnabled) {
+        Log.i(TAG,"start camera");
+        isCameraEnabled = true;
+        sodyoFragment.startCamera();
+      }
+
+      if (!isEnabled && isCameraEnabled) {
+        Log.i(TAG,"stop camera");
+        isCameraEnabled = false;
+        sodyoFragment.stopCamera();
+      }
     }
 }

package/ios/RNSodyoSdk.m

@@ -77,6 +77,12 @@ RCT_EXPORT_METHOD(addScannerParam:(NSString *) key value:(NSString *) value)
     [SodyoSDK addScannerParams:key value:value];
 }
 
+RCT_EXPORT_METHOD(setDynamicProfile:(NSDictionary *) profile)
+{
+    NSLog(@"setDynamicProfile");
+    [SodyoSDK setDynamicProfile:profile];
+}
+
 RCT_EXPORT_METHOD(setDynamicProfileValue:(NSString *) key value:(NSString *) value)
 {
     NSLog(@"setDynamicProfileValue");

package/ios/RNSodyoSdkManager.m

@@ -13,7 +13,7 @@
 #endif
 
 #import <UIKit/UIKit.h>
-#import "RNSodyoSdkView.m"
+#import "RNSodyoSdkView.h"
 #import "RNSodyoScanner.h"
 
 @interface RNSodyoSdkManager : RCTViewManager {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sodyo/react-native-sodyo-sdk",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "description": "RNSodyoSdk",
   "main": "sodyosdk.js",
   "typings": "./sodyosdk.d.ts",
@@ -22,6 +22,6 @@
   "license": "MIT",
   "homepage": "https://www.sodyo.com",
   "peerDependencies": {
-    "react-native": "^0.41.2"
+    "react-native": "^0.69.12"
   }
 }

package/sodyosdk.d.ts

@@ -14,6 +14,7 @@ declare const _default: {
   setUserInfo (userInfo: { [key: string]: string | number }): void
   setScannerParams (scannerPreferences: { [key: string]: string }): void
   addScannerParam (key: string, value: string): void
+  setDynamicProfile (profile: { [key: string]: any }): void,
   setDynamicProfileValue (key: string, value: string): void
   setCustomAdLabel (label: string): void
   setAppUserId (appUserId: string): void

package/sodyosdk.js

@@ -161,6 +161,10 @@ export default {
     return RNSodyoSdk.setDynamicProfileValue(key, value);
   },
 
+  setDynamicProfile: (profile) => {
+    return RNSodyoSdk.setDynamicProfile(profile);
+  },
+
   setCustomAdLabel: (label) => {
     return RNSodyoSdk.setCustomAdLabel(label);
   },
@@ -196,7 +200,7 @@ export class Scanner extends Component {
     isTroubleShootingEnabled: false,
   };
 
-  componentDidUpdate(prevProps: Readonly<P>, prevState: Readonly<S>, snapshot: SS) {
+  componentDidUpdate(prevProps, prevState, snapshot) {
     if (this.props.isTroubleShootingEnabled) {
       if (Platform.OS !== 'ios') {
         return RNSodyoSdk.startTroubleshoot()