@regulaforensics/face-sdk 8.2.919-rc → 8.2.923-beta

package/ios/Main.swift

@@ -0,0 +1,191 @@
+import FaceSDK
+
+let face = FaceSDK.service
+let db = face.personDatabase
+
+let cameraSwitchEvent = "cameraSwitchEvent"
+let livenessNotificationEvent = "livenessNotificationEvent"
+let videoEncoderCompletionEvent = "video_encoder_completion"
+let onCustomButtonTappedEvent = "onCustomButtonTappedEvent"
+
+func methodCall(_ method: String, _ callback: @escaping Callback) {
+    switch method {
+    case("getVersion"): callback(face.version?.encode())
+    case("getServiceUrl"): callback(face.serviceURL)
+    case("setServiceUrl"): face.serviceURL = argsNullable(0)
+    case("getTenant"): callback(face.tenant)
+    case("setTenant"): face.tenant = argsNullable(0)
+    case("getEnv"): callback(face.env)
+    case("setEnv"): face.env = argsNullable(0)
+    case("getLocale"): callback(face.languageLocaleCode)
+    case("setLocale"): face.languageLocaleCode = argsNullable(0)
+    case("setLocalizationDictionary"):
+        face.localizationHandler = { (argsNullable(0) as [String : String?]?)?[$0] ?? nil }
+    case("setRequestHeaders"):
+        headers = argsNullable(0)
+        face.requestInterceptingDelegate = headersDelegate
+    case("setCustomization"): setCustomization(args(0))
+    case("isInitialized"): callback(face.isInitialized)
+    case("initialize"): face.initialize(
+        configuration: InitializationConfiguration.decode(argsNullable(0)),
+        completion: { success, error in
+            if success {
+                face.customization.configuration = UIConfiguration.default()
+                face.videoUploadingDelegate = videoUploadingDelegate
+                face.faceCaptureDelegate = faceCaptureDelegate
+                face.livenessDelegate = livenessDelegate
+                face.customization.actionDelegate = actionDelegate
+            }
+            callback(generateInitCompletion(success, error))
+        })
+    case("deinitialize"): face.deinitialize()
+    case("startFaceCapture"): DispatchQueue.main.async {
+        face.presentFaceCaptureViewController(
+            from: rootViewController()!,
+            animated: true,
+            configuration: FaceCaptureConfiguration.decode(argsNullable(0)),
+            onCapture: { callback($0.encode()) },
+            completion: nil)
+    }
+    case("stopFaceCapture"): face.stopFaceCaptureViewController()
+    case("startLiveness"): DispatchQueue.main.async {
+        face.startLiveness(
+            from: rootViewController()!,
+            animated: true,
+            configuration: LivenessConfiguration.decode(argsNullable(0)),
+            onLiveness: { callback($0.encode()) },
+            completion: nil)
+    }
+    case("stopLiveness"): face.stopLivenessProcessing()
+    case("matchFaces"): face.matchFaces(
+        MatchFacesRequest.decode(args(0)),
+        configuration: MatchFacesConfiguration.decode(argsNullable(0)),
+        completion: { callback($0.encode()) })
+    case("splitComparedFaces"): callback(MatchFacesSimilarityThresholdSplit(
+        pairs: (args(0) as [[String: Any?]]).compactMap { MatchFacesComparedFacesPair.decode($0) },
+        bySimilarityThreshold: args(1)).encode())
+    case("detectFaces"): face.detectFaces(
+        by: DetectFacesRequest.decode(args(0)),
+        completion: { callback($0.encode()) })
+        
+        // MARK: - PersonDatabase
+        
+    case("createPerson"): db.createPerson(
+        name: args(0),
+        metadata: argsNullable(1),
+        groupIds: argsNullable(2),
+        completion: { callback($0.encode()) }
+    )
+    case("updatePerson"): let json = args(0) as [String: Any]
+        db.getPerson(
+            personId: json["id"] as! String,
+            completion: {
+                guard let person = $0.item else { callback($0.encode()); return }
+                db.updatePerson(person: person.update(json), completion: { callback($0.encode()) })
+            })
+    case("deletePerson"): db.deletePerson(personId: args(0), completion: { callback($0.encode()) })
+    case("getPerson"): db.getPerson(personId: args(0), completion: { callback($0.encode()) })
+    case("addPersonImage"): db.addPersonImage(
+        personId: args(0),
+        imageUpload: PersonDatabase.ImageUpload.decode(args(1))!,
+        completion: { callback($0.encode()) })
+    case("deletePersonImage"): db.deletePersonImage(
+        personId: args(0),
+        imageId: args(1),
+        completion: { callback($0.encode()) })
+    case("getPersonImage"): db.getPersonImage(
+        personId: args(0),
+        imageId: args(1),
+        completion: { callback(encodeDBItemResponse($0.data?.encode(), $0.error)) })
+    case("getPersonImages"): db.getPersonImages(personId: args(0), completion: { callback($0.encode())})
+    case("getPersonImagesForPage"): db.getPersonImages(
+        personId: args(0),
+        page: args(1),
+        size: args(2),
+        completion: { callback($0.encode()) })
+    case("createGroup"): db.createGroup(
+        name: args(0),
+        metadata: argsNullable(1) as [String: Any]?,
+        completion: { callback($0.encode()) })
+    case("updateGroup"): let json = args(0) as [String: Any]
+        db.getGroups(
+            groupId: json["id"] as! String,
+            completion: {
+                guard let group = $0.item else { callback($0.encode()); return }
+                db.updateGroup(group: group.update(json), completion: { callback($0.encode()) })
+            })
+    case("editPersonsInGroup"): db.editGroupPersons(
+        groupId: args(0),
+        request: PersonDatabase.EditGroupPersonsRequest.decode(args(0)),
+        completion: { callback($0.encode()) })
+    case("deleteGroup"): db.deleteGroup(groupId: args(0), completion: { callback($0.encode()) })
+    case("getGroup"): db.getGroups(groupId: args(0), completion: { callback($0.encode()) })
+    case("getGroups"): db.getGroups(completion: { callback($0.encode()) })
+    case("getGroupsForPage"): db.getGroups(
+        page: args(0),
+        size: args(1),
+        completion: { callback($0.encode()) })
+    case("getPersonGroups"): db.getPersonGroups(personId: args(0), completion: { callback($0.encode()) })
+    case("getPersonGroupsForPage"): db.getPersonGroups(
+        personId: args(0),
+        page: args(1),
+        size: args(2),
+        completion: { callback($0.encode()) })
+    case("getPersonsInGroup"): db.getGroupPersons(groupId: args(0), completion: { callback($0.encode()) })
+    case("getPersonsInGroupForPage"): db.getGroupPersons(
+        groupId: args(0),
+        page: args(1),
+        size: args(2),
+        completion: { callback($0.encode()) })
+    case("searchPerson"): db.searchPerson(
+        searchRequest: PersonDatabase.SearchPersonRequest.decode(args(0)),
+        completion: { callback(encodeDBItemResponse($0.results?.compactMap{ $0.encode2() }, $0.error)) })
+    default: break
+    }
+}
+
+// MARK: - Implementation
+
+var headers: [String: String]?
+let headersDelegate = IURLRequestInterceptingDelegate()
+class IURLRequestInterceptingDelegate: NSObject, URLRequestInterceptingDelegate {
+    func interceptorPrepare(_ request: URLRequest) -> URLRequest? {
+        guard let headers = headers else { return request }
+        var req = request
+        for (key, value) in headers {
+            req.addValue(value, forHTTPHeaderField: key)
+        }
+        return req
+    }
+}
+
+let videoUploadingDelegate = IVideoUploadingDelegate()
+class IVideoUploadingDelegate: NSObject, VideoUploadingDelegate {
+    func videoUploading(forTransactionId transactionId: String, didFinishedWithSuccess success: Bool) {
+        sendEvent(videoEncoderCompletionEvent, generateVideoEncoderCompletion(success, transactionId))
+    }
+}
+
+let faceCaptureDelegate = IFaceCaptureDelegate()
+class IFaceCaptureDelegate: NSObject, FaceCaptureDelegate {
+    func cameraPositionChanged(_ cameraPosition: CameraPosition) {
+        sendEvent(cameraSwitchEvent, cameraPosition)
+    }
+}
+
+let livenessDelegate = ILivenessDelegate()
+class ILivenessDelegate: NSObject, LivenessDelegate {
+    func processStatusChanged(_ status: LivenessProcessStatus, result: LivenessResponse?) {
+        sendEvent(livenessNotificationEvent, generateLivenessNotification(status, result))
+    }
+    func cameraPositionChanged(_ cameraPosition: CameraPosition) {
+        sendEvent(cameraSwitchEvent, cameraPosition)
+    }
+}
+
+let actionDelegate = ICustomizationActionDelegate()
+class ICustomizationActionDelegate: NSObject, FaceSDK.CustomizationActionDelegate {
+    func onFaceCustomButtonTapped(withTag tag: Int) {
+        sendEvent(onCustomButtonTappedEvent, tag)
+    }
+}

