// 请求回执显示及点击

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/C/YHCertificateAppointViewController.swift

@@ -48,6 +48,8 @@ class YHCertificateAppointViewController: YHBaseViewController {
     // 申请人是否统一赴港激活签证 本地记录的开关
     var isAllMembersGo: Bool = true // 默认一起去
     
+    var semaphore = DispatchSemaphore(value: 1)
+    
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame:.zero, style:.grouped)
         tableView.estimatedSectionHeaderHeight = 0.01
@@ -138,12 +140,15 @@ class YHCertificateAppointViewController: YHBaseViewController {
         YHHUD.show(.progress(message: "加载中..."))
         self.requetIsGoToHK { // 请求是否赴港办证选项和是否已预约过
             self.requetAppointMembers { // 请求赴港办证人员名单
+                YHHUD.hide()
                 if self.reservationToHK == 1 { // 有历史预约人员
                     YHHUD.show(.progress(message: "加载中..."))
                     self.requestAppointResultList { // 请求预约结果
                         YHHUD.hide()
                         self.updateData()
                         completion?()
+                        self.requestSuccessScriptUrls()
+
                     }
                 } else { // 没有预约过
                     YHHUD.hide()
@@ -259,6 +264,10 @@ class YHCertificateAppointViewController: YHBaseViewController {
         if grabbingNumInfoArr.count > 0 {
             sections.append(grabbingNumInfoArr)
         }
+        
+        if grabbedNumInfoArr.count > 0 {
+            sections.append(grabbedNumInfoArr)
+        }
         self.tableView.reloadData()
         
         // 底部按钮更新
@@ -352,9 +361,12 @@ extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDa
                             self.updateData()
                         }
                     }
+                    
                     if self.reservationToHK == 1 { // 已经预约过
                         // 是否赴港办证不能点击否  index 0是是按钮 1是否按钮
                         cell.disableBtn(index: 1)
+                    } else {
+                        
                     }
                     return cell
                 }
@@ -817,5 +829,47 @@ extension YHCertificateAppointViewController {
             YHHUD.flash(message: msg)
         }
     }
+    
+    // 请求抢号成功后的反馈回执文件私链URL组对应的公链组
+    func requestSuccessScriptUrls() {
+        
+        printLog("XYZ0")
+        if self.successList.count <= 0 {
+            return
+        }
+        
+        self.semaphore = DispatchSemaphore(value: 1)
+        
+        DispatchQueue.global().async {
+            for model in self.successList {
+                var publicUrls:[String] = []
+                for privateUrl in model.receipts {
+                    // 信号-1 如果信号<0 则阻塞等待
+                    self.semaphore.wait()
+                    self.viewModel.getPublicImageUrl(privateUrl) { success, error in
+                        printLog("success: \n\(success)")
+                        if let publicUrl = success {
+                            printLog("ABC: success")
+                            publicUrls.append(publicUrl)
+                        } else {
+                            // 私链转公链失败 只有在点击对应的回执图片的时候再次请求公链
+                            printLog("ABC: failed")
+                            publicUrls.append("")
+                        }
+                        // 释放信号+1
+                        self.semaphore.signal()
+                    }
+                }
+                self.semaphore.wait()
+                model.publicReceipts = publicUrls
+                self.semaphore.signal()
+            }
+                
+            DispatchQueue.main.async {
+                self.tableView.reloadData()
+                self.semaphore.wait()
+            }
+        }
+    }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/M/YHAppointHKResultModel.swift

@@ -38,8 +38,21 @@ class YHAppointMemberGroupModel: SmartCodable {
     var immigrationOffice : String = ""
     var wantImmigrationOffice: String = ""
     var goTime: String = ""
+    // 此处是私链URL数组
     var receipts: [String] = []
     var submitTime: String = ""
+    
+    // 自定义
+    // 私链反馈回执对应的公链
+    var publicReceipts: [String] = []
+    
+    // 公链数组中是否有空链
+    func hasEmptyPublicReceipte() -> Bool {
+        let filterArr =  publicReceipts.filter {
+            return $0.isEmpty
+        }
+        return filterArr.count > 0
+    }
 
     enum CodingKeys: String, CodingKey {
         case id = "id"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHGrabFileCell.swift

@@ -13,10 +13,20 @@ class YHGrabFileCell: UICollectionViewCell {
     static let cellReuseIdentifier = "YHGrabFileCell"
 
     lazy var fileImgView:UIImageView = {
-        let view = UIImageView(image: UIImage(named: ""))
+        let view = UIImageView(image: UIImage(named: "global_default_image"))
         return view
     }()
     
+    var fileUrl: String = "" {
+        didSet {
+            if let url = URL(string: fileUrl) {
+                fileImgView.sd_setImage(with: url, placeholderImage:UIImage(named: "global_default_image"))
+            } else {
+                fileImgView.image = UIImage(named: "global_default_image")
+            }
+        }
+    }
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
         createUI()
@@ -27,12 +37,15 @@ class YHGrabFileCell: UICollectionViewCell {
     }
     
     func createUI() {
+        
         self.layer.cornerRadius = 5.0
-        self.layer.borderWidth = 0.5
+        self.layer.borderWidth = 1.0
         self.layer.borderColor = UIColor.init(hex: 0xD8D8D8).cgColor
+        self.clipsToBounds = true
         self.addSubview(fileImgView)
         fileImgView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
         }
     }
+
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHGrabNumberInfoView.swift

@@ -18,17 +18,19 @@ class YHGrabItem {
     var type: YHGrabItemViewType = .info
     var title: String = ""
     var detail: String = ""
-    var files:[String] = []
+    var files: [String] = []
+    var publicFiles: [String] = []
     
     required init() {
         
     }
     
-    init(type: YHGrabItemViewType, title: String, detail: String, files:[String] = []) {
+    init(type: YHGrabItemViewType, title: String, detail: String, files:[String] = [], publicFiles:[String] = []) {
         self.type = type
         self.title = title
         self.detail = detail
         self.files = files
+        self.publicFiles = publicFiles
     }
 }
 
@@ -41,6 +43,8 @@ class YHGrabNumberInfoItemView: UIView {
     let gap = 8.0
     let fileWidth = floorl((KScreenWidth-48.0*2.0-8.0*3.0)/4.0)
     
+    let viewModel = YHBaseViewModel()
+    
     var item: YHGrabItem = YHGrabItem()
     
     lazy var collectionView: UICollectionView = {
@@ -150,7 +154,7 @@ class YHGrabNumberInfoItemView: UIView {
             make.width.height.equalTo(dotWidth)
             make.centerY.equalTo(detailLabel)
             make.right.equalTo(detailLabel.snp.left).offset(-4)
-//            make.left.greaterThanOrEqualTo(titleLabel.snp.right).offset(0)
+            make.left.greaterThanOrEqualTo(titleLabel.snp.right).offset(0)
         }
         
         collectionView.snp.makeConstraints { make in
@@ -270,14 +274,38 @@ extension YHGrabNumberInfoItemView: UICollectionViewDelegate, UICollectionViewDa
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: YHGrabFileCell.cellReuseIdentifier, for: indexPath) as! YHGrabFileCell
             if 0 <= indexPath.item && indexPath.item < item.files.count {
                 let url = item.files[indexPath.item]
-    
+                if item.publicFiles.count == item.files.count {
+                    // 公链组和私链组数量一致
+                    let publicUrl = item.publicFiles[indexPath.item]
+                    cell.fileUrl = publicUrl
+                } else {
+                    cell.fileUrl = ""
+                }
             }
             return cell
         }
     
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         if 0 <= indexPath.item && indexPath.item < item.files.count {
-            let text = item.files[indexPath.item]
+            let privateUrl = item.files[indexPath.item]
+            if item.publicFiles.count == item.files.count {
+                // 公链组和私链组数量一致
+                let publicUrl = item.publicFiles[indexPath.item]
+                if !publicUrl.isEmpty {
+                   YHPictureReviewManager.shared.showNetWorkPicturs(curIndex: indexPath.item, arrPicturs: item.publicFiles)
+                } else { // 当前公链为空 仅请求当前点击文件公链
+                    YHHUD.show(.progress(message: "加载中..."))
+                    self.viewModel.getPublicImageUrl(privateUrl) { success, error in
+                        YHHUD.hide()
+                        if let success = success {
+                            self.item.publicFiles[indexPath.item] = success
+                        }
+                        self.collectionView.reloadData()
+                        YHPictureReviewManager.shared.showNetWorkPicturs(curIndex: indexPath.item, arrPicturs: self.item.publicFiles)
+
+                    }
+                }
+            }
         }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHHaveGrabbedNumberListCell.swift

@@ -16,6 +16,7 @@ class YHHaveGrabbedNumberListCell: UITableViewCell {
         didSet {
             listContainView.removeSubviews()
             var lastView: YHHaveGrabbedNumberInfoView? = nil
+            
             for  (index, group) in listArr.enumerated() {
                 let listView = YHHaveGrabbedNumberInfoView(frame: .zero)
                 let chineseNum = convertNumberToChineseText(index+1)
@@ -25,7 +26,7 @@ class YHHaveGrabbedNumberListCell: UITableViewCell {
                 // 抢号信息
                 let items1 = [YHGrabItem(type: .info, title: "赴港时间：", detail: group.goTime),
                              YHGrabItem(type: .info, title: "香港入境处：", detail: group.immigrationOffice),
-                             YHGrabItem(type: .files, title: "抢号反馈回执：", detail: "", files: group.receipts),]
+                              YHGrabItem(type: .files, title: "抢号反馈回执：", detail: "", files:group.receipts, publicFiles: group.publicReceipts)]
                 listView.grabInfoView.updateItems(items1)
                 
                 // 意向信息

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/VM/YHCerAppointViewModel.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-class YHCerAppointViewModel: NSObject {
+class YHCerAppointViewModel: YHBaseViewModel {
     
     var serviceArr: [YHServiceItem] = []
     var hkUsers: [YHHKMemberModel] = []
@@ -209,7 +209,7 @@ class YHCerAppointViewModel: NSObject {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.AppointHK.appointResult
         
-        let _ = YHNetRequest.postRequest(url: strUrl,params: params) { 
+        let _ = YHNetRequest.postRequest(url: strUrl,params: params) {
              json, code in
             printLog("model 是 ==> \(json)")