@sodyo/react-native-sodyo-sdk 3.5.0 → 3.6.2

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 => "0f595bd" }
+  s.source       = { :git => "https://github.com/sodyo-ltd/SodyoSDKPod", :commit => "43303e7" }
   s.source_files  = "ios/**/*.{h,m}"
   s.requires_arc = true
 
   s.dependency "React"
-  s.dependency "SodyoSDK", "3.54.28"
+  s.dependency "SodyoSDK", "3.55.01"
 end
 

package/android/build.gradle

@@ -51,11 +51,14 @@ android {
 
 repositories {
     mavenCentral()
+    maven {
+      url 'http://172.28.2.86:8082/artifactory/local-release-qa'
+    }
 }
 
 dependencies {
     implementation ('com.facebook.react:react-native:+')
-    implementation ('com.sodyo:sodyo-android-sdk:3.54.39') {
+    implementation ('com.sodyo:sodyo-android-sdk:3.55.02@aar') {
       transitive = true
       exclude group: 'com.parse.bolts', module: 'bolts-android'
     }

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

@@ -31,6 +31,8 @@ import com.sodyo.sdk.SodyoInitCallback;
 import com.sodyo.sdk.SodyoScannerActivity;
 import com.sodyo.sdk.SodyoScannerCallback;
 import com.sodyo.sdk.SodyoMarkerContentCallback;
+import com.sodyo.sdk.SodyoModeCallback;
+import com.sodyo.app_sdk.data.SettingsHelper;
 
 public class RNSodyoSdkModule extends ReactContextBaseJavaModule {
   public static enum SodyoEnv {
@@ -78,7 +80,7 @@ public class RNSodyoSdkModule extends ReactContextBaseJavaModule {
     return "RNSodyoSdk";
   }
 
-  private class SodyoCallback implements SodyoScannerCallback, SodyoInitCallback, SodyoMarkerContentCallback {
+  private class SodyoCallback implements SodyoScannerCallback, SodyoInitCallback, SodyoMarkerContentCallback, SodyoModeCallback {
 
       private Callback successCallback;
       private Callback errorCallback;
@@ -106,6 +108,7 @@ public class RNSodyoSdkModule extends ReactContextBaseJavaModule {
           SodyoCallback callbackClosure = new SodyoCallback(null, null);
           Sodyo.getInstance().setSodyoScannerCallback(callbackClosure);
           Sodyo.getInstance().setSodyoMarkerContentCallback(callbackClosure);
+          Sodyo.getInstance().setSodyoModeCallback(callbackClosure);
       }
 
       /**
@@ -185,6 +188,21 @@ public class RNSodyoSdkModule extends ReactContextBaseJavaModule {
 
         sendEvent("EventMarkerContent", params);
       }
+
+      /**
+       * SodyoModeCallback implementation
+       */
+      @Override
+      public void onModeChange(SettingsHelper.ScannerViewMode oldMode, SettingsHelper.ScannerViewMode newMode) {
+        Log.i(TAG, "onModeChange()");
+
+        WritableMap params = Arguments.createMap();
+
+        params.putString("oldMode", oldMode.toString());
+        params.putString("newMode", newMode.toString());
+
+        sendEvent("ModeChangeCallback", params);
+      }
   }
 
   @ReactMethod
@@ -278,6 +296,25 @@ public class RNSodyoSdkModule extends ReactContextBaseJavaModule {
       Sodyo.startTroubleshoot(activity);
   }
 
+  @ReactMethod
+  public void setTroubleshootMode() {
+      Log.i(TAG, "setTroubleshootMode()");
+      Activity activity = getCurrentActivity();
+      Sodyo.setMode(activity, SettingsHelper.ScannerViewMode.Troubleshoot);
+  }
+
+  @ReactMethod
+  public void setNormalMode() {
+      Log.i(TAG, "setNormalMode()");
+      Activity activity = getCurrentActivity();
+      Sodyo.setMode(activity, SettingsHelper.ScannerViewMode.Normal);
+  }
+
+  @ReactMethod
+  public SettingsHelper.ScannerViewMode getMode() {
+    return Sodyo.getMode();
+  }
+
   @ReactMethod
   public void setSodyoLogoVisible(Boolean isVisible) {
     Log.i(TAG, "setSodyoLogoVisible()");

package/ios/RNSodyoScanner.h

@@ -0,0 +1,19 @@
+//
+//  RNSodyoScanner.h
+//  Pods
+//
+//  Created by Bogdan on 20.06.2022.
+//
+
+#ifndef RNSodyoScanner_h
+#define RNSodyoScanner_h
+
+
+#endif /* RNSodyoScanner_h */
+
+static UIViewController* sodyoScanner = nil;
+
+@interface RNSodyoScanner : NSObject
++ (UIViewController *)getSodyoScanner;
++ (void)setSodyoScanner:(UIViewController *)sodyoScanner;
+@end

package/ios/RNSodyoScanner.m

@@ -0,0 +1,23 @@
+//
+//  RNSodyoCallback.m
+//  RNSodyoSdk
+//
+//  Created by Bogdan on 20.06.2022.
+//
+#import "RNSodyoScanner.h"
+#import <Foundation/Foundation.h>
+
+@implementation RNSodyoScanner
+
++ (UIViewController *) getSodyoScanner {
+  return sodyoScanner;
+}
+
++ (void) setSodyoScanner:(UIViewController*) newSodyoScanner {
+  if(sodyoScanner != newSodyoScanner) {
+    sodyoScanner = newSodyoScanner;
+  }
+}
+
+@end
+// implementation of getter and setter

package/ios/RNSodyoSdk.m

@@ -1,5 +1,6 @@
 
 #import "RNSodyoSdk.h"
+#import "RNSodyoScanner.h"
 
 @implementation RNSodyoSdk
 
@@ -90,6 +91,30 @@ RCT_EXPORT_METHOD(performMarker:(NSString *) markerId)
     [SodyoSDK performMarker:markerId];
 }
 
+RCT_EXPORT_METHOD(startTroubleshoot)
+{
+    NSLog(@"startTroubleshoot");
+
+    [SodyoSDK startTroubleshoot:sodyoScanner];
+}
+
+
+RCT_EXPORT_METHOD(setTroubleshootMode)
+{
+    NSLog(@"setTroubleshootMode");
+    sodyoScanner = [RNSodyoScanner getSodyoScanner];
+
+    [SodyoSDK setMode:sodyoScanner mode:SodyoModeTroubleshoot];
+}
+
+RCT_EXPORT_METHOD(setNormalMode)
+{
+    NSLog(@"setNormalMode");
+    sodyoScanner = [RNSodyoScanner getSodyoScanner];
+
+    [SodyoSDK setMode:sodyoScanner mode:SodyoModeNormal];
+}
+
 RCT_EXPORT_METHOD(setSodyoLogoVisible:(BOOL *) isVisible)
 {
     NSLog(@"setSodyoLogoVisible");
@@ -111,13 +136,16 @@ RCT_EXPORT_METHOD(setEnv:(NSString *) env)
 
 - (NSArray<NSString *> *)supportedEvents
 {
-    return @[@"EventSodyoError", @"EventMarkerDetectSuccess", @"EventMarkerDetectError", @"EventMarkerContent", @"EventCloseSodyoContent"];
+    return @[@"EventSodyoError", @"EventMarkerDetectSuccess", @"EventMarkerDetectError", @"EventMarkerContent", @"EventCloseSodyoContent", @"ModeChangeCallback"];
 }
 
 - (void) launchSodyoScanner {
     NSLog(@"launchSodyoScanner");
-    if (!self->sodyoScanner) {
-        self->sodyoScanner = [SodyoSDK initSodyoScanner];
+    sodyoScanner = [RNSodyoScanner getSodyoScanner];
+
+
+    if (!sodyoScanner) {
+        [RNSodyoScanner setSodyoScanner:sodyoScanner];
     }
 
     if (sodyoScanner.isViewLoaded && sodyoScanner.view.window) {
@@ -142,6 +170,17 @@ RCT_EXPORT_METHOD(setEnv:(NSString *) env)
     [self sendEventWithName:@"EventCloseSodyoContent" body:nil];
 }
 
+- (NSString *) convertScannerModeToString:(SodyoMode)mode {
+    switch (mode) {
+        case SodyoModeTroubleshoot:
+            return @"Troubleshoot";
+        case SodyoModeNormal:
+            return @"Normal";
+        default:
+            return @"";
+    }
+}
+
 #pragma mark - SodyoSDKDelegate
 - (void) onSodyoAppLoadSuccess:(NSInteger)AppID {
     NSLog(@"onSodyoAppLoadSuccess");
@@ -177,4 +216,14 @@ RCT_EXPORT_METHOD(setEnv:(NSString *) env)
     NSLog(@"SodyoMarkerDetectedWithData: %@", Data);
     [self sendEventWithName:@"EventMarkerContent" body:@{@"markerId": markerId, @"data": Data}];
 }
+
+
+- (void) onModeChange:(SodyoMode)from to:(SodyoMode)to {
+    NSLog(@"onModeChange");
+    NSString* fromConverted = [self convertScannerModeToString:from];
+    NSString* toConverted = [self convertScannerModeToString:to];
+
+    [self sendEventWithName:@"ModeChangeCallback" body:@{@"oldMode": fromConverted, @"newMode": toConverted}];
+}
+
 @end

package/ios/RNSodyoSdkManager.m

@@ -14,9 +14,9 @@
 
 #import <UIKit/UIKit.h>
 #import "RNSodyoSdkView.m"
+#import "RNSodyoScanner.h"
 
 @interface RNSodyoSdkManager : RCTViewManager {
-    UIViewController *sodyoScanner;
 }
 @end
 
@@ -28,23 +28,43 @@ RCT_CUSTOM_VIEW_PROPERTY(isEnabled, BOOL, UIView)
 {
     NSLog(@"RNSodyoSdkManager set isEnabled");
 
-    if (!self->sodyoScanner) {
+    sodyoScanner = [RNSodyoScanner getSodyoScanner];
+
+    if (!sodyoScanner) {
         return;
     }
 
     if ([RCTConvert BOOL:json]) {
-        [SodyoSDK startScanning:self->sodyoScanner];
+        [SodyoSDK startScanning:sodyoScanner];
         return;
     }
 
-    [SodyoSDK stopScanning:self->sodyoScanner];
+    [SodyoSDK stopScanning:sodyoScanner];
+}
+
+RCT_CUSTOM_VIEW_PROPERTY(isTroubleShootingEnabled, BOOL, UIView)
+{
+    NSLog(@"RNSodyoSdkManager set isTroubleShootingEnabled");
+
+    sodyoScanner = [RNSodyoScanner getSodyoScanner];
+
+    if (!sodyoScanner) {
+        return;
+    }
+
+    if ([RCTConvert BOOL:json]) {
+        [SodyoSDK startTroubleshoot:sodyoScanner];
+        return;
+    }
 }
 
 - (UIView *)view
 {
     UIViewController *rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
 
-    self->sodyoScanner = [SodyoSDK initSodyoScanner];
+    sodyoScanner = [SodyoSDK initSodyoScanner];
+
+    [RNSodyoScanner setSodyoScanner:sodyoScanner];
     [rootViewController addChildViewController:sodyoScanner];
 
     RNSodyoSdkView *view = [[RNSodyoSdkView alloc] initWithView:sodyoScanner.view];

package/package.json

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

package/sodyosdk.d.ts

@@ -17,14 +17,19 @@ declare const _default: {
   setAppUserId (appUserId: string): void
   removeAllListeners (eventType?: string): void
   onMarkerContent (callback: (markerId: string, data: { [key: string]: any }) => void): () => void,
+  onModeChange (callback: (data: { [key: string]: any }) => void): () => void,
   performMarker (markerId: string): void,
   startTroubleshoot (): void,
   setSodyoLogoVisible (isVisible: boolean): void,
+  setTroubleshootMode (): void,
+  setNormalMode (): void,
+  getMode (): EScannerViewMode,
   setEnv(env: TEnv): void,
 }
 
 interface IScannerProps {
   isEnabled?: boolean
+  isTroubleShootingEnabled?: boolean
 }
 
 export declare class Scanner extends React.PureComponent<IScannerProps> {
@@ -34,4 +39,15 @@ export declare const SODYO_ENV: {
   [key in TEnv]: TEnv
 }
 
+export enum EScannerViewMode {
+  Normal = 'Normal',
+  Troubleshoot = 'Troubleshoot',
+  DeviceTester = 'DeviceTester'
+}
+
+export interface ISodyoMode {
+  newMode: EScannerViewMode,
+  oldMode: EScannerViewMode,
+}
+
 export default _default

package/sodyosdk.js

@@ -66,6 +66,20 @@ export default {
     };
   },
 
+  onModeChange: (callback) => {
+    eventEmitter.removeAllListeners('ModeChangeCallback');
+
+    const subscription = eventEmitter.addListener('ModeChangeCallback', (e) => {
+      if (typeof callback === 'function') {
+        callback(e);
+      }
+    });
+
+    return () => {
+      return subscription.remove();
+    };
+  },
+
   onCloseContent: (callback) => {
     if (Platform.OS !== 'ios') {
       return () => undefined;
@@ -151,29 +165,51 @@ export default {
     return RNSodyoSdk.setSodyoLogoVisible(isVisible);
   },
 
+  setTroubleshootMode: () => {
+    return RNSodyoSdk.setTroubleshootMode();
+  },
+
+  setNormalMode: () => {
+    return RNSodyoSdk.setNormalMode();
+  },
+
   setEnv: (env) => {
     return RNSodyoSdk.setEnv(env);
   },
+
+  getMode: () => {
+    return RNSodyoSdk.getMode();
+  },
 };
 
 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, children } = this.props;
+    const { isEnabled, isTroubleShootingEnabled, children } = this.props;
     return (
-        <Fragment>
-          <RNSodyoSdkView
-              isEnabled={isEnabled}
-              style={{ height: '100%', width: '100%' }}
-          />
-
-          <View style={styles.container} pointerEvents="box-none">
-            {children}
-          </View>
-        </Fragment>
+      <Fragment>
+        <RNSodyoSdkView
+          isEnabled={isEnabled}
+          isTroubleShootingEnabled={isTroubleShootingEnabled}
+          style={{ height: '100%', width: '100%' }}
+        />
+
+        <View style={styles.container} pointerEvents="box-none">
+          {children}
+        </View>
+      </Fragment>
     );
   }
 }