【综合】扫描仪问题修正

PDF Office/PDF Master/Class/Batch/WindowController/KMBatchOperateLeftViewController.swift

@@ -306,7 +306,7 @@ class KMBatchOperateLeftViewController: NSViewController,NSTableViewDelegate,NST
     
     func chooseFileFromCamera() {
         self.progressInt = 0
-        let vc = KMDeviceBrowserWindowController.init(windowNibName: "KMDeviceBrowserWindowController")
+        let vc = KMDeviceBrowserWindowController.shared
         vc.type = .camera
         vc.importCameraFileCallback = { [weak self](url: NSURL) -> Void in
             self?.addFilesToList(addArray: [url.path!])
@@ -315,7 +315,7 @@ class KMBatchOperateLeftViewController: NSViewController,NSTableViewDelegate,NST
     }
     func chooseFileFromScanner() {
         self.progressInt = 0
-        let vc = KMDeviceBrowserWindowController.init(windowNibName: "KMDeviceBrowserWindowController")
+        let vc = KMDeviceBrowserWindowController.shared
         vc.type = .scanner
         vc.importScannerFileCallback = { [weak self](url: NSURL) -> Void in
             self?.addFilesToList(addArray: [url.path!])

PDF Office/PDF Master/Class/Home/ViewController/KMAIOpenPDFFilesVC.swift

@@ -485,7 +485,7 @@ class KMAIOpenPDFFilesVC: NSViewController {
     }
     
     @IBAction func importFromScanner(_ sender: Any) {
-        deviceBrowserWC = KMDeviceBrowserWindowController.init(windowNibName: "KMDeviceBrowserWindowController")
+        deviceBrowserWC = KMDeviceBrowserWindowController.shared
         deviceBrowserWC!.type = .scanner
         deviceBrowserWC!.importScannerFileCallback = { [unowned self](url: NSURL) -> Void in
             openFile(withFilePath: url as URL)

PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.swift

@@ -796,7 +796,7 @@ extension KMHomeViewController {
     }
     
     func importFromScanner() {
-        let vc = KMDeviceBrowserWindowController.init(windowNibName: "KMDeviceBrowserWindowController")
+        let vc = KMDeviceBrowserWindowController.shared
         vc.type = .scanner
         vc.importScannerFileCallback = { [weak self](url: NSURL) -> Void in
             self?.openFile(withFilePath: url as URL)
@@ -805,7 +805,7 @@ extension KMHomeViewController {
     }
     
     func importFromCamera() {
-        let vc = KMDeviceBrowserWindowController.init(windowNibName: "KMDeviceBrowserWindowController")
+        let vc = KMDeviceBrowserWindowController.shared
         vc.type = .camera
         vc.importCameraFileCallback = { [weak self] (url: NSURL) -> Void in
             self?.openFile(withFilePath: url as URL)

PDF Office/PDF Master/Class/Home/WindowController/KMDeviceBrowserWindowController.swift

@@ -21,7 +21,9 @@ class KMDeviceBrowserWindowController: NSWindowController {
     var type: ICDeviceType = .camera
     var importCameraFileCallback: ImportCameraFileCallback?
     var importScannerFileCallback: ImportScannerFileCallback?
-
+    
+    static let shared = KMDeviceBrowserWindowController(windowNibName: "KMDeviceBrowserWindowController")
+    
     deinit {
         KMPrint("KMDeviceBrowserWindowController 已释放.")
         
@@ -61,16 +63,16 @@ extension KMDeviceBrowserWindowController: NSSplitViewDelegate {
 extension KMDeviceBrowserWindowController: IKDeviceBrowserViewDelegate {
     func deviceBrowserView(_ deviceBrowserView: IKDeviceBrowserView!, selectionDidChange device: ICDevice!) {
         if device != nil {
-            if (device.type == .camera) {
+            if (device!.className == "ICCameraDevice") {
                 cameraDeviceView.cameraDevice = (device as! ICCameraDevice)
                 cameraDeviceView.isHidden = false
-                cameraDeviceView.isHidden = true
-            } else if (device.type == .scanner) {
+                scannerDeviceView.isHidden = true
+            } else if (device.className == "ICScannerDevice") {
                 scannerDeviceView.scannerDevice = (device as! ICScannerDevice)
                 scannerDeviceView.isHidden = false
-                scannerDeviceView.isHidden = true
+                cameraDeviceView.isHidden = true
             } else {
-                scannerDeviceView.isHidden = true
+                cameraDeviceView.isHidden = true
                 scannerDeviceView.isHidden = true
             }
         }

PDF Office/PDF Master/Class/Home/WindowController/KMDeviceBrowserWindowController.xib

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
-        <plugIn identifier="com.apple.imagekit.ibplugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.imagekit.ibplugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMDeviceBrowserWindowController" customModule="PDF_Master" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMDeviceBrowserWindowController" customModule="PDF_Reader_Pro" customModuleProvider="target">
             <connections>
                 <outlet property="cameraDeviceView" destination="FWK-Dq-yNb" id="Cce-MF-TC2"/>
                 <outlet property="deviceBrowserView" destination="LZw-sT-Bz2" id="636-Nr-eeh"/>
@@ -22,7 +22,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="719" height="481"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
             <view key="contentView" id="se5-gp-TjO">
                 <rect key="frame" x="0.0" y="0.0" width="719" height="481"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>