@infilectorg/infiviz-shots-react-sdk 1.2.4 → 1.2.6

package/README.md

@@ -5,6 +5,9 @@
 Following are the versions for **React Native SDK**
 
 
+- **V 1.2.6** <br/>
+1. Added Support for android 7
+
 - **V 1.0.11** <br/>
 1. [Fixed startCamera not returning sessionId in android]
 

package/android/build.gradle

@@ -108,7 +108,7 @@ dependencies {
   implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
 
 
-  implementation 'com.infilect:infivizshots-sdk:RN-1.2.3'
+  implementation 'com.infilect:infivizshots-sdk:RN-1.2.5'
 
   testImplementation 'junit:junit:4.13.2'
   implementation 'com.github.bumptech.glide:glide:4.14.2'

package/android/src/main/java/com/infilect/infivizshotsreactsdk/InfivizShotsReactSdkModule.kt

@@ -14,9 +14,13 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.WritableArray
+import com.facebook.react.bridge.WritableMap
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.core.DeviceEventManagerModule
 import com.google.gson.Gson
+import org.json.JSONArray
+import org.json.JSONObject
 import com.infilect.actions.ACTION_TYPE
 import com.infilect.actions.IRResultAndActionsCallback
 import infilect.infiviz.InfiVizShotsSDK
@@ -158,7 +162,7 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
                 }
 
                 override fun onInfivizShotsSDKInitFailed(p0: SDKExceptions) {
-                    promise.reject("SDK Initialized Failed -> ${p0.message}")
+                    promise.reject("SDK_INIT_ERROR", "SDK Initialized Failed -> ${p0.message}", p0)
                 }
             }, appID, authSecret, accountKey, userID, clientID, apiToken, environment
         )
@@ -319,6 +323,50 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
         return list
     }
 
