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

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

@@ -158,13 +158,9 @@ class YHServiceOrderListView: YHBaseViewController {
                     alert.show()
                     
                 } else { // 已预约过直接进入赴港行程指引
-                    if var token = YHLoginManager.shared.userModel?.token {
+                    if var token = YHLoginManager.shared.userModel?.token,token.count > 5 {
                         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=\(orderId)" + "&param=" + token
+                        url = url + "?paramO=\(orderId)" + "&param=" + YHLoginManager.shared.h5Token
                         url = url + "&app_platform=ios" + "&app_version=" + UIDevice.appVersion()
                         printLog("UURL: \(url)")
                         let vc = YHH5WebViewVC()
@@ -318,18 +314,13 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                     //身份续签指引
                     printLog("身份续签指引")
                     if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
-                        printLog(param)
-                        var token : String = param
-                        
                         var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/guide/identity"
-                        let addtionString = String.randomAlphaNumericStringT(6)//随机6个字母或者数字
-                        let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
-                        token.insert(contentsOf: addtionString, at: indexToInsert)
                         //superAppBridge.html#/report/program?token=&batchID=1&order_id=151190
-                        url = url + "?param=" + token
+                        url = url + "?param=" + YHLoginManager.shared.h5Token
                         let vc = YHH5WebViewVC()
                         vc.navTitle = "身份续签指引"
                         vc.url = url
+                        vc.isFullScreenFlag = false
                         UIViewController.current?.navigationController?.pushViewController(vc)
                     }
                     
@@ -338,15 +329,9 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                     printLog("续签方案")
                     if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
                         printLog(param)
-                        var token : String = param
-                        
                         var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/report/program"
-                        let addtionString = String.randomAlphaNumericStringT(6)//随机6个字母或者数字
-                        let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
-                        token.insert(contentsOf: addtionString, at: indexToInsert)
                         //superAppBridge.html#/report/program?token=&batchID=1&order_id=151190
-
-                        url = url + "?param=" + token + "&batchID=\(stepID)" + "&order_id=\(orderID)"
+                        url = url + "?param=" + YHLoginManager.shared.h5Token + "&batchID=\(stepID)" + "&order_id=\(orderID)"
                         
                         let vc = YHH5WebViewVC()
                         vc.navTitle = "我的续签方案"

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

@@ -274,15 +274,9 @@ extension YHResignDocumentDetailViewController {
             printLog("跳转QMAS")
             if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
                 printLog(param)
-                var token : String = param
-                
                 var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/guide/qmas"
-                let addtionString = String.randomAlphaNumericStringT(6)//随机6个字母或者数字
-                let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
-                token.insert(contentsOf: addtionString, at: indexToInsert)
                 //https://test-hkdiy-h5.galaxy-immi.com/superAppBridge.html#/guide/qmas?token=xx&doc_id=xx
-
-                url = url + "?param=" + token + "&doc_id=\(model.docId)"
+                url = url + "?param=" + YHLoginManager.shared.h5Token + "&doc_id=\(model.docId)"
                 let vc = YHH5WebViewVC()
                 vc.isFullScreenFlag = false
                 vc.navTitle = "QMAS文件信息确认" //self.name

galaxy/galaxy/Classes/Modules/Login(登录)/Server/YHLoginManager.swift

@@ -23,6 +23,22 @@ class YHLoginManager: NSObject {
     var needJumpToMsgTabFlag : Bool = false
     // 是否展示了版本更新
     var isShowVersionUpdate:Bool = false
+    
+    
+    //H5 需要的token
+    var h5Token : String {
+        get {
+            if let param = self.userModel?.token,param.count > 5 {
+                printLog(param)
+                var token : String = param
+                let addtionString = String.randomAlphaNumericStringT(6)//随机6个字母或者数字
+                let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
+                token.insert(contentsOf: addtionString, at: indexToInsert)
+                return token
+            }
+            return ""
+        }
+    }
 }
 
 extension YHLoginManager {

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift

@@ -504,12 +504,9 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
                 }
                 
             } else if msg.redirectPage == YHRedirectPage.travelGuide.rawValue { // 赴港行程指引
-                if let orderId = Int(msg.orderId), var token = YHLoginManager.shared.userModel?.token {
+                if let orderId = Int(msg.orderId), var token = YHLoginManager.shared.userModel?.token,token.count > 5 {
                     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=\(orderId)" + "&param=" + token
+                    url = url + "?paramO=\(orderId)" + "&param=" + YHLoginManager.shared.h5Token
                     url = url + "&app_platform=ios" + "&app_version=" + UIDevice.appVersion()
                     printLog("UURL: \(url)")
                     let vc = YHH5WebViewVC()

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

@@ -370,13 +370,8 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
             printLog("积分中心")
             if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
                 printLog(param)
-                var token : String = param
-                
                 var url = YHBaseUrlManager.shared.curH5URL() + "superApp/integral"
-                let addtionString = String.randomAlphaNumericStringT(6)//随机6个字母或者数字
-                let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
-                token.insert(contentsOf: addtionString, at: indexToInsert)
-                url = url + "?param=" + token
+                url = url + "?param=" + YHLoginManager.shared.h5Token
                 
                 let vc = YHH5WebViewVC()
                 vc.navTitle = "积分中心"