【2025】【OCR】分包下载进度条补充(完善)

PDF Office/PDF Master/KMClass/Convert/Base/KMConvertBaseWindowController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="System colors introduced in macOS 10.13" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -171,7 +171,7 @@
                                     <rect key="frame" x="0.0" y="0.0" width="356" height="370"/>
                                     <clipView key="contentView" id="tI2-Vq-Nms">
                                         <rect key="frame" x="0.0" y="0.0" width="341" height="355"/>
-                                        <autoresizingMask key="autoresizingMask"/>
+                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
                                             <view id="dBH-xr-mGL">
                                                 <rect key="frame" x="0.0" y="0.0" width="326" height="340"/>

PDF Office/PDF Master/KMClass/Convert/View/KMConvertOCRSettingItemView.swift

@@ -123,6 +123,10 @@ class KMConvertOCRSettingItemView: KMConvertBaseView {
         super.awakeFromNib()
         
         self._checkAction()
+        
+#if VERSION_DMG
+        KMResourceDownloadManager.manager.downLoadOCRResource(window: self.window ?? NSWindow.currentWindow())
+#endif
     }
     
     override func initSubViews() {
@@ -171,39 +175,6 @@ class KMConvertOCRSettingItemView: KMConvertBaseView {
         self._checkAction()
     }
     
-#if VERSION_DMG
-    func downLoad() {
-        DispatchQueue.main.async {
-            self.showProgressWindow()
-            self.progressController?.maxValue = Double(100)
-        }
-        KMResourceDownloadManager.manager.downloadFramework(progress: { progress in
-            self.progressController?.doubleValue = Double(progress*100)
-        }, result: { result, downloadState  in
-            if result {
-                if let state = self._checkVC?.state {
-                    self._checkVC?.state = state == .Checked ? .Norm : .Checked
-                }
-                
-                self._checkAction()
-                
-                if let state = self._checkVC?.state {
-                    self._checkVC?.state = state == .Checked ? .Norm : .Checked
-                }
-                
-                self._checkAction()
-                self.hiddenProgressWindow()
-            } else if downloadState == .retry {
-                DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.2, execute: { [weak self] in
-                    self?.downLoad()
-                })
-            } else {
-                self.hiddenProgressWindow()
-            }
-        })
-    }
-#endif
-    
     public func checkAction() {
         self._checkAction()
     }
@@ -216,34 +187,6 @@ class KMConvertOCRSettingItemView: KMConvertBaseView {
         needOCRAction?(!languageView_.properties.isDisabled)
     }
     
-    func showProgressWindow() {
-        let progress = SKProgressController()
-        progress.window?.backgroundColor = NSColor.km_init(hex: "#36383B")
-        progress.window?.contentView?.wantsLayer = true
-        progress.window?.contentView?.layer?.backgroundColor = NSColor.km_init(hex: "#36383B").cgColor
-        progress.progressField.textColor = NSColor.white
-        progress.message = NSLocalizedString("Download...", comment: "")
-
-        progress.closeBlock = { [weak self] in
-#if VERSION_DMG
-            KMResourceDownloadManager.manager.cancelDownload()
-#endif
-        }
-        
-        self.progressController = progress
-        self.window?.beginSheet(progress.window!)
-    }
-    
-    func hiddenProgressWindow() {
-        DispatchQueue.main.async {
-            self.progressController?.doubleValue = 100.0
-            if (self.progressController != nil) {
-                self.window?.endSheet((self.progressController?.window)!)
-                self.progressController = nil
-            }
-        }
-    }
-    
     func reloadData() {
         self.checkView_.properties.isDisabled = self.isDisable
         self.checkView_.reloadData()