@sodyo/react-native-sodyo-sdk 3.8.6 → 3.9.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.60.06
+[SodyoSDK for iOS](https://github.com/sodyo-ltd/SodyoSDKPod) v3.60.07
 
-[SodyoSDK for Android](https://search.maven.org/search?q=a:sodyo-android-sdk) v3.60.03
+[SodyoSDK for Android](https://search.maven.org/search?q=a:sodyo-android-sdk) v3.60.05
 
 
 ## 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 => "d9110b4" }
+  s.source       = { :git => "https://github.com/sodyo-ltd/SodyoSDKPod", :commit => "7c30b89" }
   s.source_files  = "ios/**/*.{h,m}"
   s.requires_arc = true
 
   s.dependency "React"
-  s.dependency "SodyoSDK", "3.60.06"
+  s.dependency "SodyoSDK", "3.60.07"
 end
 

package/android/build.gradle

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

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

@@ -10,6 +10,8 @@ package com.sodyo.RNSodyoSDK;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableType;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.Arguments;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -13,7 +13,7 @@ import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import javax.annotation.Nullable;
 
-import com.sodyo.sdk.SodyoScannerFragment;
+import com.sodyo.sdk.SodyoOpenCvScannerFragment;
 
 public class RNSodyoSdkView extends SimpleViewManager<FrameLayout> {
     static final String TAG = "RNSodyoSdkView";
@@ -24,10 +24,6 @@ public class RNSodyoSdkView extends SimpleViewManager<FrameLayout> {
 
     private final @Nullable ReactApplicationContext mCallerContext;
 
-    private @Nullable SodyoScannerFragment sodyoFragment;
-
-    private boolean isCameraEnabled = true;
-
     @Override
     public String getName() {
         return REACT_CLASS;
@@ -39,19 +35,22 @@ public class RNSodyoSdkView extends SimpleViewManager<FrameLayout> {
 
     @Override
     public FrameLayout createViewInstance(ThemedReactContext context) {
-        Log.i(TAG,"createViewInstance");
+        Log.i(TAG, "createViewInstance");
 
         final FrameLayout view = new FrameLayout(context);
-
-        if (sodyoFragment == null) {
-          Log.i(TAG,"init SodyoScannerFragment");
-          sodyoFragment = new SodyoScannerFragment();
-        }
+        SodyoOpenCvScannerFragment sodyoFragment = new SodyoOpenCvScannerFragment();
 
         FragmentManager fragmentManager = mCallerContext.getCurrentActivity().getFragmentManager();
+        Fragment fragment = fragmentManager.findFragmentByTag(TAG_FRAGMENT);
         FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
 
-        fragmentTransaction.add(sodyoFragment, TAG_FRAGMENT).commit();
+
+        if (fragment != null) {
+            fragmentTransaction.remove(fragment);
+        }
+
+        fragmentTransaction.add(sodyoFragment, TAG_FRAGMENT);
+        fragmentTransaction.commit();
 
         fragmentManager.executePendingTransactions();
 
@@ -63,10 +62,7 @@ public class RNSodyoSdkView extends SimpleViewManager<FrameLayout> {
     public void onDropViewInstance(FrameLayout view) {
         super.onDropViewInstance(view);
 
-        Log.i(TAG,"onDropViewInstance");
-
-        sodyoFragment = null;
-        isCameraEnabled = true;
+        Log.i(TAG, "onDropViewInstance");
 
         try {
           FragmentManager fragmentManager = mCallerContext.getCurrentActivity().getFragmentManager();
@@ -75,27 +71,9 @@ public class RNSodyoSdkView extends SimpleViewManager<FrameLayout> {
           if (fragment != null) {
               fragmentManager.beginTransaction().remove(fragment).commit();
           }
+
         } catch (Exception e) {
-          e.printStackTrace();
+            e.printStackTrace();
         }
     }
-
-    @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 (!isEnabled && isCameraEnabled) {
-        Log.i(TAG,"stop camera");
-        isCameraEnabled = false;
-        sodyoFragment.stopCamera();
-      }
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sodyo/react-native-sodyo-sdk",
-  "version": "3.8.6",
+  "version": "3.9.0",
   "description": "RNSodyoSdk",
   "main": "sodyosdk.js",
   "typings": "./sodyosdk.d.ts",

package/sodyosdk.js

@@ -183,25 +183,11 @@ export default {
 };
 
 export class Scanner extends Component {
-  static defaultProps = {
-    isEnabled: true,
-    isTroubleShootingEnabled: false,
-  };
-
-  componentDidUpdate(prevProps: Readonly<P>, prevState: Readonly<S>, snapshot: SS) {
-    if (this.props.isTroubleShootingEnabled) {
-      if (Platform.OS !== 'ios') {
-        return RNSodyoSdk.startTroubleshoot()
-      }
-    }
-  }
-
   render () {
-    const { isEnabled, isTroubleShootingEnabled, children } = this.props;
+    const { children, isTroubleShootingEnabled } = this.props;
     return (
       <Fragment>
         <RNSodyoSdkView
-          isEnabled={isEnabled}
           isTroubleShootingEnabled={isTroubleShootingEnabled}
           style={{ height: '100%', width: '100%' }}
         />