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

@@ -12,7 +12,8 @@ import JXSegmentedView
 class YHServiceOrderListView: YHBaseViewController {
     private let viewModel : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
     let principleViewModel: YHPrincleViewModel = YHPrincleViewModel()
-    
+    let appointViewModel = YHCerAppointViewModel()
+
     typealias Block = (Int,Int,Bool) -> ()
     var block: Block?
     var orderID: Int = 0
@@ -263,7 +264,45 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                 self.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
+                    }
+                    
+                    if isNeedAppoint {
+                        //预约弹窗
+                        let alert = YHDisappointHKAlertView.alertView()
+                        alert.confirmBlock = {
+                            let vc = YHCertificateAppointViewController()
+                            vc.orderId = self.orderID
+                            self.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
+                            
+                            let vc = YHH5WebViewVC()
+                            vc.url = url
+                            self.navigationController?.pushViewController(vc)
+                        }
+                    }
+                }
+                
             } else if model.type == 26 {
                 //旅行证件准备
                 let vc = YHTravelDocsPreparationListViewController()

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

@@ -514,12 +514,6 @@ extension YHPrincipleUploadListVC: UITableViewDelegate, UITableViewDataSource {
         return view
     }
     
-    func randomAlphaNumericString(_ length: Int) -> String {
-        let letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-        let randomString = (0..<length).map{ _ in String(letters.randomElement()!) }.reduce("", +)
-        return randomString
-    }
-    
     func showPreviewAndMailList(_ model: YHPrincipleAgreementModel) {
         
         //弹窗 选择发送邮箱

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -368,7 +368,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
                 var token : String = param
                 
                 var url = YHBaseUrlManager.shared.curH5URL() + "superApp/integral"
-                let addtionString = randomAlphanumericString(6)//随机6个字母或者数字
+                let addtionString = String.randomAlphaNumericStringT(6)//随机6个字母或者数字
                 let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
                 token.insert(contentsOf: addtionString, at: indexToInsert)
                 url = url + "?param=" + token
@@ -423,12 +423,6 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
 
 extension YHMyViewController {
     
-    func randomAlphanumericString(_ length: Int) -> String {
-        let letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-        let randomString = (0..<length).map{ _ in String(letters.randomElement()!) }.reduce("", +)
-        return randomString
-    }
-    
     @objc func loginSuccess() {
         printLog("登录成功，进行相应的 UI刷新操作")
         updateUserUI()

galaxy/galaxy/Classes/Tools/Extention/String+Extension.swift

@@ -19,6 +19,12 @@ func isEmptyString(_ string: String?) -> Bool {
 
 extension String {
     
+    static func randomAlphaNumericStringT(_ length: Int) -> String {
+        let letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+        let randomString = (0..<length).map{ _ in String(letters.randomElement()!) }.reduce("", +)
+        return randomString
+    }
+    
     /// JSONString转换为字典
     func toDictionary() -> Dictionary<String, Any> {
         guard let jsonData:Data = data(using: .utf8) else { return [String:Any]() }