Browse Source

【综合】首页新建PDF(相机、扫描仪)功能调整

wanjun 10 months ago
parent
commit
b5a62581c7

+ 16 - 14
PDF Office/PDF Master/Class/Home/WindowController/KMDeviceBrowserWindowController.swift

@@ -63,17 +63,19 @@ extension KMDeviceBrowserWindowController: NSSplitViewDelegate {
 
 extension KMDeviceBrowserWindowController: IKDeviceBrowserViewDelegate {
     func deviceBrowserView(_ deviceBrowserView: IKDeviceBrowserView!, selectionDidChange device: ICDevice!) {
-        if (device.type == .camera) {
-            cameraDeviceView.cameraDevice = (device as! ICCameraDevice)
-            cameraDeviceView.isHidden = false
-            cameraDeviceView.isHidden = true
-        } else if (device.type == .scanner) {
-            scannerDeviceView.scannerDevice = (device as! ICScannerDevice)
-            scannerDeviceView.isHidden = false
-            scannerDeviceView.isHidden = true
-        } else {
-            scannerDeviceView.isHidden = true
-            scannerDeviceView.isHidden = true
+        if device != nil {
+            if (device.type == .camera) {
+                cameraDeviceView.cameraDevice = (device as! ICCameraDevice)
+                cameraDeviceView.isHidden = false
+                cameraDeviceView.isHidden = true
+            } else if (device.type == .scanner) {
+                scannerDeviceView.scannerDevice = (device as! ICScannerDevice)
+                scannerDeviceView.isHidden = false
+                scannerDeviceView.isHidden = true
+            } else {
+                scannerDeviceView.isHidden = true
+                scannerDeviceView.isHidden = true
+            }
         }
     }
     
@@ -85,9 +87,9 @@ extension KMDeviceBrowserWindowController: IKDeviceBrowserViewDelegate {
 extension KMDeviceBrowserWindowController: IKCameraDeviceViewDelegate {
     func cameraDeviceView(_ cameraDeviceView: IKCameraDeviceView, didDownloadFile file: ICCameraFile, location url: URL, fileData data: Data?, error: Error?) {
         file.imageRepresentationType()
-        if error == nil {
-            importCameraFileCallback?(url as NSURL)
-        }
+//        if error == nil {
+//            importCameraFileCallback?(url as NSURL)
+//        }
     }
 }