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:
  //  设置按钮热区
  续签文书管理按钮事件调整
  删除代码

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -417,131 +417,6 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
             } else if model.type == 4 { // 方案
                 //我的方案
                 handleRedPointFor(key: kMyPlanRedPointInfoKey, model: model)
-                let vc = YHMineSchemeViewController()
-                UIViewController.current?.navigationController?.pushViewController(vc)
-                
-            } else if model.type == 5 {
-                //我的签字
-                let vc = YHMySignatureListViewController()
-                vc.orderId = orderID
-                UIViewController.current?.navigationController?.pushViewController(vc)
-                
-            } else if model.type == 6 {
-                //我的文书
-                let vc = YHMyDocumentsListViewController()
-                vc.orderId = orderID
-                UIViewController.current?.navigationController?.pushViewController(vc)
-                
-            } else if model.type == 11 || model.type == 12 || model.type == 14  {
-                
-                // 11 原则批等待结果
-                // 12 原则批待补件
-                // 14 原则批未获批准
-                
-                let vc = YHPrincipleWaitResultViewController()
-                vc.status = model.type
-                vc.orderId = orderID
-                UIViewController.current?.navigationController?.pushViewController(vc)
-                
-            } else if model.type == 13 { 
-                //原则批已获批~
-                let vc = YHPrincipleApprovedResultVC()
-                vc.orderId = orderID
-                UIViewController.current?.navigationController?.pushViewController(vc)
-                
-            } else if model.type == 15 {
-                //正式批已获批~
-                let vc = YHOfficialApprovalResultVC()
-                UIViewController.current?.navigationController?.pushViewController(vc)
-            } else if model.type == 21 {
-                //新增受养人
-                let vc = YHAddAdoptersViewController()
-                vc.orderId = orderID
-                UIViewController.current?.navigationController?.pushViewController(vc)
-            } else if model.type == 22 {
-                //家庭信息确认
-                let vc = YHFamilyInfoConfirmViewController()
-                vc.orderId = orderID
-                UIViewController.current?.navigationController?.pushViewController(vc)
-            } else if model.type == 23 {
-                //电子签字缴费
-                let vc = YHVisaPaymentVC()
-                vc.orderID = orderID
-                UIViewController.current?.navigationController?.pushViewController(vc)
-            } else if model.type == 24 {
-                //赴港时间预约
-                let vc = YHCertificateAppointViewController()
-                vc.orderId = orderID
-                UIViewController.current?.navigationController?.pushViewController(vc)
-                
-            } else if model.type == 25 {
-                // 赴港行程指引
-                YHHUD.show(.progress(message: "加载中..."))
-                appointViewModel.getIsNeedGoToHK(orderId: orderID) {
-                    // needGoHK 1需要赴港 0不需要 2没有选择
-                    // reservationToHK 0 没有预约 1 已经预約
-                    [weak self] needGoHK, reservationToHK in
-                    YHHUD.hide()
-                    guard let self = self else { return }
-            
-                    var isNeedAppoint = true
-                    if needGoHK == 1, reservationToHK == 1 { // 选择赴港且已预约
-                        isNeedAppoint = false
-                    } else if needGoHK == 0  { // 赴港选择否
-                        isNeedAppoint = false
-                    }
-                    
-                    if isNeedAppoint {
-                        //预约弹窗
-                        let alert = YHDisappointHKAlertView.alertView()
-                        alert.confirmBlock = {
-                            let vc = YHCertificateAppointViewController()
-                            vc.orderId = self.orderID
-                            UIViewController.current?.navigationController?.pushViewController(vc)
-                        }
-                        alert.show()
-                        
-                    } else { // 已预约过直接进入赴港行程指引
-                        if var token = YHLoginManager.shared.userModel?.token {
-                            var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/tohkList"
-                        
-                            let addtionString = String.randomAlphaNumericStringT(6)//随机6个字母或者数字
-                            let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
-                            token.insert(contentsOf: addtionString, at: indexToInsert)
-                            url = url + "?paramO=\(self.orderID)" + "&param=" + token
-                            url = url + "&app_platform=ios" + "&app_version=" + UIDevice.appVersion()
-                            printLog("UURL: \(url)")
-                            let vc = YHH5WebViewVC()
-                            vc.url = url
-                            vc.isFullScreenFlag = false
-                            vc.navTitle = "赴港行程指引"
-                            vc.isNeedRefreshDataFlag = true
-                            UIViewController.current?.navigationController?.pushViewController(vc)
-                        }
-                    }
-                }
-                
-            } else if model.type == 26 {
-                //旅行证件准备
-                let vc = YHTravelDocsPreparationListViewController()
-                vc.orderId = orderID
-                UIViewController.current?.navigationController?.pushViewController(vc)
-            } else if model.type == 27 {
-                //上传过关证件
-                let vc = YHUploadCertificateVC()
-                vc.orderId = orderID
-                UIViewController.current?.navigationController?.pushViewController(vc)
-            } else if model.type == 31 {
-                //续签资料管理
-                let vc = YHResinMaterialManageContainerVC()
-                vc.orderId = orderID
-                vc.batchId = stepID
-                UIViewController.current?.navigationController?.pushViewController(vc)
-
-            } else if model.type == 32 {
-                //续签文书管理
-                let vc = YHResignDocumentManagementVC(orderId: orderID, id: stepID)
-                UIViewController.current?.navigationController?.pushViewController(vc)
             }
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/C/YHResignDocumentDetailViewController.swift

@@ -247,7 +247,7 @@ extension YHResignDocumentDetailViewController {
                 return
             }
             YHHUD.show(.progress(message: "加载中..."))
-            self.viewModel.getResginDocumentUrl(docId: model.docId, isEditable: false) { [weak self] model, error in
+            self.viewModel.previewResginDocument(docId: model.docId) { [weak self] model, error in
                 guard let self = self else {
                     return
                 }
@@ -270,14 +270,6 @@ extension YHResignDocumentDetailViewController {
             guard let self = self else {
                 return
             }
-//            let vc = YHH5WebViewVC()
-//            vc.navTitle = self.name
-//            // TODO: - Alex等链接下来再赋值
-//            //vc.url = url
-//            vc.isFullScreenFlag = false
-//            self.navigationController?.pushViewController(vc)
-//            printLog("###infoConfirmationEvent")
-            
             
             printLog("跳转QMAS")
             if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
@@ -292,9 +284,10 @@ extension YHResignDocumentDetailViewController {
 
                 url = url + "?param=" + token + "&doc_id=\(model.docId)"
                 let vc = YHH5WebViewVC()
-                vc.navTitle = ""
+                vc.isFullScreenFlag = false
+                vc.navTitle = "QMAS文件信息确认" //self.name
                 vc.url = url
-                UIViewController.current?.navigationController?.pushViewController(vc)
+                self.navigationController?.pushViewController(vc)
             }
         }
         

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserInfoHeaderView.swift

@@ -158,6 +158,7 @@ class YHUserInfoHeaderView: UIView {
     private lazy var settingBtn: UIButton = {
         let btn = UIButton()
         btn.setImage(UIImage(named: "mine_btn_setting"), for: .normal)
+        btn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
         btn.addTarget(self, action: #selector(didClickSettingBtn(btn:)), for: .touchUpInside)
         return btn
     }()