非 通屏

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift

@@ -388,21 +388,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         printLog("\(error.localizedDescription)")
     }
 
-    
-    // MARK: - webview function
-    
-    @objc func toBack() {
-        if webview.canGoBack {
-            webview.goBack()
-        }
-    }
-    
-    @objc func toForward() {
-        if webview.canGoForward {
-            webview.goForward()
-        }
-    }
-    
     // MARK: - KVO
     override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
         if keyPath == "estimatedProgress" {

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStatusAdvantageVC.swift

@@ -231,18 +231,6 @@ private extension YHStatusAdvantageVC {
             }
         }
     }
-    
-    @objc func toBack() {
-        if webview.canGoBack {
-            webview.goBack()
-        }
-    }
-    
-    @objc func toForward() {
-        if webview.canGoForward {
-            webview.goForward()
-        }
-    }
 }
 
 

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

@@ -127,9 +127,11 @@ private extension YHH5WebViewVC {
         gk_navLineHidden = false
         gk_navBackgroundColor = .white
         
-        gk_navTitle = navTitle
+        
         if isFullScreenFlag {
             gk_navBarAlpha = 0.0
+        } else {
+            gk_navTitle = navTitle
         }
                 
         NotificationCenter.default.addObserver(self, selector: #selector(updateNetWorkUI), name: .reachabilityChanged, object: nil)
@@ -139,20 +141,17 @@ private extension YHH5WebViewVC {
         if isWithBottomViewFlag {
             loadQrInfo()
             view.addSubview(shareView)
-        }
-        
-        
-        
-        shareView.block = { tag in
-            if tag == 0 {
-                //分享
-                self.share()
-            } else {
-                //预约咨询
-                if self.arrQrInfo.count > 1 {
-                    let codeUrl = self.arrQrInfo[0]
-                    let downloadUrl = self.arrQrInfo[1]
-                    YHConsultantQRCodeView.codeView(codeUrl, downloadUrl: downloadUrl).show()
+            shareView.block = { tag in
+                if tag == 0 {
+                    //分享
+                    self.share()
+                } else {
+                    //预约咨询
+                    if self.arrQrInfo.count > 1 {
+                        let codeUrl = self.arrQrInfo[0]
+                        let downloadUrl = self.arrQrInfo[1]
+                        YHConsultantQRCodeView.codeView(codeUrl, downloadUrl: downloadUrl).show()
+                    }
                 }
             }
         }
@@ -273,19 +272,6 @@ private extension YHH5WebViewVC {
             }
         }
     }
-    
-    // MARK: - webview function
-    @objc func toBack() {
-        if webview.canGoBack {
-            webview.goBack()
-        }
-    }
-    
-    @objc func toForward() {
-        if webview.canGoForward {
-            webview.goForward()
-        }
-    }
 }
 
 
@@ -297,6 +283,11 @@ extension YHH5WebViewVC {
             progBar.setProgress(Float(webview.estimatedProgress), animated: true)
             //进度条的值最大为1.0
             if(self.webview.estimatedProgress >= 1.0) {
+                if isFullScreenFlag {
+                    gk_navBarAlpha = 0.0
+                    gk_navTitle = ""
+                }
+                
                 UIView.animate(withDuration: 0.3, delay: 0.1, options: .curveEaseInOut, animations: { () -> Void in
                     self.progBar.alpha = 0.0
                 }, completion: { (finished:Bool) -> Void in
@@ -377,21 +368,22 @@ extension YHH5WebViewVC {
     }
 }
 
-
-
 //MARK: - UIScrollViewDelegate
 extension YHH5WebViewVC : UIScrollViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        if scrollView.contentOffset.y > 0 {
-            var alpha =  scrollView.contentOffset.y / (k_Height_NavigationtBarAndStatuBar)
-            if alpha > 1.0 {
-                alpha = 1.0
+        
+        if isFullScreenFlag,scrollView == webview.scrollView {
+            if scrollView.contentOffset.y > 0 {
+                var alpha =  scrollView.contentOffset.y / (k_Height_NavigationtBarAndStatuBar)
+                if alpha > 1.0 {
+                    alpha = 1.0
+                }
+                gk_navBarAlpha = alpha
+                gk_navTitle = navTitle
+            } else {
+                gk_navBarAlpha = 0.0
+                gk_navTitle = ""
             }
-            gk_navBarAlpha = alpha
-            gk_navTitle = navTitle
-        } else {
-            gk_navBarAlpha = 0.0
-            gk_navTitle = ""
         }
     }
 }

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHWebViewViewController.swift

@@ -80,20 +80,6 @@ class YHWebViewViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         self.present(alert, animated: true, completion: nil)
     }
     
-    // MARK: - webview function
-    
-    @objc func toBack() {
-        if webview.canGoBack {
-            webview.goBack()
-        }
-    }
-     
-    @objc func toForward() {
-        if webview.canGoForward {
-            webview.goForward()
-        }
-    }
-    
     // MARK: - KVO
 
     override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {

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

@@ -381,7 +381,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
                 let vc = YHH5WebViewVC()
                 vc.navTitle = "积分中心"
                 vc.url = url
-                vc.isSupportWebviewInterBackFlag = true
+//                vc.isSupportWebviewInterBackFlag = true
                 self.navigationController?.pushViewController(vc)
             }
         case .myTestCode://我的测评码