Bläddra i källkod

【转档库】 - 非OCR库使用

liujiajie 10 månader sedan
förälder
incheckning
829cfa3e31

+ 2 - 2
PDF Office/PDF Master/Class/Batch/Operation/KMBatchConvertOperation.swift

@@ -132,7 +132,7 @@ class KMBatchConvertOperation: KMBatchOperation, CPDFConverterDelegate, CPDFConv
                 self.converter!.delegate = self
                 let options = CPDFConvertRtfOptions()
                 options.isContainAnnotations = true
-                options.isAllowOCR = true
+//                options.isAllowOCR = true
                 options.isContainImages = true
                 self.converter!.convert(toFilePath: operateFile?.outputFilePath, pageIndexs: operateFile?.currentConvertParameter?.pagesArray, options: options)
                 return
@@ -142,7 +142,7 @@ class KMBatchConvertOperation: KMBatchOperation, CPDFConverterDelegate, CPDFConv
                 self.converter!.delegate = self
                 let options = CPDFConvertHtmlOptions()
                 options.isContainAnnotations = true
-                options.isAllowOCR = true
+//                options.isAllowOCR = true
                 options.isContainImages = true
                 self.converter!.convert(toFilePath: operateFile?.outputFilePath, pageIndexs: operateFile?.currentConvertParameter?.pagesArray, options: options)
                 return

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/Convert/Controller/KMConvertBaseWindowController.swift

