bbbb

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

@@ -11,8 +11,8 @@ import Photos
 import WebKit
 import JXSegmentedView
 
-class YHHKEventWebViewController: YHBaseViewController {
-    var webview = WKWebView()
+class YHHKEventWebViewController: YHH5WebViewVC {
+//    var webview = WKWebView()
     var model: YHHKEventModel = YHHKEventModel()
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -66,13 +66,15 @@ extension YHHKEventWebViewController {
     
     func setupUI() {
         gk_navigationBar.isHidden = true
-        
+        gk_navBarAlpha = 0.0
+        gk_navLineHidden = false
+        gk_navBackgroundColor = .white
         // 创建wkwebview
-        webview = WKWebView(frame: CGRect(x: 0, y: 0, width: self.view.frame.width, height: self.view.frame.height - 0))
-        webview.navigationDelegate = self
-        // 添加wkwebview
-        view.addSubview(webview)
-        
+//        webview = WKWebView(frame: CGRect(x: 0, y: 0, width: self.view.frame.width, height: self.view.frame.height - 0))
+//        webview.navigationDelegate = self
+//        // 添加wkwebview
+//        view.addSubview(webview)
+        webview.frame = CGRect(x: 0, y: 0, width: self.view.frame.width, height: self.view.frame.height - 0)
         view.addSubview(bottomViewForSavePic)
         bottomViewForSavePic.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
@@ -82,10 +84,15 @@ extension YHHKEventWebViewController {
             self.saveImageToPhotoLib()
         }
     }
+    
+    deinit {
+        
+    }
 }
 
-extension YHHKEventWebViewController: WKNavigationDelegate {
-    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+extension YHHKEventWebViewController {
+    override func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        super.webView(webView, didFinish: navigation)
         if model.tag.contains("日历") {
             bottomViewForSavePic.isHidden = false
         }

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

@@ -91,6 +91,7 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
     deinit {
         webview.removeObserver(self, forKeyPath: "estimatedProgress")
         webview.removeObserver(self, forKeyPath: "title")
+        webview.navigationDelegate = nil
         NotificationCenter.default.removeObserver(self)
     }
     
@@ -481,6 +482,7 @@ private extension YHH5WebViewVC {
         let dict = ["height": "\(0)"]
         webview.callHandler("onKeyboardHeightChanged", arguments: [dict])
     }
+    
 }
 
 // MARK: - WKNavigationDelegate

galaxy/galaxy/Classes/Tools/Analytics/YHAnalytics.swift

@@ -17,7 +17,7 @@ class YHAnalytics {
 #if DEBUG
         let options = SAConfigOptions.init(serverURL: YhConstant.SensorsAnalytics.urlForTest, launchOptions: launchOptions)
         // 开启log
-        options.enableLog = false
+        options.enableLog = true
         SensorsAnalyticsSDK.sharedInstance()?.set(["evn": "test"])
 #elseif TESTENV
         let options = SAConfigOptions.init(serverURL: YhConstant.SensorsAnalytics.urlForTest, launchOptions: launchOptions)