webH5 的优化

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

@@ -298,6 +298,9 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                             printLog("UURL: \(url)")
                             let vc = YHH5WebViewVC()
                             vc.url = url
+                            vc.isFullScreenFlag = false
+                            vc.navTitle = "赴港行程指引"
+                            vc.isNeedRefreshDataFlag = true
                             self.navigationController?.pushViewController(vc)
                         }
                     }

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

@@ -32,16 +32,27 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     //是否曾今有过网络
     private var isNetWorkOkBefore : Bool = false
     
+    //是否需要重新刷新界面
+    var isNeedRefreshDataFlag : Bool = false
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        reloadUI()
+    }
+    
     deinit {
         webview.removeObserver(self, forKeyPath: "estimatedProgress")
         NotificationCenter.default.removeObserver(self)
     }
     
+    //是否通屏展示- 默认通屏(导航栏透明)
+    var isFullScreenFlag : Bool = true
+    
     //右上角分享按钮
     var isShowRightShareItemFlag : Bool = false
     
@@ -74,6 +85,14 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
 // MARK: - 内部方法
 private extension YHH5WebViewVC {
     
+    func reloadUI() {
+        if isNeedRefreshDataFlag {
+            let url = NSURL(string: url)
+            let request = NSURLRequest(url: url! as URL)
+            webview.load(request as URLRequest)
+        }
+    }
+    
     func loadQrInfo() {
         let params : [String : Int] = ["pid[0]" : 16]
         viewModel.getHKEvent(param: params) { success, error in
@@ -141,16 +160,39 @@ private extension YHH5WebViewVC {
                 make.height.equalTo(YHShareViewOnTablebarView.viewH)
             }
             
-            webview.snp.makeConstraints { make in
-                make.top.left.right.equalToSuperview()
-                make.bottom.equalTo(shareView.snp.top)
+            if isFullScreenFlag {
+                webview.snp.makeConstraints { make in
+                    make.top.left.right.equalToSuperview()
+                    make.bottom.equalTo(shareView.snp.top)
+                }
+            } else {
+                webview.snp.makeConstraints { make in
+                    make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+                    make.left.right.equalToSuperview()
+                    make.bottom.equalTo(shareView.snp.top)
+                }
             }
         } else {
-            webview.snp.makeConstraints { make in
-                make.edges.equalToSuperview()
+            
+            
+            if isFullScreenFlag {
+                webview.snp.makeConstraints { make in
+                    make.edges.equalToSuperview()
+                }
+            } else {
+                webview.snp.makeConstraints { make in
+                    make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+                    make.left.right.bottom.equalToSuperview()
+                }
+                
             }
         }
         
+        gk_navTitle = navTitle
+        if isFullScreenFlag {
+            gk_navBarAlpha = 1.0
+        }
+        
         // 加载网页的进度条
         progBar = UIProgressView(frame: CGRect(x: 0, y: 0, width: self.view.frame.width, height: 30))
         progBar.progress = 0.0