|
@@ -36,9 +36,8 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
|
|
|
tapGesture.cancelsTouchesInView = false
|
|
|
tapGesture.delegate = self
|
|
|
let configuration = WKWebViewConfiguration()
|
|
|
- let defaultUserAgent = WKWebView(frame: .zero, configuration: configuration).evaluateJavaScript("navigator.userAgent") as? String
|
|
|
- let customUserAgent = "easySoftIndonesia"
|
|
|
- let finalUserAgent = "\(defaultUserAgent ?? "") \(customUserAgent)"
|
|
|
+ let customUserAgent = "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.5 Mobile/15E148 Safari/604.1 easySoftIndonesia"
|
|
|
+ let finalUserAgent = "\(customUserAgent)"
|
|
|
configuration.applicationNameForUserAgent = finalUserAgent
|
|
|
webView = WKWebView(frame: .zero, configuration: configuration)
|
|
|
view.addSubview(webView)
|
|
@@ -543,23 +542,23 @@ extension FirstTabViewController: SFSpeechRecognizerDelegate {
|
|
|
}
|
|
|
|
|
|
extension FirstTabViewController: WKUIDelegate, WKNavigationDelegate {
|
|
|
- func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
|
|
|
- if self.viewIfLoaded?.window != nil {
|
|
|
- if let urlStr = navigationAction.request.url?.absoluteString {
|
|
|
- //print("url: \(urlStr)")
|
|
|
- collapseDocked()
|
|
|
- if urlStr.contains("nexilis/pages/tab1-main-only") || urlStr.contains("nexilis/pages/tab3-main-only") || urlStr.contains("nexilis/pages/tab1-main") || urlStr.contains("nexilis/pages/tab3-commerce") || urlStr.contains("nexilis/pages/tab1-video") || urlStr.contains("nexilis/pages/tab3-main") {
|
|
|
- ViewController.alwaysHideButton = false
|
|
|
- showTabBar()
|
|
|
- FirstTabViewController.atFirstPage = true
|
|
|
- }
|
|
|
-// else if isUsingMyWebview() {
|
|
|
-// ViewController.alwaysHideButton = true
|
|
|
-// hideTabBar()
|
|
|
-// FirstTabViewController.atFirstPage = false
|
|
|
-// }
|
|
|
+ func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
|
|
|
+ if self.viewIfLoaded?.window != nil {
|
|
|
+ if let urlStr = navigationAction.request.url?.absoluteString {
|
|
|
+ //print("url: \(urlStr)")
|
|
|
+ collapseDocked()
|
|
|
+ if urlStr.contains("nexilis/pages/tab1-main-only") || urlStr.contains("nexilis/pages/tab3-main-only") || urlStr.contains("nexilis/pages/tab1-main") || urlStr.contains("nexilis/pages/tab3-commerce") || urlStr.contains("nexilis/pages/tab1-video") || urlStr.contains("nexilis/pages/tab3-main") {
|
|
|
+ ViewController.alwaysHideButton = false
|
|
|
+ showTabBar()
|
|
|
+ FirstTabViewController.atFirstPage = true
|
|
|
}
|
|
|
- }
|
|
|
- decisionHandler(.allow)
|
|
|
- }
|
|
|
+ // else if isUsingMyWebview() {
|
|
|
+ // ViewController.alwaysHideButton = true
|
|
|
+ // hideTabBar()
|
|
|
+ // FirstTabViewController.atFirstPage = false
|
|
|
+ // }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ decisionHandler(.allow)
|
|
|
+ }
|
|
|
}
|