Merge branch 'double11' into develop

* double11:
  支持 两个参数设置
  处理一处bug
  处理 bug

# Conflicts:
#	galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift
#	galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift

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

@@ -168,7 +168,7 @@ class YHServiceOrderListView: YHBaseViewController {
                     alert.show()
                     
                 } else { // 已预约过直接进入赴港行程指引
-                    if var token = YHLoginManager.shared.userModel?.token,token.count > 5 {
+                    if let token = YHLoginManager.shared.userModel?.token,token.count > 5 {
                         var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/tohkList"
                         url = url + "?paramO=\(orderId)" + "&param=" + YHLoginManager.shared.h5Token
                         url = url + "&app_platform=ios" + "&app_version=" + UIDevice.appVersion()

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift

@@ -15,7 +15,6 @@ import Photos
  快速测评 及 其他与H5交互的界面
  */
 class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
-    
     lazy var webview : DWKWebView = {
         let config = WKWebViewConfiguration()
         config.applicationNameForUserAgent = "YinHeApp"
@@ -107,9 +106,12 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     //4、是否需要重新刷新界面
     var isNeedRefreshDataFlag : Bool = false
     
-    //webView内部返回 - 默认不支持
+    //5、webView内部返回 - 默认不支持
     var isSupportWebviewInterBackFlag : Bool = false
     
+    //6、是否展示 导航栏上的title
+    var showNavigationTitleFlag : Bool = true
+    
     //默认的返回按钮图片
     private var myDefaultBackImage : UIImage = UIImage(named: "back_icon") ?? UIImage()
     
@@ -339,6 +341,10 @@ private extension YHH5WebViewVC {
             make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
         }
         updateNetWorkStatusUI(needReload: false)
+        
+        
+        //
+        hideNavigationTitleSyn("0")
     }
     
     func addRightItems() {
@@ -423,10 +429,9 @@ extension YHH5WebViewVC {
         } else if keyPath == "title" {
             if let title = self.webview.title,title.isEmpty == false {
                 self.navTitle = title
-                if !isFullScreenFlag {
+                if !isFullScreenFlag,showNavigationTitleFlag {
                     self.gk_navTitle = self.navTitle
                 }
-                
             }
         }
     }
@@ -464,7 +469,35 @@ extension YHH5WebViewVC {
 
 // MARK: - h5实现的接口
 extension YHH5WebViewVC {
-    //H5调用 App的分享
+    //20、导航栏上是否展示title
+    func hideNavigationTitleSyn(_ tag : String) {
+        if tag.contains("0") {
+            //展示
+            self.showNavigationTitleFlag = true
+        } else if tag.contains("1") {
+            //隐藏
+            self.showNavigationTitleFlag = false
+        }
+        
+        if self.showNavigationTitleFlag {
+            if isFullScreenFlag {
+                gk_navBarAlpha = 0
+                gk_navTitle = ""
+            } else {
+                gk_navBarAlpha = 1.0
+                gk_navTitle = self.navTitle
+            }
+        } else {
+            gk_navTitle = ""
+        }
+    }
+    
+    //19、返回时刷新界面
+    func reloadwebVeiwSyn() {
+        self.isNeedRefreshDataFlag = true
+    }
+    
+    //17、H5调用 App的分享
     func shareH5Syn(title : String ,desc : String ,url : String) {
         shareUrlFromOutside = url
         shareH5Title = title

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift

@@ -18,14 +18,35 @@ class YHJsApi: NSObject {
 }
 
 extension YHJsApi {
-    //18、导航栏高度 - 安卓还没实现  后续在考虑放出去
-    @objc func appNavigationHeightAsyn(_ arg:Any,handler: @escaping JSCallback) {
+    //20、导航栏上是否展示title
+    @objc func hideNavigationTitleSyn(_ tag : Any) {
         DispatchQueue.main.async {
-            let height = String(format:"%.2f", k_Height_NavigationtBarAndStatuBar)
-            handler(height, true)
+            if let tag = tag as? String, tag.count == 1 {
+                if let delegate = self.delegate as? YHH5WebViewVC {
+                    delegate.hideNavigationTitleSyn(tag)
+                }
+            }
         }
     }
     
+    //19、返回时刷新界面
+    @objc func reloadwebVeiwSyn(_ tag : Any) {
+        DispatchQueue.main.async {
+            if let tag = tag as? String, tag.count == 1 {
+                if let delegate = self.delegate as? YHH5WebViewVC {
+                    delegate.reloadwebVeiwSyn()
+                }
+            }
+        }
+    }
+//    //18、导航栏高度 - 安卓还没实现  后续在考虑放出去
+//    @objc func appNavigationHeightAsyn(_ arg:Any,handler: @escaping JSCallback) {
+//        DispatchQueue.main.async {
+//            let height = String(format:"%.2f", k_Height_NavigationtBarAndStatuBar)
+//            handler(height, true)
+//        }
+//    }
+    
     //17、 H5调用app的分享
     @objc func shareH5Syn(_ dicData: String) {
         DispatchQueue.main.async {
@@ -161,7 +182,6 @@ extension YHJsApi {
                         // 转换成功，jsonObject 是一个字典
                         print("JSON字符串转换为字典成功: \(jsonObject)")
                         /*
-                         
                          {
                          id:1,
                          name:"教学升学",