几处 代码优化

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift

@@ -135,17 +135,26 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
         if model.skip_url.isEmpty == false {
             switch model.skip_type {
             case 1: //跳转H5
-                let token = YHLoginManager.shared.h5Token
-                var url = model.skip_url + "?param=" + token
-                let urlHasParam = String.hasQueryParameters(urlString: model.skip_url)
-                if urlHasParam {
-                    url = model.skip_url + "&param=" + token
+//                var url = "http://192.168.23.66:10300/superAppBridge.html#/schoolEvaluation"//建明的本机IP
+                if YHLoginManager.shared.isLogin() {
+                    let token = YHLoginManager.shared.h5Token
+                    var url = model.skip_url + "?param=" + token
+                    let urlHasParam = String.hasQueryParameters(urlString: model.skip_url)
+                    if urlHasParam {
+                        url = model.skip_url + "&param=" + token
+                    }
+                    let vc = YHH5WebViewVC()
+                    vc.url = url
+                    vc.isFullScreenFlag = false
+                    self.parentViewController?.navigationController?.pushViewController(vc)
+                    
+                } else {
+                    let vc = YHH5WebViewVC()
+                    vc.url = model.skip_url
+                    vc.isFullScreenFlag = false
+                    self.parentViewController?.navigationController?.pushViewController(vc)
                 }
-                printLog("url: \(url)")
-                let vc = YHH5WebViewVC()
-                vc.url = url
-                vc.isFullScreenFlag = false
-                self.parentViewController?.navigationController?.pushViewController(vc)
+                
             case 2: //跳转APP内Tab
                 goAppTab(tabBarName:model.skip_url)
             case 3://3-跳转资讯页

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

@@ -17,22 +17,12 @@ import Photos
 class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     
     lazy var webview : DWKWebView = {
-//        let userContentController = WKUserContentController()
-//        let config = WKWebViewConfiguration()
-//        config.userContentController = userContentController
-//
-//        // 设置localStorage
-//        let appInfo = "{\"token\": \"a1cd4a59-974f-44ab-b264-46400f26c849\", \"userId\": \"89\"}"
-//        let jsString = "localStorage.setItem('userContent', '\(appInfo)');"
-//        let script = WKUserScript(source: jsString, injectionTime: .atDocumentStart, forMainFrameOnly: true)
-//        userContentController.addUserScript(script)
-        
-//        let webview = DWKWebView(frame: .zero,configuration: config)
         let webview = DWKWebView(frame: .zero)
         webview.scrollView.contentInsetAdjustmentBehavior = .never
         webview.navigationDelegate = self
         webview.scrollView.delegate = self
         webview.setDebugMode(false)
+        webview.uiDelegate = self
         return webview
     }()
     
@@ -71,13 +61,11 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     
     deinit {
         webview.removeObserver(self, forKeyPath: "estimatedProgress")
+        webview.removeObserver(self, forKeyPath: "title")
         NotificationCenter.default.removeObserver(self)
     }
     
     
-    
-   
-    
     //分享到H5或者小程序
     var isShareToMiniProgramFlag : Bool = false //是否分享到小程序 默认分享到h5
     var shareMiniPath : String? //分享到小程序时的 path
@@ -210,44 +198,21 @@ private extension YHH5WebViewVC {
         webview.load(request as URLRequest)
         view.addSubview(webview)
         
-//        if isWithBottomViewFlag {
-//            view.addSubview(shareView)
-//            shareView.snp.makeConstraints { make in
-//                make.bottom.left.right.equalToSuperview()
-//                make.height.equalTo(YHShareViewOnTablebarView.viewH)
-//            }
-//            
-//            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 {
-            
-            
-            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()
-                }
-                
+        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()
+            }
+        }
         webview.addSubview(progBar)
         
         // 监听网页加载的进度
         webview.addObserver(self, forKeyPath: "estimatedProgress", options: .new, context: nil)
+        webview.addObserver(self, forKeyPath: "title", options: .new, context: nil)
         
         view.addSubview(noNetWorkTipsView)
         self.noNetWorkTipsView.snp.makeConstraints { make in
@@ -325,6 +290,11 @@ extension YHH5WebViewVC {
                     self.progBar.progress = 0
                 })
             }
+        } else if keyPath == "title" {
+            if let title = self.webview.title,title.isEmpty == false {
+                self.navTitle = title
+                self.gk_navTitle = self.navTitle
+            }
         }
     }
     
@@ -332,15 +302,9 @@ extension YHH5WebViewVC {
     }
     
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-        if isShowRightShareItemFlag {
-            addRightItems()
-        }
-        
-        if let title = webview.title,title.isEmpty == false {
-            navTitle = title
-            gk_navTitle = navTitle
+        if self.isShowRightShareItemFlag {
+            self.addRightItems()
         }
-       
     }
     
     func webView(_ webView: WKWebView, createWebViewWith configuration: WKWebViewConfiguration, for navigationAction: WKNavigationAction, windowFeatures: WKWindowFeatures) -> WKWebView? {