alqindiirsyam 1 жил өмнө
parent
commit
0eb343a8d0

+ 1 - 1
appbuilder-ios/AppBuilder/AppBuilder.xcodeproj/xcshareddata/xcschemes/AppBuilder.xcscheme

@@ -23,7 +23,7 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">

+ 20 - 21
appbuilder-ios/AppBuilder/AppBuilder/FirstTabViewController.swift

@@ -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)
+    }
 }

+ 2 - 3
appbuilder-ios/AppBuilder/AppBuilder/ThirdTabViewController.swift

@@ -37,9 +37,8 @@ class ThirdTabViewController: 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)

+ 9 - 1
appbuilder-ios/AppBuilder/AppBuilder/ViewController.swift

@@ -106,10 +106,18 @@ class ViewController: UITabBarController, UITabBarControllerDelegate, SettingMAB
                                 PrefsUtil.setEnablePrivacyPolicy(value: enable_privacy_policy == "1" ? true : false)
                             }
                         }
+                        startView()
                     }
+                } else {
+                    startView()
                 }
+            } else {
+                startView()
             }
         }
+    }
+    
+    func startView() {
         let topBorder = CALayer()
         topBorder.backgroundColor = UIColor.gray.withAlphaComponent(0.5).cgColor
         topBorder.frame = CGRect(x: 0, y: 0, width: tabBar.frame.size.width, height: 1)
@@ -479,7 +487,7 @@ class ViewController: UITabBarController, UITabBarControllerDelegate, SettingMAB
         ViewController.postButton.layer.shadowOffset = CGSize(width: 4, height: 4)
         ViewController.postButton.addTarget(self, action: #selector(postTap), for: .touchUpInside)
         let buttonCenterX = self.view.bounds.width / 2
-        let buttonCenterY = self.view.bounds.height - self.tabBar.bounds.height - (iPhoneModel == "iPhone X or newer" ? 30 : 0)
+        let buttonCenterY = self.view.bounds.height - self.tabBar.bounds.height
         //print("buttonCenterX \(buttonCenterX)")
         //print("buttonCenterY \(buttonCenterY)")
         ViewController.middleButton = UIButton(frame: CGRect(x: buttonCenterX - 40 , y: buttonCenterY - 40, width: 80, height: 80))