Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  续签在港签证缴费测试bug修复

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/C/YHHKVisaRenewalPaymentVC.swift

@@ -102,11 +102,6 @@ class YHHKVisaRenewalPaymentVC: YHBaseViewController {
     private let orderId: Int
     private let renewalId: Int
     init(orderId: Int, renewalId: Int) {
-//        self.orderId = 136927
-//        self.renewalId = 343
-        
-//        self.orderId = 151296
-//        self.renewalId = 439
         self.orderId = orderId
         self.renewalId = renewalId
         super.init(nibName: nil, bundle: nil)
@@ -225,7 +220,7 @@ extension YHHKVisaRenewalPaymentVC {
                 guard let self = self else {
                     return
                 }
-                if let presenceStatus = YHVisaRenewalPresenceStatus(rawValue: person.confirm_hk_status) {
+                guard let presenceStatus = YHVisaRenewalPresenceStatus(rawValue: person.confirm_hk_status) else { return }
                 let member = YHVisaRenewalItemDetailType.residenceAction(person.name, presenceStatus, .mid) { [weak self] in
                     guard let self = self else {
                         return
@@ -259,13 +254,23 @@ extension YHHKVisaRenewalPaymentVC {
                     }
                 }
                 actionMembers.append(member)
-                }
                 
-                if let paymentStatus = YHVisaRenewalPaymentStatus(rawValue: person.pay_status) {
+                guard let paymentStatus = YHVisaRenewalPaymentStatus(rawValue: person.pay_status) else {
+                    return
+                }
                 switch paymentStatus {
                 case .pendingPayment:
                     paymentMembers.append(.occupyingSpace)
                     paymentMembers.append(.subHeader(person.name, .pendingPayment))
+                    switch presenceStatus {
+                    case .approvalPending:
+                        paymentMembers.append(.subRemark("续签申请暂未正式获批，请耐心等待"))
+                    case .confirmingPresence:
+                        paymentMembers.append(.subInfo("档案号：", "-", nil))
+                        paymentMembers.append(.subInfo("可缴费时间段：", "\(person.min_pay_time) - \(person.max_pay_time)", nil))
+                        paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
+                        paymentMembers.append(.subRemark("请先确认用户完成确认在港"))
+                    case .confirmedPresence:
                         paymentMembers.append(.subInfo("档案号：", person.file_num, "复制", .mid, nil, false, { [weak self] in
                             guard let self = self else {
                                 return
@@ -275,7 +280,12 @@ extension YHHKVisaRenewalPaymentVC {
                         paymentMembers.append(.subInfo("可缴费时间段：", "\(person.min_pay_time) - \(person.max_pay_time)", nil))
                         paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
                         paymentMembers.append(.subRemark("请复制档案号去港府官网缴费"))
+                    }
                 case .paid:
+                    var fileName = person.receipt
+                    if fileName.count > 0, let url = URL(string: fileName) {
+                        fileName = url.lastPathComponent
+                    }
                     paymentMembers.append(.occupyingSpace)
                     paymentMembers.append(.subHeader(person.name, .paid))
                     paymentMembers.append(.subInfo("档案号：", person.file_num, "复制", .mid, 12, true, { [weak self] in
@@ -284,10 +294,7 @@ extension YHHKVisaRenewalPaymentVC {
                         }
                         self.copyToPasteBoard(person.file_num, message: "已复制档案号")
                     }))
-                        var fileName = person.receipt
-                        if let url = URL(string: fileName) {
-                            fileName = url.lastPathComponent
-                        }
+                    
                     paymentMembers.append(.subContent("缴费电子签证：", fileName, "查看", .mid, { [weak self] in
                         guard let self = self else {
                             return
@@ -301,6 +308,7 @@ extension YHHKVisaRenewalPaymentVC {
                         self.copyToPasteBoard(person.receipt, message: "已复制电子签证链接")
                     }))
                     self.updateSureButtonState(true)
+                    
                 case .expired:
                     paymentMembers.append(.occupyingSpace)
                     paymentMembers.append(.subHeader(person.name, .expired))
@@ -318,8 +326,6 @@ extension YHHKVisaRenewalPaymentVC {
                     paymentMembers.append(.subRemark("续签申请暂未正式获批，请耐心等待"))
                 }
             }
-                
-            }
             if let lastMember = actionMembers.last, case let.residenceAction(name, status, _, action) = lastMember {
                 actionMembers[actionMembers.count - 1] = .residenceAction(name, status, .bottom, action)
                 confirmingPresenceSection.append(contentsOf: actionMembers)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/C/YHVisaRenewalGuideVC.swift

@@ -170,11 +170,7 @@ extension YHVisaRenewalGuideVC {
             DispatchQueue.main.async {
                 countDown -= 1
                 if countDown == 0 {
-                    self.cancelTimer()
-                    self.sureButton.isEnabled = true
-                    self.sureButton.backgroundColor = .brandMainColor
-                    UserDefaults.standard.set(true, forKey: YHVisaRenewalGuideVC.showCardGuideKey)
-                    UserDefaults.standard.synchronize()
+                    self.didReadGuide()
                     return
                 }
                 self.sureButton.isEnabled = false
@@ -192,6 +188,14 @@ extension YHVisaRenewalGuideVC {
             timer = nil
         }
     }
+    
+    private func didReadGuide() {
+        cancelTimer()
+        sureButton.isEnabled = true
+        sureButton.backgroundColor = .brandMainColor
+        UserDefaults.standard.set(true, forKey: YHVisaRenewalGuideVC.showCardGuideKey)
+        UserDefaults.standard.synchronize()
+    }
 }
 
 extension YHVisaRenewalGuideVC: UITableViewDelegate, UITableViewDataSource {
@@ -240,4 +244,19 @@ extension YHVisaRenewalGuideVC: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return UITableView.automaticDimension
     }
+    
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        guard !YHVisaRenewalGuideVC.didShowGuide else {
+            return
+        }
+        let offsetY = scrollView.contentOffset.y
+        let contentHeight = scrollView.contentSize.height
+        let height = scrollView.frame.size.height
+        
+        if offsetY > contentHeight - height {
+            printLog("Reached bottom!")
+            // 在这里执行到达底部时的操作
+            didReadGuide()
+        }
+    }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/V/YHVisaRenewalPayConfirmingPresenceAlertView.swift

@@ -57,7 +57,7 @@ class YHVisaRenewalPayConfirmingPresenceAlertView: UIView {
         label.numberOfLines = 0
         let a: ASAttributedString = .init("建议入境香港后，", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
         let b: ASAttributedString = .init("远离海关，并延迟20分钟后再进行确认", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.brandMainColor))
-        let c: ASAttributedString = .init("，避免香港海关系统还未识别到已入境!", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
+        let c: ASAttributedString = .init("，避免香港海关系统还未识别到入境记录!", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
         label.attributed.text = a+b+c
         return label
     }()