几处 代码优化

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

@@ -39,14 +39,9 @@ class YHHKEventWebViewController: YHBaseViewController {
 extension YHHKEventWebViewController {
     func loadData() {
         guard let urlString = model.list.first else { return }
-//        let url = NSURL(string: urlString)
-//        // 创建请求
-//        let request = NSURLRequest(url: url! as URL)
-//        // 加载请求
-//        self.webview.load(request as URLRequest)
         if let url = URL(string: urlString) {
-            let request = NSURLRequest(url: url)
-            webview.load(request as URLRequest)
+            let request = URLRequest(url: url)
+            webview.load(request)
         } else {
             let tmpUrl = YHURLEncodeHelper.urlEncodedString(urlString)
             if let url = URL(string: tmpUrl) {

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

@@ -347,12 +347,12 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
             if YHNetworkStatusManager.shared.isNetWorkOK {
                 if needReload && self.isNetWorkOkBefore == false {
                     self.webview.stopLoading()
-                    let targetUrl = NSURL(string: self.url)
-                    let request = NSURLRequest(url: targetUrl! as URL)
-                    self.webview.load(request as URLRequest)
+                    if let targetUrl = URL(string: self.url) {
+                        let request = URLRequest(url: targetUrl)
+                        self.webview.load(request)
+                    }
                     self.getData()
                 }
-                
                 self.isNetWorkOkBefore = true
             }
             

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

@@ -102,14 +102,6 @@ private extension YHStatusAdvantageVC {
     }
     
     func reloadWebUrl() {
-//        let url = NSURL(string: url)
-//        // 创建请求
-//        let request = NSURLRequest(url: url! as URL)
-        
-        // 加载请求
-//        webview.load(request as URLRequest)
-        
-        
         if let url = URL(string: url) {
             let request = URLRequest(url: url)
             webview.load(request)
@@ -230,11 +222,11 @@ private extension YHStatusAdvantageVC {
             if YHNetworkStatusManager.shared.isNetWorkOK {
                 if needReload && self.isNetWorkOkBefore == false {
                     self.webview.stopLoading()
-                    let targetUrl = NSURL(string: self.url)
-                    let request = NSURLRequest(url: targetUrl! as URL)
-                    self.webview.load(request as URLRequest)
+                    if let targetUrl = URL(string: self.url) {
+                        let request = URLRequest(url: targetUrl)
+                        self.webview.load(request)
+                    }
                 }
-                
                 self.isNetWorkOkBefore = true
             }
             

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

@@ -133,29 +133,31 @@ private extension YHH5WebViewVC {
                     tUrl = url + "&param=" + token
                 }
                 
-                if let url = NSURL(string: tUrl) as? URL {
-                    let request = NSURLRequest(url: url)
-                    webview.load(request as URLRequest)
+                if let url = URL(string: tUrl) {
+                    let request = URLRequest(url: url)
+                    webview.load(request)
                 }
                 return
             } else {
-                printLog("理论上不存在的情况,暂时不处理")
+                //H5 发现token失效后重新刷新的场景
+                
+                
             }
         }
         
         
         //最后兜底 刷新
-        if let url = NSURL(string: url) as? URL {
-            let request = NSURLRequest(url: url)
-            webview.load(request as URLRequest)
+        if let url = URL(string: url) {
+            let request = URLRequest(url: url)
+            webview.load(request)
         }
     }
     
     func reloadUI() {
         if isNeedRefreshDataFlag {
-            if let url = NSURL(string: url) as? URL {
-                let request = NSURLRequest(url: url)
-                webview.load(request as URLRequest)
+            if let url = URL(string: url){
+                let request = URLRequest(url: url)
+                webview.load(request)
             }
         }
     }
@@ -286,9 +288,10 @@ private extension YHH5WebViewVC {
             if YHNetworkStatusManager.shared.isNetWorkOK {
                 if needReload && self.isNetWorkOkBefore == false {
                     self.webview.stopLoading()
-                    let targetUrl = NSURL(string: self.url)
-                    let request = NSURLRequest(url: targetUrl! as URL)
-                    self.webview.load(request as URLRequest)
+                    if let targetUrl = URL(string: self.url) {
+                        let request = URLRequest(url: targetUrl)
+                        self.webview.load(request)
+                    }
                 }
                 
                 self.isNetWorkOkBefore = true

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

@@ -27,14 +27,7 @@ class YHWebViewViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         
         // 创建wkwebview
         webview = WKWebView(frame: CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - k_Height_NavigationtBarAndStatuBar))
-                
         webview.navigationDelegate = self
-//        // 创建网址
-//        let url = NSURL(string: url)
-//        // 创建请求
-//        let request = NSURLRequest(url: url! as URL)
-//        // 加载请求
-//        webview.load(request as URLRequest)
         
         if let url = URL(string: url) {
             let request = URLRequest(url: url)