Browse Source

update fix tabbar always hide if using mywebview

alqindiirsyam 2 năm trước cách đây
mục cha
commit
2e6fa22c8c

+ 5 - 1
appbuilder-ios/AppBuilder/AppBuilder/FirstTabViewController.swift

@@ -452,6 +452,10 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
             print("audioEngine couldn't start because of an error.")
         }
     }
+    
+    func isUsingMyWebview() -> Bool{
+        return PrefsUtil.getURLFirstTab() == "0" || PrefsUtil.getURLFirstTab() == "1" || PrefsUtil.getURLFirstTab() == "2" || PrefsUtil.getURLFirstTab() == "3" || PrefsUtil.getURLFirstTab() == "4"
+    }
 
 }
 
@@ -474,7 +478,7 @@ extension FirstTabViewController: WKUIDelegate, WKNavigationDelegate {
                 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") {
                     ViewController.alwaysHideButton = false
                     showTabBar()
-                } else {
+                } else if isUsingMyWebview() {
                     ViewController.alwaysHideButton = true
                     hideTabBar()
                     FirstTabViewController.atFirstPage = false

+ 5 - 1
appbuilder-ios/AppBuilder/AppBuilder/ThirdTabViewController.swift

@@ -467,6 +467,10 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
             print("audioEngine couldn't start because of an error.")
         }
     }
+    
+    func isUsingMyWebview() -> Bool{
+        return PrefsUtil.getURLThirdTab() == "0" || PrefsUtil.getURLThirdTab() == "1" || PrefsUtil.getURLThirdTab() == "2" || PrefsUtil.getURLThirdTab() == "3" || PrefsUtil.getURLThirdTab() == "4"
+    }
 
 }
 
@@ -490,7 +494,7 @@ extension ThirdTabViewController: WKUIDelegate {
                 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") {
                     ViewController.alwaysHideButton = false
                     showTabBar()
-                } else {
+                } else if isUsingMyWebview() {
                     ViewController.alwaysHideButton = true
                     hideTabBar()
                     ThirdTabViewController.atFirstPage = false