package/ios/RNFaceSDK.m

@@ -1,43 +1,11 @@
-#import "RNFaceSDK.h"
+#import <React/RCTEventEmitter.h>
+#import <React/RCTBridgeModule.h>
 
-@implementation RNFaceSDK
-RCT_EXPORT_MODULE();
+@interface RCT_EXTERN_MODULE(RNFaceSDK, RCTEventEmitter)
 
-static NSMutableArray<RCTResponseSenderBlock>* _firedCallbacks = nil;
-- (NSMutableArray<RCTResponseSenderBlock>*)firedCallbacks {
-    if (_firedCallbacks == nil) _firedCallbacks = @[].mutableCopy;
-    return _firedCallbacks;
-}
-
-- (NSArray<NSString*>*)supportedEvents {
-    return @[cameraSwitchEvent,
-             livenessNotificationEvent,
-             videoEncoderCompletionEvent,
-             onCustomButtonTappedEvent];
-}
-
-static bool hasListeners;
-- (void)startObserving { hasListeners = YES; }
-- (void)stopObserving { hasListeners = NO; }
-
-UIViewController*(^RFSWRootViewController)(void) = ^UIViewController*(){
-    return RCTPresentedViewController();
-};
-
-RCT_EXPORT_METHOD(exec:(NSString*)method:(NSArray*)args:(RCTPromiseResolveBlock)resolve:(RCTPromiseRejectBlock)reject) {
-    RFSWCallback callback = ^(id _Nullable data) {
-        if ([self.firedCallbacks containsObject:resolve]) return;
-        [self.firedCallbacks addObject:resolve];
-        resolve([RFSWJSONConstructor toSendable:data]);
-    };
-    
-    RFSWEventSender sendEvent = ^(NSString* event, id data) {
-        dispatch_async(dispatch_get_main_queue(), ^{
-            if (hasListeners) [self sendEventWithName:event body:[RFSWJSONConstructor toSendable:data]];
-        });
-    };
-    
-    [RFSWMain methodCall:method :args :callback :sendEvent];
-}
+RCT_EXTERN_METHOD(exec: (NSString*)method
+                  newArgs:(NSArray*)newArgs
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
 
 @end

package/ios/RNFaceSDK.swift

@@ -0,0 +1,42 @@
+import React
+
+@objc(RNFaceSDK)
+public class RNFaceSDK: RCTEventEmitter {
+    override public func startObserving() { hasListeners = true }
+    override public func stopObserving() { hasListeners = false }
+    override public func supportedEvents()->[String] {
+        return [cameraSwitchEvent,
+                livenessNotificationEvent,
+                videoEncoderCompletionEvent,
+                onCustomButtonTappedEvent];
+    }
+    
+    @objc
+    func exec(
+        _ method: String,
+        newArgs: [Any],
+        resolve: @escaping RCTPromiseResolveBlock,
+        reject: @escaping RCTPromiseRejectBlock
+    ) {
+        this = self
+        args = newArgs
+        methodCall(method, { data in
+            if firedCallbacks.contains(where: { ($0 as AnyObject) === (resolve as AnyObject) }) { return }
+            firedCallbacks.append(resolve)
+            resolve(data.toSendable())
+        })
+    }
+}
+
+private var firedCallbacks: [RCTResponseSenderBlock] = []
+private var hasListeners: Bool = false
+private var this: RNFaceSDK?
+
+func sendEvent(_ event: String, _ data: Any? = nil) {
+    guard let plugin = this, hasListeners else { return }
+    DispatchQueue.main.async {
+        plugin.sendEvent(withName: event, body: data.toSendable())
+    }
+}
+
+let rootViewController: () -> UIViewController? = { return RCTPresentedViewController() }

package/ios/Utils.swift

@@ -0,0 +1,82 @@
+public typealias Callback = (Any?) -> Void
+
+var args: [Any?] = []
+func args<T>(_ index: Int) -> T {
+    return args[index] as! T
+}
+
+func argsNullable<T>(_ index: Int) -> T? {
+    if args[index] is NSNull { return nil }
+    return args[index] as! T?
+}
+
+extension Any? {
+    func toSendable() -> Any {
+        guard let self else { return NSNull() }
+        if self is [String: Any?] || self is [Any?] {
+            let data = try! JSONSerialization.data(withJSONObject: fixNulls(self), options: .prettyPrinted)
+            return String(data: data, encoding: .utf8)!
+        }
+        return self
+    }
+}
+
+func fixNulls(_ value: Any?) -> Any {
+    guard let value else { return NSNull() }
+    switch value {
+    case let value as [String: Any]:
+        var dict = [String: Any]()
+        for (k, v) in value { dict[k] = fixNulls(v) }
+        return dict
+    case let value as [Any]: return value.map { fixNulls($0) }
+    default: return value
+    }
+}
+
+extension NSObject {
+    static func allocate() -> NSObject {
+        return perform(NSSelectorFromString("alloc")).takeUnretainedValue() as! NSObject
+    }
+    static func emptyInit<T>() -> T {
+        return allocate().perform("init".selector()).takeUnretainedValue() as! T
+    }
+}
+
+extension String {
+    func selector() -> Selector {
+        return NSSelectorFromString(self)
+    }
+}
+
+func privateInit<T, Fn>(
+    _ allocated: NSObject,
+    _ selector: Selector,
+    _ function: Fn.Type,
+    _ call: (Fn) -> Unmanaged<AnyObject>?
+) -> T {
+    let f = unsafeBitCast(allocated.method(for: selector), to: function)
+    return call(f)!.takeUnretainedValue() as! T
+}
+
+extension Data {
+    static func decode(_ it: Any?) -> Self? {
+        guard var it = it as? String else { return nil }
+        if it.hasPrefix("data") { it = String(it[it.index(after: it.firstIndex(of: ",")!)...]) }
+        return Self(base64Encoded: it)
+    }
+    
+    func encode() -> String {
+        return self.base64EncodedString()
+    }
+}
+
+extension UIImage {
+    static func decode(_ it: Any?) -> Self? {
+        guard let it = it as? String else { return nil }
+        return Self(data: Data.decode(it)!)
+    }
+    
+    func encode() -> String {
+        return self.pngData()!.encode()
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/face-sdk",
-  "version": "8.2.919-rc",
+  "version": "8.2.923-beta",
   "description": "This is an npm module for Regula Face SDK. It allows you to easily compaire faces using your phone's camera.",
   "main": "www/react-native/index.js",
   "module": "www/capacitor/index.js",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@regulaforensics/face-sdk" version="8.2.919-rc" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/face-sdk" version="8.2.923-beta" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>FaceSDK</name>
   <description>Cordova plugin for Regula Face SDK</description>
   <license>commercial</license>
@@ -12,18 +12,16 @@
   <platform name="ios">
     <config-file target="config.xml" parent="/widget">
       <feature name="FaceSDK">
-        <param name="ios-package" value="CVDFaceSDK" />
+        <param name="ios-package" value="CDVFaceSDK" />
       </feature>
       <preference name="deployment-target" value="13.0" />
+      <preference name="SwiftVersion" value="5" />
     </config-file>
-    <header-file src="ios/CVDFaceSDK.h" />
-    <source-file src="ios/CVDFaceSDK.m" />
-    <header-file src="ios/RFSWMain.h" />
-    <source-file src="ios/RFSWMain.m" />
-    <header-file src="ios/RFSWJSONConstructor.h" />
-    <source-file src="ios/RFSWJSONConstructor.m" />
-    <header-file src="ios/RFSWConfig.h" />
-    <source-file src="ios/RFSWConfig.m" />
+    <source-file src="ios/CDVFaceSDK.swift" />
+    <source-file src="ios/Main.swift" />
+    <source-file src="ios/Decoder.swift" />
+    <source-file src="ios/Config.swift" />
+    <source-file src="ios/Utils.swift" />
     <podspec>
       <config>
         <source url="https://github.com/CocoaPods/Specs.git" />
@@ -37,11 +35,11 @@
   <platform name="android">
     <config-file parent="/*" target="res/xml/config.xml">
       <feature name="FaceSDK">
-        <param name="android-package" value="com.regula.plugin.facesdk.CVDFaceSDK" />
+        <param name="android-package" value="com.regula.plugin.facesdk.CDVFaceSDK" />
       </feature>
     </config-file>
     <framework src="android/cordova.gradle" custom="true" type="gradleReference" />
-    <source-file src="android/CVDFaceSDK.kt" target-dir="java/com.regula.plugin.facesdk" />
+    <source-file src="android/CDVFaceSDK.kt" target-dir="java/com.regula.plugin.facesdk" />
     <source-file src="android/src/main/java/com/regula/plugin/facesdk/Main.kt" target-dir="java/com.regula.plugin.facesdk" />
     <source-file src="android/src/main/java/com/regula/plugin/facesdk/JSONConstructor.kt" target-dir="java/com.regula.plugin.facesdk" />
     <source-file src="android/src/main/java/com/regula/plugin/facesdk/Config.kt" target-dir="java/com.regula.plugin.facesdk" />

package/test/json.tsx

@@ -47,19 +47,20 @@ export var customizationFonts = {
   "400": font2,
 }
 export var customizationImages = {
-  "100": img1,
-  "101": img2,
-  "102": img3,
-  "103": img1,
-  "200": img2,
-  "201": img3,
-  "202": img1,
-  "203": img2,
-  "300": img3,
-  "301": img1,
-  "302": img2,
-  "400": img3,
-  "500": img1,
+  "onboardingScreenCloseButton": img1,
+  "onboardingScreenIllumination": img2,
+  "onboardingScreenAccessories": img3,
+  "onboardingScreenCameraLevel": img1,
+  "cameraScreenCloseButton": img2,
+  "cameraScreenLightOnButton": img3,
+  "cameraScreenLightOffButton": img1,
+  "cameraScreenSwitchButton": img2,
+  "retryScreenCloseButton": img3,
+  "retryScreenHintEnvironment": img1,
+  "retryScreenHintSubject": img2,
+  "retryScreenHintGeo": img3,
+  "processingScreenCloseButton": img1,
+  "successScreenImage": img2,
 }
 export var customization = {
   "colors": customizationColors,
@@ -168,6 +169,7 @@ export var faceCaptureConfig = {
   "vibrateOnSteps": true,
   "detectOcclusion": false,
   "showFaceAnimation": true,
+  "preventScreenRecording": false,
   "cameraPositionAndroid": 0,
   "cameraPositionIOS": 1,
   "screenOrientation": [0, 1],
@@ -218,6 +220,7 @@ export var livenessConfig = {
   "cameraPositionIOS": 1,
   "screenOrientation": [0, 1],
   "locationTrackingEnabled": true,
+  "preventScreenRecording": false,
   "attemptsCount": 2,
   "recordingProcess": 0,
   "livenessType": 1,

package/test/package-lock.json

@@ -13,7 +13,7 @@
     },
     "..": {
       "name": "@regulaforensics/face-sdk",
-      "version": "8.2.919-rc",
+      "version": "8.2.923-beta",
       "dev": true,
       "license": "commercial"
     },

package/www/capacitor/customization/customization_images.js

@@ -4,116 +4,124 @@ export class CustomizationImages {
     _onboardingScreenCloseButton
     set onboardingScreenCloseButton(val) {
         this._onboardingScreenCloseButton = val
-        this._set({ "100": val })
+        this._set({ "onboardingScreenCloseButton": val })
     }
 
     _onboardingScreenIllumination
     set onboardingScreenIllumination(val) {
         this._onboardingScreenIllumination = val
-        this._set({ "101": val })
+        this._set({ "onboardingScreenIllumination": val })
     }
 
     _onboardingScreenAccessories
     set onboardingScreenAccessories(val) {
         this._onboardingScreenAccessories = val
-        this._set({ "102": val })
+        this._set({ "onboardingScreenAccessories": val })
     }
 
     _onboardingScreenCameraLevel
     set onboardingScreenCameraLevel(val) {
         this._onboardingScreenCameraLevel = val
-        this._set({ "103": val })
+        this._set({ "onboardingScreenCameraLevel": val })
     }
 
     _cameraScreenCloseButton
     set cameraScreenCloseButton(val) {
         this._cameraScreenCloseButton = val
-        this._set({ "200": val })
+        this._set({ "cameraScreenCloseButton": val })
     }
 
     _cameraScreenLightOnButton
     set cameraScreenLightOnButton(val) {
         this._cameraScreenLightOnButton = val
-        this._set({ "201": val })
+        this._set({ "cameraScreenLightOnButton": val })
     }
 
     _cameraScreenLightOffButton
     set cameraScreenLightOffButton(val) {
         this._cameraScreenLightOffButton = val
-        this._set({ "202": val })
+        this._set({ "cameraScreenLightOffButton": val })
     }
 
     _cameraScreenSwitchButton
     set cameraScreenSwitchButton(val) {
         this._cameraScreenSwitchButton = val
-        this._set({ "203": val })
+        this._set({ "cameraScreenSwitchButton": val })
     }
 
     _retryScreenCloseButton
     set retryScreenCloseButton(val) {
         this._retryScreenCloseButton = val
-        this._set({ "300": val })
+        this._set({ "retryScreenCloseButton": val })
     }
 
     _retryScreenHintEnvironment
     set retryScreenHintEnvironment(val) {
         this._retryScreenHintEnvironment = val
-        this._set({ "301": val })
+        this._set({ "retryScreenHintEnvironment": val })
     }
 
     _retryScreenHintSubject
     set retryScreenHintSubject(val) {
         this._retryScreenHintSubject = val
-        this._set({ "302": val })
+        this._set({ "retryScreenHintSubject": val })
+    }
+
+    _retryScreenHintGeo
+    set retryScreenHintGeo(val) {
+        this._retryScreenHintGeo = val
+        this._set({ "retryScreenHintGeo": val })
     }
 
     _processingScreenCloseButton
     set processingScreenCloseButton(val) {
         this._processingScreenCloseButton = val
-        this._set({ "400": val })
+        this._set({ "processingScreenCloseButton": val })
     }
 
     _successScreenImage
     set successScreenImage(val) {
         this._successScreenImage = val
-        this._set({ "500": val })
+        this._set({ "successScreenImage": val })
     }
 
     static fromJson(jsonObject) {
         var result = new CustomizationImages()
 
-        result._onboardingScreenCloseButton = jsonObject["100"]
-        result._onboardingScreenIllumination = jsonObject["101"]
-        result._onboardingScreenAccessories = jsonObject["102"]
-        result._onboardingScreenCameraLevel = jsonObject["103"]
-        result._cameraScreenCloseButton = jsonObject["200"]
-        result._cameraScreenLightOnButton = jsonObject["201"]
-        result._cameraScreenLightOffButton = jsonObject["202"]
-        result._cameraScreenSwitchButton = jsonObject["203"]
-        result._retryScreenCloseButton = jsonObject["300"]
-        result._retryScreenHintEnvironment = jsonObject["301"]
-        result._retryScreenHintSubject = jsonObject["302"]
-        result._processingScreenCloseButton = jsonObject["400"]
-        result._successScreenImage = jsonObject["500"]
+        result._onboardingScreenCloseButton = jsonObject["onboardingScreenCloseButton"]
+        result._onboardingScreenIllumination = jsonObject["onboardingScreenIllumination"]
+        result._onboardingScreenAccessories = jsonObject["onboardingScreenAccessories"]
+        result._onboardingScreenCameraLevel = jsonObject["onboardingScreenCameraLevel"]
+        result._cameraScreenCloseButton = jsonObject["cameraScreenCloseButton"]
+        result._cameraScreenLightOnButton = jsonObject["cameraScreenLightOnButton"]
+        result._cameraScreenLightOffButton = jsonObject["cameraScreenLightOffButton"]
+        result._cameraScreenSwitchButton = jsonObject["cameraScreenSwitchButton"]
+        result._retryScreenCloseButton = jsonObject["retryScreenCloseButton"]
+        result._retryScreenHintEnvironment = jsonObject["retryScreenHintEnvironment"]
+        result._retryScreenHintSubject = jsonObject["retryScreenHintSubject"]
+        result._retryScreenHintGeo = jsonObject["retryScreenHintGeo"]
+        result._processingScreenCloseButton = jsonObject["processingScreenCloseButton"]
+        result._successScreenImage = jsonObject["successScreenImage"]
 
         return result
     }
 
     toJson() {
         return {
-            "100": this._onboardingScreenCloseButton,
-            "101": this._onboardingScreenIllumination,
-            "102": this._onboardingScreenAccessories,
-            "103": this._onboardingScreenCameraLevel,
-            "200": this._cameraScreenCloseButton,
-            "201": this._cameraScreenLightOnButton,
-            "202": this._cameraScreenLightOffButton,
-            "203": this._cameraScreenSwitchButton,
-            "300": this._retryScreenCloseButton,
-            "301": this._retryScreenHintEnvironment,
-            "302": this._retryScreenHintSubject,
-            "400": this._processingScreenCloseButton,
-            "500": this._successScreenImage,
+            "onboardingScreenCloseButton": this._onboardingScreenCloseButton,
+            "onboardingScreenIllumination": this._onboardingScreenIllumination,
+            "onboardingScreenAccessories": this._onboardingScreenAccessories,
+            "onboardingScreenCameraLevel": this._onboardingScreenCameraLevel,
+            "cameraScreenCloseButton": this._cameraScreenCloseButton,
+            "cameraScreenLightOnButton": this._cameraScreenLightOnButton,
+            "cameraScreenLightOffButton": this._cameraScreenLightOffButton,
+            "cameraScreenSwitchButton": this._cameraScreenSwitchButton,
+            "retryScreenCloseButton": this._retryScreenCloseButton,
+            "retryScreenHintEnvironment": this._retryScreenHintEnvironment,
+            "retryScreenHintSubject": this._retryScreenHintSubject,
+            "retryScreenHintGeo": this._retryScreenHintGeo,
+            "processingScreenCloseButton": this._processingScreenCloseButton,
+            "successScreenImage": this._successScreenImage,
         }
     }