+    private fun convertJsonToWritableMap(jsonObject: JSONObject): WritableMap {
+        val writableMap = Arguments.createMap()
+        
+        val keys = jsonObject.keys()
+        while (keys.hasNext()) {
+            val key = keys.next()
+            val value = jsonObject.get(key)
+            
+            when (value) {
+                is String -> writableMap.putString(key, value)
+                is Int -> writableMap.putInt(key, value)
+                is Long -> writableMap.putDouble(key, value.toDouble())
+                is Double -> writableMap.putDouble(key, value)
+                is Boolean -> writableMap.putBoolean(key, value)
+                is JSONObject -> writableMap.putMap(key, convertJsonToWritableMap(value))
+                is JSONArray -> writableMap.putArray(key, convertJsonArrayToWritableArray(value))
+                else -> writableMap.putString(key, value.toString())
+            }
+        }
+        
+        return writableMap
+    }
+
+    private fun convertJsonArrayToWritableArray(jsonArray: JSONArray): WritableArray {
+        val writableArray = Arguments.createArray()
+        
+        for (i in 0 until jsonArray.length()) {
+            val value = jsonArray.get(i)
+            
+            when (value) {
+                is String -> writableArray.pushString(value)
+                is Int -> writableArray.pushInt(value)
+                is Long -> writableArray.pushDouble(value.toDouble())
+                is Double -> writableArray.pushDouble(value)
+                is Boolean -> writableArray.pushBoolean(value)
+                is JSONObject -> writableArray.pushMap(convertJsonToWritableMap(value))
+                is JSONArray -> writableArray.pushArray(convertJsonArrayToWritableArray(value))
+                else -> writableArray.pushString(value.toString())
+            }
+        }
+        
+        return writableArray
+    }
+
     @ReactMethod
     fun fetchSessionDetails(
         temporarySessionID: String,
@@ -326,10 +374,41 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
     ) {
         InfiVizShotsSDK.fetchSessionDetails(
             currentActivity!!,
-            temporarySessionID, object : SDKCallback<InfiSession> {
-                override fun onSuccess(response: InfiSession) {
-                    val responseJson = Gson().toJson(response)
-                    promise.resolve(responseJson)
+            temporarySessionID, object : SDKCallback<String> {
+                override fun onSuccess(response: String) {
+                    try {
+                        // Parse the response JSON string
+                        val jsonObject = JSONObject(response)                        
+                        // Check if data field exists and is a string
+                        if (jsonObject.has("data")) {
+                            val dataValue = jsonObject.get("data")
+                            if (dataValue is String) {
+                                val dataString = jsonObject.getString("data")
+                                
+                                val sessionData = JSONObject(dataString)                                
+                                // Create a new response object with parsed session data
+                                val finalResponse = JSONObject()
+                                finalResponse.put("data", sessionData)
+                                finalResponse.put("status", jsonObject.optString("status", "723"))
+                                finalResponse.put("message", jsonObject.optString("message", "Success"))
+                                
+                                android.util.Log.i("InfivizShotsReactSdkModule", "Creating WritableMap for React Native...")
+                                
+                                // Convert to WritableMap for React Native
+                                val writableMap = Arguments.createMap()
+                                writableMap.putMap("data", convertJsonToWritableMap(sessionData))
+                                writableMap.putString("status", finalResponse.optString("status", "723"))
+                                writableMap.putString("message", finalResponse.optString("message", "Success"))
+                                promise.resolve(writableMap)
+                            } else {
+                                promise.resolve(convertJsonToWritableMap(jsonObject))
+                            }
+                        } else {
+                            promise.resolve(convertJsonToWritableMap(jsonObject))
+                        }
+                    } catch (e: Exception) {
+                        promise.resolve(response)
+                    }
                 }
 
                 override fun onError(e: SDKExceptions) {

package/ios/InfivizShotSDK.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>InfivizShotSDK.framework/InfivizShotSDK</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>InfivizShotSDK.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>InfivizShotSDK.framework/InfivizShotSDK</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>InfivizShotSDK.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/InfivizShotSDK.xcframework/ios-arm64/InfivizShotSDK.framework/Headers/InfivizShotSDK-Swift.h

@@ -368,6 +368,20 @@ SWIFT_CLASS_NAMED("DBActionBucket")
 @end
 
 
+
+@interface DBActionBucket (SWIFT_EXTENSION(InfivizShotSDK))
+- (void)insertObject:(DBAction * _Nonnull)value inActionsAtIndex:(NSInteger)idx;
+- (void)removeObjectFromActionsAtIndex:(NSInteger)idx;
+- (void)insertActions:(NSArray<DBAction *> * _Nonnull)values atIndexes:(NSIndexSet * _Nonnull)indexes;
+- (void)removeActionsAtIndexes:(NSIndexSet * _Nonnull)indexes;
+- (void)replaceObjectInActionsAtIndex:(NSInteger)idx withObject:(DBAction * _Nonnull)value;
+- (void)replaceActionsAtIndexes:(NSIndexSet * _Nonnull)indexes withActions:(NSArray<DBAction *> * _Nonnull)values;
+- (void)addActionsObject:(DBAction * _Nonnull)value;
+- (void)removeActionsObject:(DBAction * _Nonnull)value;
+- (void)addActions:(NSSet<DBAction *> * _Nonnull)values;
+- (void)removeActions:(NSSet<DBAction *> * _Nonnull)values;
+@end
+
 @class DBActionType;
 
 @interface DBActionBucket (SWIFT_EXTENSION(InfivizShotSDK))
@@ -398,20 +412,6 @@ SWIFT_CLASS_NAMED("DBActionBucket")
 - (void)removeComplianceMetrics:(NSSet<DBComplianceMetric *> * _Nonnull)values;
 @end
 
-
-@interface DBActionBucket (SWIFT_EXTENSION(InfivizShotSDK))
-- (void)insertObject:(DBAction * _Nonnull)value inActionsAtIndex:(NSInteger)idx;
-- (void)removeObjectFromActionsAtIndex:(NSInteger)idx;
-- (void)insertActions:(NSArray<DBAction *> * _Nonnull)values atIndexes:(NSIndexSet * _Nonnull)indexes;
-- (void)removeActionsAtIndexes:(NSIndexSet * _Nonnull)indexes;
-- (void)replaceObjectInActionsAtIndex:(NSInteger)idx withObject:(DBAction * _Nonnull)value;
-- (void)replaceActionsAtIndexes:(NSIndexSet * _Nonnull)indexes withActions:(NSArray<DBAction *> * _Nonnull)values;
-- (void)addActionsObject:(DBAction * _Nonnull)value;
-- (void)removeActionsObject:(DBAction * _Nonnull)value;
-- (void)addActions:(NSSet<DBAction *> * _Nonnull)values;
-- (void)removeActions:(NSSet<DBAction *> * _Nonnull)values;
-@end
-
 @class DBKpiConfigs;
 @class DBActionData;
 
@@ -801,6 +801,7 @@ SWIFT_CLASS("_TtC14InfivizShotSDK16DBConfigurations")
 @property (nonatomic) int64_t timeoutForRealtimeActionProcessing;
 @property (nonatomic, copy) NSString * _Nullable token;
 @property (nonatomic, copy) NSString * _Nullable userName;
+@property (nonatomic) BOOL undoEnabled;
 @end
 
 
@@ -1223,13 +1224,13 @@ SWIFT_CLASS("_TtC14InfivizShotSDK15SpreadsheetView")
 
 
 @interface SpreadsheetView (SWIFT_EXTENSION(InfivizShotSDK))
-- (BOOL)isKindOfClass:(Class _Nonnull)aClass SWIFT_WARN_UNUSED_RESULT;
-- (id _Nullable)forwardingTargetForSelector:(SEL _Null_unspecified)aSelector SWIFT_WARN_UNUSED_RESULT;
+- (void)layoutSubviews;
 @end
 
 
 @interface SpreadsheetView (SWIFT_EXTENSION(InfivizShotSDK))
-- (void)layoutSubviews;
+- (BOOL)isKindOfClass:(Class _Nonnull)aClass SWIFT_WARN_UNUSED_RESULT;
+- (id _Nullable)forwardingTargetForSelector:(SEL _Null_unspecified)aSelector SWIFT_WARN_UNUSED_RESULT;
 @end