Browse Source

1.修改基础库

wenweiwei 3 years ago
parent
commit
4a0ca0d9a0
1 changed files with 22 additions and 17 deletions
  1. 22 17
      BFCommonKit/Classes/BFBase/Controller/PQBaseWebViewController.swift

+ 22 - 17
BFCommonKit/Classes/BFBase/Controller/PQBaseWebViewController.swift

@@ -99,7 +99,7 @@ open class PQBaseWebViewController: PQBaseViewController {
         // Do any additional setup after loading the view.
         view.addSubview(webView)
         view.addSubview(emptyRemindView)
-        leftButton(imageName:"icon_blanc_back")
+        leftButton(imageName: "icon_blanc_back")
         backButton?.tintColor = UIColor.black
         backButton?.setImage(UIImage(named: "icon_blanc_back")?.withRenderingMode(.alwaysTemplate), for: .normal)
         navHeadImageView?.backgroundColor = UIColor.white
@@ -183,12 +183,13 @@ extension PQBaseWebViewController: WKNavigationDelegate {
     }
 
     public func webView(_ webView: WKWebView, didFinish _: WKNavigation!) {
-        if baseTitle == nil || baseTitle?.count ?? 0 <= 0 {
-            webView.evaluateJavaScript("document.title") { [weak self] (any, _) -> Void in
-                self?.setTitle(title: any as? String,color: UIColor.black)
-                self?.baseTitle = any as? String
-            }
+        debugPrint("webView回调-didFinish")
+//        if baseTitle == nil || baseTitle?.count ?? 0 <= 0 {
+        webView.evaluateJavaScript("document.title") { [weak self] (any, _) -> Void in
+            self?.setTitle(title: any as? String, color: UIColor.black)
+            self?.baseTitle = any as? String
         }
+//        }
         if evaluateJavaScript != nil, (evaluateJavaScript?.count ?? 0) > 0 {
             webView.evaluateJavaScript(evaluateJavaScript!) { _, _ in
             }
@@ -199,40 +200,44 @@ extension PQBaseWebViewController: WKNavigationDelegate {
     }
 
     public func webView(_ webView: WKWebView, didFail _: WKNavigation!, withError error: Error) {
-        BFLog(message: "webView回调-didFailProvisionalNavigation -error:\(error)")
-        if baseTitle == nil || baseTitle?.count ?? 0 <= 0 {
-            webView.evaluateJavaScript("document.title") { [weak self] (any, _) -> Void in
-                self?.setTitle(title: any as? String,color: UIColor.black)
-                self?.baseTitle = any as? String
-            }
+        debugPrint("webView回调-didFailProvisionalNavigation -error:\(error)")
+//        if baseTitle == nil || baseTitle?.count ?? 0 <= 0 {
+        webView.evaluateJavaScript("document.title") { [weak self] (any, _) -> Void in
+            self?.setTitle(title: any as? String, color: UIColor.black)
+            self?.baseTitle = any as? String
         }
+//        }
         if emptyRemindView.isHidden {
             emptyRemindView.isHidden = false
         }
     }
 
     public func webView(_: WKWebView, didFailProvisionalNavigation _: WKNavigation!, withError error: Error) {
-        BFLog(message: "webView回调-didFailProvisionalNavigation -error:\(error)")
+        debugPrint("webView回调-didFailProvisionalNavigation -error:\(error)")
 //        if emptyRemindView.isHidden {
 //            emptyRemindView.isHidden = false
 //        }
     }
 
     public func webView(_: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse, decisionHandler: @escaping (WKNavigationResponsePolicy) -> Void) {
-        BFLog(message: "navigationResponse:\(String(describing: navigationResponse))")
+        debugPrint("navigationResponse:\(String(describing: navigationResponse))")
+        webView.evaluateJavaScript("document.title") { [weak self] (any, _) -> Void in
+            self?.setTitle(title: any as? String, color: UIColor.black)
+            self?.baseTitle = any as? String
+        }
         decisionHandler(.allow)
     }
 
     public func webView(_: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
-        BFLog(message: "didStartProvisionalNavigation:\(String(describing: navigation))")
+        debugPrint("didStartProvisionalNavigation:\(String(describing: navigation))")
     }
 
     public func webView(_: WKWebView, didReceiveServerRedirectForProvisionalNavigation navigation: WKNavigation!) {
-        BFLog(message: "didReceiveServerRedirectForProvisionalNavigation:\(String(describing: navigation))")
+        debugPrint("didReceiveServerRedirectForProvisionalNavigation:\(String(describing: navigation))")
     }
 
     public func webView(_: WKWebView, didCommit navigation: WKNavigation!) {
-        BFLog(message: "\(String(describing: navigation))")
+        debugPrint("\(String(describing: navigation))")
     }
 
     public func webView(_: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {