Merge pull request #32 from Dynamsoft/02162023

Dynamsoft-Jerson · web-flow · commit 87a6c59e278b · 2023-02-16T14:51:36.000+08:00
Merging changes on 02102023
diff --git a/ios/Swift/DecodeWithAVCaptureSession/DecodeWithAVCaptureSession/AppDelegate.swift b/ios/Swift/DecodeWithAVCaptureSession/DecodeWithAVCaptureSession/AppDelegate.swift
@@ -2,7 +2,7 @@
 //  AppDelegate.swift
 //  DecodeWithAVCaptureSession
 //
-//  Created by admin on 2022/3/15.
+//  Copyright © Dynamsoft. All rights reserved.
 //
 
 import UIKit
diff --git a/ios/Swift/DecodeWithAVCaptureSession/DecodeWithAVCaptureSession/CameraViewController.swift b/ios/Swift/DecodeWithAVCaptureSession/DecodeWithAVCaptureSession/CameraViewController.swift
@@ -2,7 +2,7 @@
 //  CameraViewController.swift
 //  DecodeWithAVCaptureSession
 //
-//  Created by admin on 2022/6/16.
+//  Copyright © Dynamsoft. All rights reserved.
 //
 
 import Foundation
@@ -11,8 +11,8 @@ import DynamsoftBarcodeReader
 
 class CameraViewController: UIViewController, AVCaptureVideoDataOutputSampleBufferDelegate, ImageSource, DBRTextResultListener{
     
-    var barcodeReader:DynamsoftBarcodeReader! = nil
-    var imageData:iImageData! = nil
+    var barcodeReader:DynamsoftBarcodeReader!
+    var imageData:iImageData!
     override func viewDidLoad() {
         super.viewDidLoad()
         setDBR()
@@ -37,21 +37,21 @@ class CameraViewController: UIViewController, AVCaptureVideoDataOutputSampleBuff
     func setSession() {
         let session = AVCaptureSession.init()
         session.sessionPreset = .hd1920x1080
-        let device = AVCaptureDevice.default(
-            for: .video)
-        var input: AVCaptureDeviceInput? = nil
+        let device = AVCaptureDevice.default(for: .video)
+        var input: AVCaptureDeviceInput?
         do {
-            if let device = device {
-                input = try AVCaptureDeviceInput(
-                    device: device)
+            if let device {
+                input = try AVCaptureDeviceInput(device: device)
             }
         } catch {
+            print("\(error)")
         }
         
         if (input == nil) {
             // Handling the error appropriately.
+        }else{
+            session.addInput(input!)
         }
-        session.addInput(input!)
         
         let output = AVCaptureVideoDataOutput.init()
         session.addOutput(output)
@@ -82,7 +82,7 @@ class CameraViewController: UIViewController, AVCaptureVideoDataOutputSampleBuff
             var msgText:String = ""
             let title:String = "Results"
             for item in results! {
-                msgText = msgText + String(format:"\nFormat: %@\nText: %@\n", item.barcodeFormatString!,item.barcodeText ?? "noResuslt")
+                msgText = msgText + String(format:"\nFormat: %@\nText: %@\n", item.barcodeFormatString!,item.barcodeText ?? "No Resuslt")
             }
             showResult(title, msgText, "OK") {
             }
@@ -111,7 +111,6 @@ class CameraViewController: UIViewController, AVCaptureVideoDataOutputSampleBuff
         imageData.height = height
         imageData.stride = bpr
         imageData.format = .ARGB_8888
-        
     }
     
     private func showResult(_ title: String, _ msg: String, _ acTitle: String, completion: @escaping () -> Void) {
diff --git a/ios/Swift/DecodeWithAVCaptureSession/DecodeWithAVCaptureSession/ViewController.swift b/ios/Swift/DecodeWithAVCaptureSession/DecodeWithAVCaptureSession/ViewController.swift
@@ -2,7 +2,7 @@
 //  ViewController.swift
 //  DecodeWithAVCaptureSession
 //
-//  Created by admin on 2022/3/15.
+//  Copyright © Dynamsoft. All rights reserved.
 //
 
 import UIKit
diff --git a/ios/Swift/GeneralSettingsSwift/GeneralSettingsSwift/ViewController.swift b/ios/Swift/GeneralSettingsSwift/GeneralSettingsSwift/ViewController.swift
@@ -62,7 +62,7 @@ class ViewController: UIViewController, DBRTextResultListener {
         GeneralSettings.shared.barcodeReader = DynamsoftBarcodeReader.init()
         GeneralSettings.shared.barcodeReader.setDBRTextResultListener(self)
         
-        GeneralSettings.shared.ipublicRuntimeSettings = try! GeneralSettings.shared.barcodeReader.getRuntimeSettings()
+        GeneralSettings.shared.ipublicRuntimeSettings = try? GeneralSettings.shared.barcodeReader.getRuntimeSettings()
     }
     
     func configureDefaultDCE() -> Void {
@@ -154,7 +154,7 @@ class ViewController: UIViewController, DBRTextResultListener {
                 var msgText:String = ""
                 let title:String = "Results"
                 for item in results! {
-                    msgText = msgText + String(format:"\nFormat: %@\nText: %@\n", item.barcodeFormatString!,item.barcodeText ?? "noResuslt")
+                    msgText = msgText + String(format:"\nFormat: %@\nText: %@\n", item.barcodeFormatString!,item.barcodeText ?? "No Resuslt")
                 }
                 
                 showSingleResult(title, msgText, "OK") {
diff --git a/ios/Swift/HelloWorldSwift/HelloWorldSwift/AppDelegate.swift b/ios/Swift/HelloWorldSwift/HelloWorldSwift/AppDelegate.swift
@@ -1,3 +1,10 @@
+//
+//  AppDelegate.swift
+//  HelloWorldSwift
+//
+//  Copyright © Dynamsoft. All rights reserved.
+//
+
 import UIKit
 
 @UIApplicationMain
diff --git a/ios/Swift/HelloWorldSwift/HelloWorldSwift/Assets.xcassets/AccentColor.colorset/Contents.json b/ios/Swift/HelloWorldSwift/HelloWorldSwift/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Swift/HelloWorldSwift/HelloWorldSwift/ViewController.swift b/ios/Swift/HelloWorldSwift/HelloWorldSwift/ViewController.swift
@@ -1,15 +1,17 @@
 //
 //  ViewController.swift
+//  HelloWorldSwift
 //
+//  Copyright © Dynamsoft. All rights reserved.
 //
 
 import UIKit
 
 class ViewController: UIViewController, DBRTextResultListener {
     
-    var dce:DynamsoftCameraEnhancer! = nil
-    var dceView:DCECameraView! = nil
-    var barcodeReader:DynamsoftBarcodeReader! = nil
+    var dce:DynamsoftCameraEnhancer!
+    var dceView:DCECameraView!
+    var barcodeReader:DynamsoftBarcodeReader!
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
@@ -32,11 +34,16 @@ class ViewController: UIViewController, DBRTextResultListener {
     
     func configurationDBR() {
         barcodeReader = DynamsoftBarcodeReader.init()
-		barcodeReader.updateRuntimeSettings(EnumPresetTemplate.videoSingleBarcode)
+        barcodeReader.updateRuntimeSettings(EnumPresetTemplate.videoSingleBarcode)
+
         /*
-        let settings:iPublicRuntimeSettings = try!barcodeReader.getRuntimeSettings()
+        let settings:iPublicRuntimeSettings = try?barcodeReader.getRuntimeSettings()
         settings.barcodeFormatIds = EnumBarcodeFormat.ONED.rawValue | EnumBarcodeFormat.QRCODE.rawValue | EnumBarcodeFormat.DATAMATRIX.rawValue | EnumBarcodeFormat.PDF417.rawValue
-        try?barcodeReader.updateRuntimeSettings(settings)
+        do{
+            try barcodeReader.updateRuntimeSettings(settings)
+        }catch{
+            print("\(error)")
+        }
         */
     }
     
diff --git a/ios/Swift/ImageDecodingSwift/ImageDecodingSwift/AppDelegate.swift b/ios/Swift/ImageDecodingSwift/ImageDecodingSwift/AppDelegate.swift
@@ -2,7 +2,7 @@
 //  AppDelegate.swift
 //  ImageDecodingSwift
 //
-//  Created by dynamsoft's mac on 2022/12/27.
+//  Copyright © Dynamsoft. All rights reserved.
 //
 
 import UIKit
diff --git a/ios/Swift/ImageDecodingSwift/ImageDecodingSwift/PCH/Dynamsoft.swift b/ios/Swift/ImageDecodingSwift/ImageDecodingSwift/PCH/Dynamsoft.swift
@@ -2,7 +2,7 @@
 //  Dynamsoft.swift
 //  ImageDecodingSwift
 //
-//  Created by dynamsoft's mac on 2022/12/27.
+//  Copyright © Dynamsoft. All rights reserved.
 //
 
 import Foundation
diff --git a/ios/Swift/ImageDecodingSwift/ImageDecodingSwift/ViewController.swift b/ios/Swift/ImageDecodingSwift/ImageDecodingSwift/ViewController.swift
@@ -2,7 +2,7 @@
 //  ViewController.swift
 //  ImageDecodingSwift
 //
-//  Created by dynamsoft's mac on 2022/12/27.
+//  Copyright © Dynamsoft. All rights reserved.
 //
 
 import UIKit
diff --git a/ios/Swift/PerformanceSettingsSwift/PerformanceSettingsSwift/AppDelegate.swift b/ios/Swift/PerformanceSettingsSwift/PerformanceSettingsSwift/AppDelegate.swift
@@ -1,3 +1,10 @@
+//
+//  AppDelegate.swift
+//  PerformanceSettingsSwift
+//
+//  Copyright © Dynamsoft. All rights reserved.
+//
+
 import UIKit
 
 @UIApplicationMain
diff --git a/ios/Swift/PerformanceSettingsSwift/PerformanceSettingsSwift/Assets.xcassets/AccentColor.colorset/Contents.json b/ios/Swift/PerformanceSettingsSwift/PerformanceSettingsSwift/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Swift/PerformanceSettingsSwift/PerformanceSettingsSwift/Assets.xcassets/icon_picture.imageset/icon_picture.png b/ios/Swift/PerformanceSettingsSwift/PerformanceSettingsSwift/Assets.xcassets/icon_picture.imageset/icon_picture.png
diff --git a/ios/Swift/PerformanceSettingsSwift/PerformanceSettingsSwift/SettingsCommon.swift b/ios/Swift/PerformanceSettingsSwift/PerformanceSettingsSwift/SettingsCommon.swift
@@ -2,7 +2,6 @@
 //  SettingsCommon.swift
 //  PerformanceSettingsSwift
 //
-//  Created by Dynamsoft on 2021/12/5.
 //  Copyright © Dynamsoft. All rights reserved.
 //
 
diff --git a/ios/Swift/PerformanceSettingsSwift/PerformanceSettingsSwift/ViewController.swift b/ios/Swift/PerformanceSettingsSwift/PerformanceSettingsSwift/ViewController.swift
@@ -2,7 +2,6 @@
 //  ViewController.swift
 //  PerformanceSettingsSwift
 //
-//  Created by Dynamsoft on 2021/12/5.
 //  Copyright © Dynamsoft. All rights reserved.
 //
 
@@ -135,7 +134,11 @@ class ViewController: UIViewController, UITableViewDataSource,  UITableViewDeleg
             settings!.furtherModes.grayscaleTransformationModes = [EnumGrayscaleTransformationMode.original.rawValue,EnumGrayscaleTransformationMode.inverted.rawValue]
 
             // Add or update the above settings.
-            try? barcodeReader.updateRuntimeSettings(settings!)
+            do{
+                try barcodeReader.updateRuntimeSettings(settings!)
+            }catch{
+                print("\(error)")
+            }
 
             // The correctness of barcode results will be double checked before output.
             barcodeReader.enableResultVerification = true
@@ -188,7 +191,11 @@ class ViewController: UIViewController, UITableViewDataSource,  UITableViewDeleg
                 settings!.scaleDownThreshold = 2300
 
                 // Add or update the above settings.
-                try? barcodeReader.updateRuntimeSettings(settings!)
+                do{
+                    try barcodeReader.updateRuntimeSettings(settings!)
+                }catch{
+                    print("\(error)")
+                }
 
                 // Reset the scanRegion settings.
                 // The scanRegion will be reset to the whole video when you trigger the setScanRegion with a null value.
@@ -217,7 +224,11 @@ class ViewController: UIViewController, UITableViewDataSource,  UITableViewDeleg
                 settings!.timeout = 500
 
                 // Add or update the above settings.
-                try? barcodeReader.updateRuntimeSettings(settings!)
+                do{
+                    try barcodeReader.updateRuntimeSettings(settings!)
+                }catch{
+                    print("\(error)")
+                }
 
                 // Specify the scanRegion via Camera Enhancer will help you improve the barcode processing speed.
                 // The video frames will be cropped based on the scanRegion so that the Barcode Reader will focus on the scanRegion only.
@@ -274,7 +285,11 @@ class ViewController: UIViewController, UITableViewDataSource,  UITableViewDeleg
                 settings!.furtherModes.grayscaleTransformationModes = [EnumGrayscaleTransformationMode.original.rawValue,EnumGrayscaleTransformationMode.inverted.rawValue]
 
                 // Add or update the above settings.
-                try? barcodeReader.updateRuntimeSettings(settings!)
+                do{
+                    try barcodeReader.updateRuntimeSettings(settings!)
+                }catch{
+                    print("\(error)")
+                }
 
                 // Reset the scanRegion settings.
                 // The scanRegion will be reset to the whole video when you trigger the setScanRegion with a null value.
@@ -308,7 +323,11 @@ class ViewController: UIViewController, UITableViewDataSource,  UITableViewDeleg
                 settings!.furtherModes.grayscaleTransformationModes = [EnumGrayscaleTransformationMode.original.rawValue,EnumGrayscaleTransformationMode.inverted.rawValue]
 
                 // Add or update the above settings.
-                try? barcodeReader.updateRuntimeSettings(settings!)
+                do{
+                    try barcodeReader.updateRuntimeSettings(settings!)
+                }catch{
+                    print("\(error)")
+                }
 
                 // Reset the scanRegion settings.
                 // The scanRegion will be reset to the whole video when you trigger the setScanRegion with a null value.
@@ -441,7 +460,7 @@ class ViewController: UIViewController, UITableViewDataSource,  UITableViewDeleg
         dce = DynamsoftCameraEnhancer.init(view: dceView)
         dce.open()
     
-		var error : NSError? = NSError()
+        var error : NSError? = NSError()
         //Frame filter is the feature of Dynamsoft Camera Enhancer. It will improve the barcode scanning accuracy of Dynamsoft barcode reader. Read more about Dynamsoft Camera Enhancer.
         dce.enableFeatures(EnumEnhancerFeatures.EnumFRAME_FILTER.rawValue,error: &error)
         
@@ -472,7 +491,7 @@ class ViewController: UIViewController, UITableViewDataSource,  UITableViewDeleg
             var msgText:String = ""
             let title:String = "Results"
             for item in results! {
-                msgText = msgText + String(format:"\nFormat: %@\nText: %@\n", item.barcodeFormatString!,item.barcodeText ?? "noResuslt")
+                msgText = msgText + String(format:"\nFormat: %@\nText: %@\n", item.barcodeFormatString!,item.barcodeText ?? "No Resuslt")
             }
             showResult(title, msgText, "OK") { self.loadingView.stopAnimating()
             }
diff --git a/ios/Swift/Usecase/ReadADriversLicenseSwift/ReadADriversLicense/AppDelegate.swift b/ios/Swift/Usecase/ReadADriversLicenseSwift/ReadADriversLicense/AppDelegate.swift
@@ -1,3 +1,10 @@
+//
+//  AppDelegate.swift
+//  ReadADriversLicense
+//
+//  Copyright © Dynamsoft. All rights reserved.
+//
+
 import UIKit
 
 @UIApplicationMain
diff --git a/ios/Swift/Usecase/ReadADriversLicenseSwift/ReadADriversLicense/Assets.xcassets/AccentColor.colorset/Contents.json b/ios/Swift/Usecase/ReadADriversLicenseSwift/ReadADriversLicense/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Swift/Usecase/ReadADriversLicenseSwift/ReadADriversLicense/ViewController.swift b/ios/Swift/Usecase/ReadADriversLicenseSwift/ReadADriversLicense/ViewController.swift
@@ -1,6 +1,8 @@
 //
 //  ViewController.swift
+//  ReadADriversLicense
 //
+//  Copyright © Dynamsoft. All rights reserved.
 //
 
 import UIKit
@@ -16,11 +18,11 @@ let KeyWindow                       = UIApplication.shared.keyWindow
 
 class ViewController: UIViewController, DBRTextResultListener, CompleteDelegate {
 
-    var dce:DynamsoftCameraEnhancer! = nil
-    var dceView:DCECameraView! = nil
-    var alertView:DBRPopDrivingLicenseView! = nil
+    var dce:DynamsoftCameraEnhancer!
+    var dceView:DCECameraView!
+    var alertView:DBRPopDrivingLicenseView!
     var resultView:UITextView!
-    var barcodeReader:DynamsoftBarcodeReader! = nil
+    var barcodeReader:DynamsoftBarcodeReader!
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -45,9 +47,16 @@ class ViewController: UIViewController, DBRTextResultListener, CompleteDelegate
     func configurationDBR() {
         barcodeReader = DynamsoftBarcodeReader.init()
         let driverLicensePath = Bundle.main.path(forResource: "drivers-license", ofType: "json") ?? ""
-        let driverLicenseJsonData = try! Data.init(contentsOf: URL.init(fileURLWithPath: driverLicensePath))
-        let driverLicenseJsonString = String.init(data: driverLicenseJsonData, encoding: .utf8)
-        try? barcodeReader.initRuntimeSettingsWithString(driverLicenseJsonString!, conflictMode: .overwrite)
+        let driverLicenseJsonData = try? Data.init(contentsOf: URL.init(fileURLWithPath: driverLicensePath))
+        if driverLicenseJsonData != nil {
+            let driverLicenseJsonString = String.init(data: driverLicenseJsonData!, encoding: .utf8)
+            do{
+                try barcodeReader.initRuntimeSettingsWithString(driverLicenseJsonString!, conflictMode: .overwrite)
+            }catch{
+                print("\(error)")
+            }
+        }
+        
     }
     
     func configurationDCE() {
diff --git a/ios/Swift/Usecase/TinyBarcode/TinyBarcode/AppDelegate.swift b/ios/Swift/Usecase/TinyBarcode/TinyBarcode/AppDelegate.swift
@@ -2,7 +2,7 @@
 //  AppDelegate.swift
 //  TinyBarcode
 //
-//  Created by dynamsoft's mac on 2022/11/24.
+//  Copyright © Dynamsoft. All rights reserved.
 //
 
 import UIKit
diff --git a/ios/Swift/Usecase/TinyBarcode/TinyBarcode/PCH/Dynamsoft.swift b/ios/Swift/Usecase/TinyBarcode/TinyBarcode/PCH/Dynamsoft.swift
diff --git a/ios/Swift/Usecase/TinyBarcode/TinyBarcode/ViewController.swift b/ios/Swift/Usecase/TinyBarcode/TinyBarcode/ViewController.swift
diff --git a/ios/Swift/Usecase/TinyBarcode/TinyBarcode/Views/CameraSettingView.swift b/ios/Swift/Usecase/TinyBarcode/TinyBarcode/Views/CameraSettingView.swift
diff --git a/ios/Swift/Usecase/TinyBarcode/TinyBarcode/Views/CameraZoomFloatingButton.swift b/ios/Swift/Usecase/TinyBarcode/TinyBarcode/Views/CameraZoomFloatingButton.swift

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class ViewController: UIViewController, DBRTextResultListener {`
`62`	`62`	`GeneralSettings.shared.barcodeReader = DynamsoftBarcodeReader.init()`
`63`	`63`	`GeneralSettings.shared.barcodeReader.setDBRTextResultListener(self)`
`64`	`64`
`65`		`- GeneralSettings.shared.ipublicRuntimeSettings = try! GeneralSettings.shared.barcodeReader.getRuntimeSettings()`
	`65`	`+ GeneralSettings.shared.ipublicRuntimeSettings = try? GeneralSettings.shared.barcodeReader.getRuntimeSettings()`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`func configureDefaultDCE() -> Void {`
`@@ -154,7 +154,7 @@ class ViewController: UIViewController, DBRTextResultListener {`
`154`	`154`	`var msgText:String = ""`
`155`	`155`	`let title:String = "Results"`
`156`	`156`	`for item in results! {`
`157`		`- msgText = msgText + String(format:"\nFormat: %@\nText: %@\n", item.barcodeFormatString!,item.barcodeText ?? "noResuslt")`
	`157`	`+ msgText = msgText + String(format:"\nFormat: %@\nText: %@\n", item.barcodeFormatString!,item.barcodeText ?? "No Resuslt")`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`showSingleResult(title, msgText, "OK") {`