@@ -421,7 +421,7 @@ class KMConvertBaseWindowController: KMBaseWindowController {
         if let isAllowOCR = self.settingView?.ocrEnabled {
             convert.isAllowOCR = isAllowOCR
             if let idx = self.settingView?.ocrItemView?.languageIndex {
-                convert.ocrLanguage = KMPDFConvertManager.defaultManager.languages_asc[idx]
+//                convert.ocrLanguage = KMPDFConvertManager.defaultManager.languages_asc[idx]
             }
         } else {
             convert.isAllowOCR = false

+ 66 - 66
PDF Office/PDF Master/Class/PDFTools/Convert/NewController/Common/KMPDFConvert.swift

@@ -58,7 +58,7 @@ class KMPDFConvert: Operation {
     
     // 是否使用OCR
     var isAllowOCR = false
-    var ocrLanguage: COCRLanguage?
+//    var ocrLanguage: COCRLanguage?
     var isContainOCRBgImage = true
     var isContainAnnotations = true
     var isContainImages = true
@@ -278,7 +278,7 @@ class KMPDFConvert: Operation {
             self.converter = CPDFConverterCsv.init(url: URL(fileURLWithPath: filePath), password: self.password)
             self.converter.delegate = self
             let options = CPDFConvertCsvOptions()
-            options.isAILayoutAnalysis = isExtractTable
+//            options.isAILayoutAnalysis = isExtractTable
             self.converter.convert(toFilePath: self.outputFilePath, pageIndexs: self.pages, options: options)
             return
         }
@@ -288,7 +288,7 @@ class KMPDFConvert: Operation {
             self.converter.delegate = self
             let options = CPDFConvertRtfOptions()
             options.isContainAnnotations = true
-            options.isAllowOCR = true
+//            options.isAllowOCR = true
 //            if (self.isAllowOCR) {
 //                options.isContainOCRBgImage = self.isContainOCRBgImage
 //                if let language = self.ocrLanguage {
@@ -309,7 +309,7 @@ class KMPDFConvert: Operation {
             self.converter.delegate = self
             let options = CPDFConvertHtmlOptions()
             options.isContainAnnotations = true
-            options.isAllowOCR = true
+//            options.isAllowOCR = true
 //            if (self.isAllowOCR) {
 //                options.isContainOCRBgImage = self.isContainOCRBgImage
 //                if let language = self.ocrLanguage {
@@ -432,18 +432,18 @@ class KMPDFConvertWord: KMPDFConvert {
         let options = CPDFConvertWordOptions()
         options.layoutOptions = self.layoutOptions
         options.isContainAnnotations = self.isContainAnnotations
-        options.isAllowOCR = self.isAllowOCR
-        if (self.isAllowOCR) {
-            options.isContainOCRBgImage = self.isContainOCRBgImage
-            if let language = self.ocrLanguage {
-                options.language = language
-            } else {
-                options.language = .english
-            }
-        } else {
+//        options.isAllowOCR = self.isAllowOCR
+//        if (self.isAllowOCR) {
+//            options.isContainOCRBgImage = self.isContainOCRBgImage
+//            if let language = self.ocrLanguage {
+//                options.language = language
+//            } else {
+//                options.language = .english
+//            }
+//        } else {
             options.isContainImages = true
-            options.isContainOCRBgImage = false
-        }
+//            options.isContainOCRBgImage = false
+//        }
         
         self.converter.convert(toFilePath: self.outputFilePath, pageIndexs: self.pages, options: options)
     }
@@ -497,18 +497,18 @@ class KMPDFConvertPPT: KMPDFConvert {
         
         let options = CPDFConvertPPTOptions()
         options.isContainAnnotations = self.isContainAnnotations
-        options.isAllowOCR = self.isAllowOCR
-        if (self.isAllowOCR) {
-            options.isContainOCRBgImage = self.isContainOCRBgImage
-            if let language = self.ocrLanguage {
-                options.language = language
-            } else {
-                options.language = .english
-            }
-        } else {
+//        options.isAllowOCR = self.isAllowOCR
+//        if (self.isAllowOCR) {
+//            options.isContainOCRBgImage = self.isContainOCRBgImage
+//            if let language = self.ocrLanguage {
+//                options.language = language
+//            } else {
+//                options.language = .english
+//            }
+//        } else {
             options.isContainImages = true
-            options.isContainOCRBgImage = false
-        }
+//            options.isContainOCRBgImage = false
+//        }
         
         self.converter = CPDFConverterPPT(url: URL(fileURLWithPath: self.filePath), password: self.password)
         self.converter.delegate = self
@@ -533,18 +533,18 @@ class KMPDFConvertRTF: KMPDFConvert {
         
         let options = CPDFConvertRtfOptions()
         options.isContainAnnotations = self.isContainAnnotations
-        options.isAllowOCR = self.isAllowOCR
-        if (self.isAllowOCR) {
-            options.isContainOCRBgImage = self.isContainOCRBgImage
-            if let language = self.ocrLanguage {
-                options.language = language
-            } else {
-                options.language = .english
-            }
-        } else {
+//        options.isAllowOCR = self.isAllowOCR
+//        if (self.isAllowOCR) {
+//            options.isContainOCRBgImage = self.isContainOCRBgImage
+//            if let language = self.ocrLanguage {
+//                options.language = language
+//            } else {
+//                options.language = .english
+//            }
+//        } else {
             options.isContainImages = true
-            options.isContainOCRBgImage = false
-        }
+//            options.isContainOCRBgImage = false
+//        }
         
         
         self.converter = CPDFConverterRtf(url: URL(fileURLWithPath: self.filePath), password: self.password)
@@ -570,18 +570,18 @@ class KMPDFConvertHTML: KMPDFConvert {
         
         let options = CPDFConvertHtmlOptions()
         options.isContainAnnotations = self.isContainAnnotations
-        options.isAllowOCR = self.isAllowOCR
-        if (self.isAllowOCR) {
-            options.isContainOCRBgImage = self.isContainOCRBgImage
-            if let language = self.ocrLanguage {
-                options.language = language
-            } else {
-                options.language = .english
-            }
-        } else {
+//        options.isAllowOCR = self.isAllowOCR
+//        if (self.isAllowOCR) {
+//            options.isContainOCRBgImage = self.isContainOCRBgImage
+//            if let language = self.ocrLanguage {
+//                options.language = language
+//            } else {
+//                options.language = .english
+//            }
+//        } else {
             options.isContainImages = self.isContainImages
-            options.isContainOCRBgImage = false
-        }
+//            options.isContainOCRBgImage = false
+//        }
         
         self.converter = CPDFConverterHtml(url: URL(fileURLWithPath: self.filePath), password: self.password)
         self.converter.delegate = self
@@ -605,14 +605,14 @@ class KMPDFConvertText: KMPDFConvert {
         }
         
         let options = CPDFConvertTxtOptions()
-        options.isAllowOCR = self.isAllowOCR
-        if (self.isAllowOCR) {
-            if let language = self.ocrLanguage {
-                options.language = language
-            } else {
-                options.language = .english
-            }
-        } 
+//        options.isAllowOCR = self.isAllowOCR
+//        if (self.isAllowOCR) {
+//            if let language = self.ocrLanguage {
+//                options.language = language
+//            } else {
+//                options.language = .english
+//            }
+//        } 
         
         self.converter = CPDFConverterTxt(url: URL(fileURLWithPath: self.filePath), password: self.password)
         self.converter.delegate = self
@@ -670,18 +670,18 @@ class KMPDFConvertExcel: KMPDFConvert {
         
         let options = CPDFConvertExcelOptions()
         options.isContainAnnotations = self.isContainAnnotations
-        options.isAllowOCR = self.isAllowOCR
-        if (self.isAllowOCR) {
-//            options.isContainOCRBgImage = self.isContainOCRBgImage
-            if let language = self.ocrLanguage {
-                options.language = language
-            } else {
-                options.language = .english
-            }
-        } else {
+//        options.isAllowOCR = self.isAllowOCR
+//        if (self.isAllowOCR) {
+////            options.isContainOCRBgImage = self.isContainOCRBgImage
+//            if let language = self.ocrLanguage {
+//                options.language = language
+//            } else {
+//                options.language = .english
+//            }
+//        } else {
             options.isContainImages = true
 //            options.isContainOCRBgImage = false
-        }
+//        }
         
         if (self.isExtractText) {
             options.contentOptions = .onlyText

+ 361 - 361
PDF Office/PDF Master/Class/PDFTools/Convert/NewController/Common/KMPDFConvertManager.swift

@@ -12,74 +12,74 @@ class KMPDFConvertManager: NSObject {
     static let defaultManager = KMPDFConvertManager()
     
     var operationQueue: OperationQueue = OperationQueue()
-    lazy var ocrLanguages: [COCRLanguage] = {
-        return [.chinese, .chineseTraditional, .english, .japanese, .korean,
-                // // Latin
-                .serbian, .occitan, .danish, .german, .french, .italian, .spanish, .portuguese, .maori, .malay,
-                .maltese, .dutch, .norwegian, .polish, .romanian, .slovak, .slovenian, .albanian, .swedish, .swahili,
-                .tagalog, .turish, .uzbek, .vietnamese, .afrikaans, .azerbaijani, .bosnian, .czech, .welsh, .estonian,
-                .irish, .croatian, .hungarian, .indonesian, .icelandic, .kurdish, .lithuanian, .latvian,
-                // Devanagari
-//                .marathi, .nepali, .hindi, .bihari, .maithili, .angika, .bhojpuri, .magahi, .nagpur, .newari,
-//                .goanKonkani, .saudiArabia
-        ]
-    }()
-    lazy var ocrLanguageStrings: [String] = {
-        var array: [String] = []
-        for ocrLanguage in self.ocrLanguages {
-            array.append(self.ocrLanguageString(ocrLanguage: ocrLanguage))
-        }
-        return array
-    }()
+//    lazy var ocrLanguages: [COCRLanguage] = {
+//        return [.chinese, .chineseTraditional, .english, .japanese, .korean,
+//                // // Latin
+//                .serbian, .occitan, .danish, .german, .french, .italian, .spanish, .portuguese, .maori, .malay,
+//                .maltese, .dutch, .norwegian, .polish, .romanian, .slovak, .slovenian, .albanian, .swedish, .swahili,
+//                .tagalog, .turish, .uzbek, .vietnamese, .afrikaans, .azerbaijani, .bosnian, .czech, .welsh, .estonian,
+//                .irish, .croatian, .hungarian, .indonesian, .icelandic, .kurdish, .lithuanian, .latvian,
+//                // Devanagari
+////                .marathi, .nepali, .hindi, .bihari, .maithili, .angika, .bhojpuri, .magahi, .nagpur, .newari,
+////                .goanKonkani, .saudiArabia
+//        ]
+//    }()
+//    lazy var ocrLanguageStrings: [String] = {
+//        var array: [String] = []
+//        for ocrLanguage in self.ocrLanguages {
+//            array.append(self.ocrLanguageString(ocrLanguage: ocrLanguage))
+//        }
+//        return array
+//    }()
     
-    private var _languages_asc: [COCRLanguage] = []
-    var languages_asc: [COCRLanguage] {
-        get {
-            if (!self._languages_asc.isEmpty) {
-                return self._languages_asc
-            }
-            
-            self._languages_asc = self.getOCRLanguages(sortMode: .ascending)
-            return self._languages_asc
-        }
-    }
+//    private var _languages_asc: [COCRLanguage] = []
+//    var languages_asc: [COCRLanguage] {
+//        get {
+//            if (!self._languages_asc.isEmpty) {
+//                return self._languages_asc
+//            }
+//            
+//            self._languages_asc = self.getOCRLanguages(sortMode: .ascending)
+//            return self._languages_asc
+//        }
+//    }
     
-    private var _languages_desc: [COCRLanguage] = []
-    var languages_desc: [COCRLanguage] {
-        get {
-            if (!self._languages_desc.isEmpty) {
-                return self._languages_desc
-            }
-            
-            self._languages_desc = self.getOCRLanguages(sortMode: .descending)
-            return self._languages_desc
-        }
-    }
+//    private var _languages_desc: [COCRLanguage] = []
+//    var languages_desc: [COCRLanguage] {
+//        get {
+//            if (!self._languages_desc.isEmpty) {
+//                return self._languages_desc
+//            }
+//            
+//            self._languages_desc = self.getOCRLanguages(sortMode: .descending)
+//            return self._languages_desc
+//        }
+//    }
     
     private var _languages_asc_strings: [String] = []
-    var languages_asc_strings: [String] {
-        get {
-            if (!self._languages_asc_strings.isEmpty) {
-                return self._languages_asc_strings
-            }
-            
-            self._languages_asc_strings = self.getOCRLanguageStrings(sortMode: .ascending)
-            return self._languages_asc_strings
-        }
-    }
+//    var languages_asc_strings: [String] {
+//        get {
+//            if (!self._languages_asc_strings.isEmpty) {
+//                return self._languages_asc_strings
+//            }
+//            
+//            self._languages_asc_strings = self.getOCRLanguageStrings(sortMode: .ascending)
+//            return self._languages_asc_strings
+//        }
+//    }
     
     private var _languages_desc_strings: [String] = []
-    var languages_desc_strings: [String] {
-        get {
-            if (!self._languages_desc_strings.isEmpty) {
-                return self._languages_desc_strings
-            }
-            
-            self._languages_desc_strings = self.getOCRLanguageStrings(sortMode: .descending)
-            return self._languages_desc_strings
-        }
-    }
-    
+//    var languages_desc_strings: [String] {
+//        get {
+//            if (!self._languages_desc_strings.isEmpty) {
+//                return self._languages_desc_strings
+//            }
+//            
+//            self._languages_desc_strings = self.getOCRLanguageStrings(sortMode: .descending)
+//            return self._languages_desc_strings
+//        }
+//    }
+//    
     override init() {
         super.init()
         
@@ -104,289 +104,289 @@ class KMPDFConvertManager: NSObject {
         self.operationQueue.cancelAllOperations()
     }
     
-    public func ocrLanguageString(ocrLanguage: COCRLanguage) -> String {
-        switch ocrLanguage {
-        case .chinese:
-            return NSLocalizedString("Chinese", comment: "")
-        case .chineseTraditional:
-            return NSLocalizedString("Chinese Traditional", comment: "")
-        case .english:
-            return NSLocalizedString("English", comment: "")
-        case .japanese:
-            return NSLocalizedString("Japanese", comment: "")
-        case .korean:
-            return NSLocalizedString("Kroean", comment: "")
-            
-        /// Latin
-        case .serbian:
-            return NSLocalizedString("Serbian", comment: "")
-        case .occitan:
-            return NSLocalizedString("Occitan", comment: "")
-        case .danish:
-            return NSLocalizedString("Danish", comment: "")
-        case .german:
-            return NSLocalizedString("German", comment: "")
-        case .french:
-            return NSLocalizedString("French", comment: "")
-        case .italian:
-            return NSLocalizedString("Italian", comment: "")
-        case .spanish:
-            return NSLocalizedString("Spanish", comment: "")
-        case .portuguese:
-            return NSLocalizedString("Portuguese", comment: "")
-        case .maori:
-            return NSLocalizedString("Maori", comment: "")
-        case .malay:
-            return NSLocalizedString("Malay", comment: "")
-            
-        case .maltese:
-            return NSLocalizedString("Maltese", comment: "")
-        case .dutch:
-            return NSLocalizedString("Dutch", comment: "")
-        case .norwegian:
-            return NSLocalizedString("Norwegian", comment: "")
-        case .polish:
-            return NSLocalizedString("Polish", comment: "")
-        case .romanian:
-            return NSLocalizedString("Romanian", comment: "")
-        case .slovak:
-            return NSLocalizedString("Slovak", comment: "")
-        case .slovenian:
-            return NSLocalizedString("Slovenian", comment: "")
-        case .albanian:
-            return NSLocalizedString("Albanian", comment: "")
-        case .swedish:
-            return NSLocalizedString("Swedish", comment: "")
-        case .swahili:
-            return NSLocalizedString("Swahili", comment: "")
-            
-        case .tagalog:
-            return NSLocalizedString("Tagalog", comment: "")
-        case .turish:
-            return NSLocalizedString("Turish", comment: "")
-        case .uzbek:
-            return NSLocalizedString("Uzbek", comment: "")
-        case .vietnamese:
-            return NSLocalizedString("Vietnamese", comment: "")
-        case .afrikaans:
-            return NSLocalizedString("Afrikaans", comment: "")
-        case .azerbaijani:
-            return NSLocalizedString("Azerbaijani", comment: "")
-        case .bosnian:
-            return NSLocalizedString("Bosnian", comment: "")
-        case .czech:
-            return NSLocalizedString("Czech", comment: "")
-        case .welsh:
-            return NSLocalizedString("Welsh", comment: "")
-        case .estonian:
-            return NSLocalizedString("Estonian", comment: "")
-            
-        case .irish:
-            return NSLocalizedString("Irish", comment: "")
-        case .croatian:
-            return NSLocalizedString("Croatian", comment: "")
-        case .hungarian:
-            return NSLocalizedString("Hungarian", comment: "")
-        case .indonesian:
-            return NSLocalizedString("Indonesian", comment: "")
-        case .icelandic:
-            return NSLocalizedString("Icelandic", comment: "")
-        case .kurdish:
-            return NSLocalizedString("Kurdish", comment: "")
-        case .lithuanian:
-            return NSLocalizedString("Lithuanian", comment: "")
-        case .latvian:
-            return NSLocalizedString("Latvian", comment: "")
-            
-        /// Devanagari
-        case .marathi:
-            return NSLocalizedString("Marathi", comment: "")
-        case .nepali:
-            return NSLocalizedString("Nepali", comment: "")
-        case .hindi:
-            return NSLocalizedString("Hindi", comment: "")
-        case .bihari:
-            return NSLocalizedString("Bihari", comment: "")
-        case .maithili:
-            return NSLocalizedString("Maithili", comment: "")
-        case .angika:
-            return NSLocalizedString("Angika", comment: "")
-        case .bhojpuri:
-            return NSLocalizedString("Bhojpuri", comment: "")
-        case .magahi:
-            return NSLocalizedString("Magahi", comment: "")
-        case .nagpur:
-            return NSLocalizedString("Nagpur", comment: "")
-        case .newari:
-            return NSLocalizedString("Newari", comment: "")
-            
-        case .goanKonkani:
-            return NSLocalizedString("GoanKonkani", comment: "")
-        case .saudiArabia:
-            return NSLocalizedString("SaudiArabia", comment: "")
-        @unknown default:
-            return ""
-        }
-    }
+//    public func ocrLanguageString(ocrLanguage: COCRLanguage) -> String {
+//        switch ocrLanguage {
+//        case .chinese:
+//            return NSLocalizedString("Chinese", comment: "")
+//        case .chineseTraditional:
+//            return NSLocalizedString("Chinese Traditional", comment: "")
+//        case .english:
+//            return NSLocalizedString("English", comment: "")
+//        case .japanese:
+//            return NSLocalizedString("Japanese", comment: "")
+//        case .korean:
+//            return NSLocalizedString("Kroean", comment: "")
+//            
+//        /// Latin
+//        case .serbian:
+//            return NSLocalizedString("Serbian", comment: "")
+//        case .occitan:
+//            return NSLocalizedString("Occitan", comment: "")
+//        case .danish:
+//            return NSLocalizedString("Danish", comment: "")
+//        case .german:
+//            return NSLocalizedString("German", comment: "")
+//        case .french:
+//            return NSLocalizedString("French", comment: "")
+//        case .italian:
+//            return NSLocalizedString("Italian", comment: "")
+//        case .spanish:
+//            return NSLocalizedString("Spanish", comment: "")
+//        case .portuguese:
+//            return NSLocalizedString("Portuguese", comment: "")
+//        case .maori:
+//            return NSLocalizedString("Maori", comment: "")
+//        case .malay:
+//            return NSLocalizedString("Malay", comment: "")
+//            
+//        case .maltese:
+//            return NSLocalizedString("Maltese", comment: "")
+//        case .dutch:
+//            return NSLocalizedString("Dutch", comment: "")
+//        case .norwegian:
+//            return NSLocalizedString("Norwegian", comment: "")
+//        case .polish:
+//            return NSLocalizedString("Polish", comment: "")
+//        case .romanian:
+//            return NSLocalizedString("Romanian", comment: "")
+//        case .slovak:
+//            return NSLocalizedString("Slovak", comment: "")
+//        case .slovenian:
+//            return NSLocalizedString("Slovenian", comment: "")
+//        case .albanian:
+//            return NSLocalizedString("Albanian", comment: "")
+//        case .swedish:
+//            return NSLocalizedString("Swedish", comment: "")
+//        case .swahili:
+//            return NSLocalizedString("Swahili", comment: "")
+//            
+//        case .tagalog:
+//            return NSLocalizedString("Tagalog", comment: "")
+//        case .turish:
+//            return NSLocalizedString("Turish", comment: "")
+//        case .uzbek:
+//            return NSLocalizedString("Uzbek", comment: "")
+//        case .vietnamese:
+//            return NSLocalizedString("Vietnamese", comment: "")
+//        case .afrikaans:
+//            return NSLocalizedString("Afrikaans", comment: "")
+//        case .azerbaijani:
+//            return NSLocalizedString("Azerbaijani", comment: "")
+//        case .bosnian:
+//            return NSLocalizedString("Bosnian", comment: "")
+//        case .czech:
+//            return NSLocalizedString("Czech", comment: "")
+//        case .welsh:
+//            return NSLocalizedString("Welsh", comment: "")
+//        case .estonian:
+//            return NSLocalizedString("Estonian", comment: "")
+//            
+//        case .irish:
+//            return NSLocalizedString("Irish", comment: "")
+//        case .croatian:
+//            return NSLocalizedString("Croatian", comment: "")
+//        case .hungarian:
+//            return NSLocalizedString("Hungarian", comment: "")
+//        case .indonesian:
+//            return NSLocalizedString("Indonesian", comment: "")
+//        case .icelandic:
+//            return NSLocalizedString("Icelandic", comment: "")
+//        case .kurdish:
+//            return NSLocalizedString("Kurdish", comment: "")
+//        case .lithuanian:
+//            return NSLocalizedString("Lithuanian", comment: "")
+//        case .latvian:
+//            return NSLocalizedString("Latvian", comment: "")
+//            
+//        /// Devanagari
+//        case .marathi:
+//            return NSLocalizedString("Marathi", comment: "")
+//        case .nepali:
+//            return NSLocalizedString("Nepali", comment: "")
+//        case .hindi:
+//            return NSLocalizedString("Hindi", comment: "")
+//        case .bihari:
+//            return NSLocalizedString("Bihari", comment: "")
+//        case .maithili:
+//            return NSLocalizedString("Maithili", comment: "")
+//        case .angika:
+//            return NSLocalizedString("Angika", comment: "")
+//        case .bhojpuri:
+//            return NSLocalizedString("Bhojpuri", comment: "")
+//        case .magahi:
+//            return NSLocalizedString("Magahi", comment: "")
+//        case .nagpur:
+//            return NSLocalizedString("Nagpur", comment: "")
+//        case .newari:
+//            return NSLocalizedString("Newari", comment: "")
+//            
+//        case .goanKonkani:
+//            return NSLocalizedString("GoanKonkani", comment: "")
+//        case .saudiArabia:
+//            return NSLocalizedString("SaudiArabia", comment: "")
+//        @unknown default:
+//            return ""
+//        }
+//    }
     
     //
-    func ocrLanguageIsSupport(appleLanguage: String?) -> Bool {
-        if let _ = KMPDFConvertManager.defaultManager._ocrLanguage(appleLanguage: appleLanguage) {
-            return true
-        }
-        return false
-    }
+//    func ocrLanguageIsSupport(appleLanguage: String?) -> Bool {
+//        if let _ = KMPDFConvertManager.defaultManager._ocrLanguage(appleLanguage: appleLanguage) {
+//            return true
+//        }
+//        return false
+//    }
     
-    func ocrLanguage(appleLanguage: String?) -> COCRLanguage? {
-        return KMPDFConvertManager.defaultManager._ocrLanguage(appleLanguage: appleLanguage)
-    }
+//    func ocrLanguage(appleLanguage: String?) -> COCRLanguage? {
+//        return KMPDFConvertManager.defaultManager._ocrLanguage(appleLanguage: appleLanguage)
+//    }
     
     // MARK: - Private Methods
     
-    fileprivate func _ocrLanguage(appleLanguage: String?) -> COCRLanguage? {
-        guard let _appleLanguage = appleLanguage else {
-            return nil
-        }
-        
-        if (_appleLanguage.hasPrefix("zh-Hans")) {
-            return .chinese
-        }
-        if (_appleLanguage.hasPrefix("zh-Hant")) {
-            return .chineseTraditional
-        }
-        if (_appleLanguage.hasPrefix("en")) {
-            return .english
-        }
-        if (_appleLanguage.hasPrefix("ja")) {
-            return .japanese
-        }
-        if (_appleLanguage.hasPrefix("ko")) {
-            return .korean
-        }
- 
-        if (_appleLanguage.hasPrefix("sr")) {
-            return .serbian
-        }
-        if (_appleLanguage.hasPrefix("oc")) {
-            return .occitan
-        }
-        if (_appleLanguage.hasPrefix("da")) {
-            return .danish
-        }
-        if (_appleLanguage.hasPrefix("de")) {
-            return .german
-        }
-        if (_appleLanguage.hasPrefix("fr")) {
-            return .french
-        }
-        if (_appleLanguage.hasPrefix("it")) {
-            return .italian
-        }
-        if (_appleLanguage.hasPrefix("es")) {
-            return .spanish
-        }
-        if (_appleLanguage.hasPrefix("pt")) {
-            return .portuguese
-        }
-        if (_appleLanguage.hasPrefix("mi")) {
-            return .maori
-        }
-        if (_appleLanguage.hasPrefix("ms")) {
-            return .malay
-        }
-        
-        if (_appleLanguage.hasPrefix("mt")) {
-            return .maltese
-        }
-        if (_appleLanguage.hasPrefix("nl")) {
-            return .dutch
-        }
-        if (_appleLanguage.hasPrefix("nb")) {
-            return .norwegian
-        }
-        if (_appleLanguage.hasPrefix("pl")) {
-            return .polish
-        }
-        if (_appleLanguage.hasPrefix("ro")) {
-            return .romanian
-        }
-        if (_appleLanguage.hasPrefix("sk")) {
-            return .slovak
-        }
-        if (_appleLanguage.hasPrefix("sl")) {
-            return .slovenian
-        }
-        if (_appleLanguage.hasPrefix("sq")) {
-            return .albanian
-        }
-        if (_appleLanguage.hasPrefix("sv")) {
-            return .welsh
-        }
-        if (_appleLanguage.hasPrefix("sw")) {
-            return .swahili
-        }
-        
-        if (_appleLanguage.hasPrefix("fil")) { //  tagalog 塔加洛语 Filipino 菲律宾语
-            return .tagalog
-        }
-        if (_appleLanguage.hasPrefix("tr")) { // Turkish
-            return .turish
-        }
-        if (_appleLanguage.hasPrefix("uz")) {
-            return .uzbek
-        }
-        if (_appleLanguage.hasPrefix("vi")) {
-            return .vietnamese
-        }
-        if (_appleLanguage.hasPrefix("af")) {
-            return .afrikaans
-        }
-        if (_appleLanguage.hasPrefix("az")) {
-            return .azerbaijani
-        }
-        if (_appleLanguage.hasPrefix("bs")) {
-            return .bosnian
-        }
-        if (_appleLanguage.hasPrefix("cs")) {
-            return .czech
-        }
-        if (_appleLanguage.hasPrefix("cy")) {
-            return .welsh
-        }
-        if (_appleLanguage.hasPrefix("et")) { // eston
-            return .estonian
-        }
-        
-        if (_appleLanguage.hasPrefix("ga")) {
-            return .irish
-        }
-        if (_appleLanguage.hasPrefix("hr")) {
-            return .croatian
-        }
-        if (_appleLanguage.hasPrefix("hu")) {
-            return .hungarian
-        }
-        if (_appleLanguage.hasPrefix("id")) {
-            return .indonesian
-        }
-        if (_appleLanguage.hasPrefix("is")) {
-            return .icelandic
-        }
-        if (_appleLanguage.hasPrefix("ckb")) {
-            return .kurdish
-        }
-        if (_appleLanguage.hasPrefix("lt")) {
-            return .lithuanian
-        }
-        if (_appleLanguage.hasPrefix("lv")) {
-            return .latvian
-        }
-//        if (_appleLanguage.hasPrefix("")) {
-//
+//    fileprivate func _ocrLanguage(appleLanguage: String?) -> COCRLanguage? {
+//        guard let _appleLanguage = appleLanguage else {
+//            return nil
 //        }
-        
-        return nil
-    }
+//        
+//        if (_appleLanguage.hasPrefix("zh-Hans")) {
+//            return .chinese
+//        }
+//        if (_appleLanguage.hasPrefix("zh-Hant")) {
+//            return .chineseTraditional
+//        }
+//        if (_appleLanguage.hasPrefix("en")) {
+//            return .english
+//        }
+//        if (_appleLanguage.hasPrefix("ja")) {
+//            return .japanese
+//        }
+//        if (_appleLanguage.hasPrefix("ko")) {
+//            return .korean
+//        }
+// 
+//        if (_appleLanguage.hasPrefix("sr")) {
+//            return .serbian
+//        }
+//        if (_appleLanguage.hasPrefix("oc")) {
+//            return .occitan
+//        }
+//        if (_appleLanguage.hasPrefix("da")) {
+//            return .danish
+//        }
+//        if (_appleLanguage.hasPrefix("de")) {
+//            return .german
+//        }
+//        if (_appleLanguage.hasPrefix("fr")) {
+//            return .french
+//        }
+//        if (_appleLanguage.hasPrefix("it")) {
+//            return .italian
+//        }
+//        if (_appleLanguage.hasPrefix("es")) {
+//            return .spanish
+//        }
+//        if (_appleLanguage.hasPrefix("pt")) {
+//            return .portuguese
+//        }
+//        if (_appleLanguage.hasPrefix("mi")) {
+//            return .maori
+//        }
+//        if (_appleLanguage.hasPrefix("ms")) {
+//            return .malay
+//        }
+//        
+//        if (_appleLanguage.hasPrefix("mt")) {
+//            return .maltese
+//        }
+//        if (_appleLanguage.hasPrefix("nl")) {
+//            return .dutch
+//        }
+//        if (_appleLanguage.hasPrefix("nb")) {
+//            return .norwegian
+//        }
+//        if (_appleLanguage.hasPrefix("pl")) {
+//            return .polish
+//        }
+//        if (_appleLanguage.hasPrefix("ro")) {
+//            return .romanian
+//        }
+//        if (_appleLanguage.hasPrefix("sk")) {
+//            return .slovak
+//        }
+//        if (_appleLanguage.hasPrefix("sl")) {
+//            return .slovenian
+//        }
+//        if (_appleLanguage.hasPrefix("sq")) {
+//            return .albanian
+//        }
+//        if (_appleLanguage.hasPrefix("sv")) {
+//            return .welsh
+//        }
+//        if (_appleLanguage.hasPrefix("sw")) {
+//            return .swahili
+//        }
+//        
+//        if (_appleLanguage.hasPrefix("fil")) { //  tagalog 塔加洛语 Filipino 菲律宾语
+//            return .tagalog
+//        }
+//        if (_appleLanguage.hasPrefix("tr")) { // Turkish
+//            return .turish
+//        }
+//        if (_appleLanguage.hasPrefix("uz")) {
+//            return .uzbek
+//        }
+//        if (_appleLanguage.hasPrefix("vi")) {
+//            return .vietnamese
+//        }
+//        if (_appleLanguage.hasPrefix("af")) {
+//            return .afrikaans
+//        }
+//        if (_appleLanguage.hasPrefix("az")) {
+//            return .azerbaijani
+//        }
+//        if (_appleLanguage.hasPrefix("bs")) {
+//            return .bosnian
+//        }
+//        if (_appleLanguage.hasPrefix("cs")) {
+//            return .czech
+//        }
+//        if (_appleLanguage.hasPrefix("cy")) {
+//            return .welsh
+//        }
+//        if (_appleLanguage.hasPrefix("et")) { // eston
+//            return .estonian
+//        }
+//        
+//        if (_appleLanguage.hasPrefix("ga")) {
+//            return .irish
+//        }
+//        if (_appleLanguage.hasPrefix("hr")) {
+//            return .croatian
+//        }
+//        if (_appleLanguage.hasPrefix("hu")) {
+//            return .hungarian
+//        }
+//        if (_appleLanguage.hasPrefix("id")) {
+//            return .indonesian
+//        }
+//        if (_appleLanguage.hasPrefix("is")) {
+//            return .icelandic
+//        }
+//        if (_appleLanguage.hasPrefix("ckb")) {
+//            return .kurdish
+//        }
+//        if (_appleLanguage.hasPrefix("lt")) {
+//            return .lithuanian
+//        }
+//        if (_appleLanguage.hasPrefix("lv")) {
+//            return .latvian
+//        }
+////        if (_appleLanguage.hasPrefix("")) {
+////
+////        }
+//        
+//        return nil
+//    }
     
 //    public func appleLanguagePrefix(appleLanguage: String?) -> String? {
 //        guard let _appleLanguage = appleLanguage else {
@@ -418,30 +418,30 @@ class KMPDFConvertManager: NSObject {
 }
 
 extension KMPDFConvertManager {
-    func getOCRLanguages(sortMode: KMSortMode = .none) -> [COCRLanguage] {
-        if (sortMode == .none) {
-            return self.ocrLanguages
-        }
-        
-        let result = self.ocrLanguages.sorted {[unowned self] lan1, lan2 in
-            if self.ocrLanguageString(ocrLanguage: lan1) > self.ocrLanguageString(ocrLanguage: lan2) {
-                return sortMode != .ascending
-            }
-            return sortMode == .ascending
-        }
-        
-        return result
-    }
+//    func getOCRLanguages(sortMode: KMSortMode = .none) -> [COCRLanguage] {
+//        if (sortMode == .none) {
+//            return self.ocrLanguages
+//        }
+//        
+//        let result = self.ocrLanguages.sorted {[unowned self] lan1, lan2 in
+//            if self.ocrLanguageString(ocrLanguage: lan1) > self.ocrLanguageString(ocrLanguage: lan2) {
+//                return sortMode != .ascending
+//            }
+//            return sortMode == .ascending
+//        }
+//        
+//        return result
+//    }
     
-    func getOCRLanguageStrings(sortMode: KMSortMode = .none) -> [String] {
-        let ocrLanguages = self.getOCRLanguages(sortMode: sortMode)
-        
-        var array: [String] = []
-        for ocrLanguage in ocrLanguages {
-            array.append(self.ocrLanguageString(ocrLanguage: ocrLanguage))
-        }
-        return array
-    }
+//    func getOCRLanguageStrings(sortMode: KMSortMode = .none) -> [String] {
+//        let ocrLanguages = self.getOCRLanguages(sortMode: sortMode)
+//        
+//        var array: [String] = []
+//        for ocrLanguage in ocrLanguages {
+//            array.append(self.ocrLanguageString(ocrLanguage: ocrLanguage))
+//        }
+//        return array
+//    }
 }
 
 /*

+ 1 - 1
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertOCRSettingItemView.swift

@@ -71,7 +71,7 @@ class KMConvertOCRSettingItemView: KMConvertBaseView {
 
         self._languageVC?.isScrollPop = true
         self._languageVC?.removeAllItems()
-        self._languageVC?.addItems(withObjectValues: KMPDFConvertManager.defaultManager.languages_asc_strings)
+//        self._languageVC?.addItems(withObjectValues: KMPDFConvertManager.defaultManager.languages_asc_strings)
         if (self.languageIndex < self._languageVC!.numberOfItems) {
             self._languageVC?.selectItem(at: self.languageIndex)
         } else {

+ 9 - 9
PDF Office/PDF Master/Class/PDFTools/Convert/View/KMConvertSettingView.swift

@@ -25,15 +25,15 @@ class KMConvertSettingView: KMConvertBaseView {
                 return
             }
 
-            var language: COCRLanguage = .english
-            if let _language = KMPDFConvertManager.defaultManager.ocrLanguage(appleLanguage: self._currentLanguage) {
-                language = _language
-            }
-            if let index = KMPDFConvertManager.defaultManager.languages_asc.firstIndex(of: language) {
-                self.ocrLanuguageIndex = index
-            } else {
-                self.ocrLanuguageIndex = 2
-            }
+//            var language: COCRLanguage = .english
+//            if let _language = KMPDFConvertManager.defaultManager.ocrLanguage(appleLanguage: self._currentLanguage) {
+//                language = _language
+//            }
+//            if let index = KMPDFConvertManager.defaultManager.languages_asc.firstIndex(of: language) {
+//                self.ocrLanuguageIndex = index
+//            } else {
+//                self.ocrLanuguageIndex = 2
+//            }
         }
     }