// 原则批

galaxy/galaxy/Classes/Base/C/YHBaseViewModel.swift

@@ -146,4 +146,61 @@ class YHBaseViewModel {
             })
         }
     }
+    
+    // 验证url是否可直接访问
+    func checkUrlIsDirectAccess(_ url: String, callback:((Bool)->())?) {
+        
+        let task = URLSession.shared.dataTask(with: URL(string: url)!) {
+            (data, response, error) in
+            if error != nil {
+                // url 不可用
+                callback?(false)
+                return
+            }
+            guard let httpResponse = response as? HTTPURLResponse else {
+                // url 不可用
+                callback?(false)
+                return
+            }
+            if httpResponse.statusCode == 200 {
+                // url可用
+                callback?(true)
+                
+            } else {
+                // url 不可用
+                callback?(false)
+            }
+        }
+        task.resume()
+    }
+        
+    // 传入的url无论是公链还是私链 最后返回一个可用链(私转公失败会返回空)
+    func getRealUsefulUrl(_ url: String, callback:((String)->())?) {
+        // 判断url是否可以直接访问
+        self.checkUrlIsDirectAccess(url) {
+            isAccess in
+            
+            if isAccess {
+                // url能直接访问
+                DispatchQueue.main.async {
+                    callback?(url)
+                }
+                return
+            }
+            // url不能直接访问
+            // 进行私链转公链处理
+            self.getPublicImageUrl(url) { success, error in
+                if let successUrl = success {
+                    DispatchQueue.main.async {
+                        callback?(successUrl)
+                    }
+                } else {
+                    // 私链转公链失败
+                    DispatchQueue.main.async {
+                        callback?("")
+                    }
+                }
+            }
+        }
+    }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/C/YHPrincipleUploadListVC.swift

@@ -326,10 +326,12 @@ extension YHPrincipleUploadListVC {
             } else if editType == .preview { // 预览
                 print(model.url)
                 let fileUrl = !model.url.isEmpty ? model.url : model.fileUrl
-                self.viewModel.getPublicImageUrl(fileUrl) { success, error in
-                    if let success = success {
-                        self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:model.name)
-                    }
+                YHHUD.show(.progress(message: "加载中..."))
+                self.viewModel.getRealUsefulUrl(fileUrl) {
+                    [weak self] resultUrl in
+                    YHHUD.hide()
+                    guard let self = self else { return }
+                    self.previewFileTool.openXLSXRemoteFile(urlString: resultUrl, fileName:model.name)
                 }
             }
         }.show()
@@ -403,15 +405,18 @@ extension YHPrincipleUploadListVC: UITableViewDelegate, UITableViewDataSource {
                     guard let self = self else { return }
                     self.showFileOperationAlertView(index, itemModel: model)
                 }
+                // 点击文件直接预览
                 cell.fileClickBlock = {
                     [weak self] fileModel, index in
                     guard let self = self else { return }
                     // 直接点击文件所在行进行预览
                     let fileUrl = !fileModel.url.isEmpty ? fileModel.url : fileModel.fileUrl
-                    self.viewModel.getPublicImageUrl(fileUrl) { success, error in
-                        if let success = success {
-                            self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:model.name)
-                        }
+                    YHHUD.show(.progress(message: "加载中..."))
+                    self.viewModel.getRealUsefulUrl(fileUrl) {
+                        [weak self] resultUrl in
+                        YHHUD.hide()
+                        guard let self = self else { return }
+                        self.previewFileTool.openXLSXRemoteFile(urlString: resultUrl, fileName:model.name)
                     }
                 }
                 // 上传文件点击

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/V/YHPrincipleEnvelopeCell.swift

@@ -89,8 +89,13 @@ class YHPrincipleEnvelopeCell: UITableViewCell {
     @objc func didWatchClicked() {
         guard let model = itemModel else { return }
         if !model.url.isEmpty {
-
-            self.previewFileTool.openXLSXRemoteFile(urlString: model.url, fileName:model.name)
+            YHHUD.show(.progress(message: "加载中..."))
+            self.viewModel.getRealUsefulUrl(model.url) {
+                [weak self] resultUrl in
+                YHHUD.hide()
+                guard let self = self else { return }
+                self.previewFileTool.openXLSXRemoteFile(urlString: resultUrl, fileName:model.name)
+            }
             
             let key = self.getUrlKey(model)
             UserDefaults.standard.set(true, forKey: key)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/PrincipleBatch(原则批)/V/YHPrincipleProfileListCell.swift

@@ -208,12 +208,12 @@ class YHPrincipleProfileListCell: UITableViewCell {
             itemView.updateModel(item)
             if model.type == .entry {
                 itemView.btnClick = {
-                    YHHUD.flash(message: "查看文件")
-                    // 私链转公链
-                    self.viewModel.getPublicImageUrl(item.value) { success, error in
-                        if let success = success {
-                            self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:"申请确认通知书")
-                        }
+                    YHHUD.show(.progress(message: "加载中..."))
+                    self.viewModel.getRealUsefulUrl(item.value) {
+                        [weak self] resultUrl in
+                        YHHUD.hide()
+                        guard let self = self else { return }
+                        self.previewFileTool.openXLSXRemoteFile(urlString: resultUrl, fileName:"申请确认通知书")
                     }
                 }