@sodyo/react-native-sodyo-sdk 3.9.0 → 3.9.1

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

@@ -10,8 +10,6 @@ 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.SodyoOpenCvScannerFragment;
+import com.sodyo.sdk.SodyoScannerFragment;
 
 public class RNSodyoSdkView extends SimpleViewManager<FrameLayout> {
     static final String TAG = "RNSodyoSdkView";
@@ -24,6 +24,10 @@ 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;
@@ -35,22 +39,19 @@ 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);
-        SodyoOpenCvScannerFragment sodyoFragment = new SodyoOpenCvScannerFragment();
+
+        if (sodyoFragment == null) {
+          Log.i(TAG,"init SodyoScannerFragment");
+          sodyoFragment = new SodyoScannerFragment();
+        }
 
         FragmentManager fragmentManager = mCallerContext.getCurrentActivity().getFragmentManager();
-        Fragment fragment = fragmentManager.findFragmentByTag(TAG_FRAGMENT);
         FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
 
-
-        if (fragment != null) {
-            fragmentTransaction.remove(fragment);
-        }
-
-        fragmentTransaction.add(sodyoFragment, TAG_FRAGMENT);
-        fragmentTransaction.commit();
+        fragmentTransaction.add(sodyoFragment, TAG_FRAGMENT).commit();
 
         fragmentManager.executePendingTransactions();
 
@@ -62,7 +63,10 @@ public class RNSodyoSdkView extends SimpleViewManager<FrameLayout> {
     public void onDropViewInstance(FrameLayout view) {
         super.onDropViewInstance(view);
 
-        Log.i(TAG, "onDropViewInstance");
+        Log.i(TAG,"onDropViewInstance");
+
+        sodyoFragment = null;
+        isCameraEnabled = true;
 
         try {
           FragmentManager fragmentManager = mCallerContext.getCurrentActivity().getFragmentManager();
@@ -71,9 +75,27 @@ 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.9.0",
+  "version": "3.9.1",
   "description": "RNSodyoSdk",
   "main": "sodyosdk.js",
   "typings": "./sodyosdk.d.ts",

package/sodyosdk.js

@@ -183,11 +183,25 @@ 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 { children, isTroubleShootingEnabled } = this.props;
+    const { isEnabled, isTroubleShootingEnabled, children } = this.props;
     return (
       <Fragment>
         <RNSodyoSdkView
+          isEnabled={isEnabled}
           isTroubleShootingEnabled={isTroubleShootingEnabled}
           style={{ height: '100%', width: '100%' }}
         />