Commit 0efc1856 authored by pete谢兆麟's avatar pete谢兆麟

事件问题

parent e3c30884
...@@ -75,18 +75,18 @@ class YHHKEventCenterViewController: YHBaseViewController { ...@@ -75,18 +75,18 @@ class YHHKEventCenterViewController: YHBaseViewController {
gk_navTitle = "香港办事" gk_navTitle = "香港办事"
gk_navBackgroundColor = .white gk_navBackgroundColor = .white
gk_navBarAlpha = 1.0 gk_navBarAlpha = 1.0
homeViewModel.getHKEvent {[weak self] _, _ in homeViewModel.getHKEvent { _, _ in
guard let self = self else { return } // guard let self = self else { return }
self.hkList = self.homeViewModel.hkList ?? [] self.hkList = self.homeViewModel.hkList ?? []
self.arrItemTitles.removeAll() self.arrItemTitles.removeAll()
for item in self.hkList { for item in self.hkList {
self.arrItemTitles.append(item.tag) self.arrItemTitles.append(item.tag)
let vc = YHHKEventWebViewController() let vc = YHHKEventWebViewController()
vc.model = item vc.model = item
arrItemVCs.append(vc) self.arrItemVCs.append(vc)
} }
self.segmentedDataSource.titles = arrItemTitles self.segmentedDataSource.titles = self.arrItemTitles
self.segmentedView.dataSource = segmentedDataSource self.segmentedView.dataSource = self.segmentedDataSource
self.segmentedView.reloadData() self.segmentedView.reloadData()
} }
} }
...@@ -159,6 +159,10 @@ class YHHKEventCenterViewController: YHBaseViewController { ...@@ -159,6 +159,10 @@ class YHHKEventCenterViewController: YHBaseViewController {
YHOneKeyLoginManager.shared.oneKeyLogin() YHOneKeyLoginManager.shared.oneKeyLogin()
} }
} }
deinit {
}
} }
extension YHHKEventCenterViewController: JXSegmentedViewDelegate { extension YHHKEventCenterViewController: JXSegmentedViewDelegate {
......
...@@ -85,9 +85,6 @@ extension YHHKEventWebViewController { ...@@ -85,9 +85,6 @@ extension YHHKEventWebViewController {
} }
} }
deinit {
}
} }
extension YHHKEventWebViewController { extension YHHKEventWebViewController {
......
...@@ -39,17 +39,15 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate { ...@@ -39,17 +39,15 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
config.mediaTypesRequiringUserActionForPlayback = [] config.mediaTypesRequiringUserActionForPlayback = []
let webview = DWKWebView(frame: .zero, configuration: config) let webview = DWKWebView(frame: .zero, configuration: config)
webview.scrollView.contentInsetAdjustmentBehavior = .never webview.scrollView.contentInsetAdjustmentBehavior = .never
webview.navigationDelegate = self
webview.scrollView.delegate = self
webview.setDebugMode(false) webview.setDebugMode(false)
// webview.uiDelegate = self // webview.uiDelegate = self
return webview return webview
}() }()
lazy var progBar: UIProgressView = { lazy var progBar: UIProgressView = {
progBar = UIProgressView(frame: CGRect(x: 0, y: 0, width: self.view.frame.width, height: 30)) let progBar = UIProgressView(frame: CGRect(x: 0, y: 0, width: self.view.frame.width, height: 30))
progBar.progress = 0.0 progBar.progress = 0.0
progBar.tintColor = UIColor.brandMainColor progBar.tintColor = UIColor.brandMainColor
return progBar return progBar
...@@ -77,20 +75,17 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate { ...@@ -77,20 +75,17 @@ class YHH5WebViewVC: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
setupUI() setupUI()
webview.navigationDelegate = self
webview.scrollView.delegate = self
NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(_:)), NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow(_:)),
name: UIResponder.keyboardWillShowNotification, object: nil) name: UIResponder.keyboardWillShowNotification, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(_:)), NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(_:)),
name: UIResponder.keyboardWillHideNotification, object: nil) name: UIResponder.keyboardWillHideNotification, object: nil)
} }
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
reloadUI()
}
deinit { deinit {
webview.removeObserver(self, forKeyPath: "estimatedProgress") // webview.removeObserver(self, forKeyPath: "estimatedProgress")
webview.removeObserver(self, forKeyPath: "title") // webview.removeObserver(self, forKeyPath: "title")
webview.navigationDelegate = nil webview.navigationDelegate = nil
NotificationCenter.default.removeObserver(self) NotificationCenter.default.removeObserver(self)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment