|
@@ -74,19 +74,19 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
|
|
}
|
|
}
|
|
switch(ViewController.tab3){
|
|
switch(ViewController.tab3){
|
|
case "0":
|
|
case "0":
|
|
- address = "\(PrefsUtil.getURLBase() ?? "https://qmera.io/")nexilis/pages/tab1-main-only?f_pin=\(me ?? "")&lang=\(intLang)"
|
|
|
|
|
|
+ address = "\(PrefsUtil.getURLBase())nexilis/pages/tab1-main-only?f_pin=\(me ?? "")&lang=\(intLang)"
|
|
myURL = URL(string: address)
|
|
myURL = URL(string: address)
|
|
case "1":
|
|
case "1":
|
|
- address = "\(PrefsUtil.getURLBase() ?? "https://qmera.io/")nexilis/pages/tab3-main-only?f_pin=\(me ?? "")&lang=\(intLang)"
|
|
|
|
|
|
+ address = "\(PrefsUtil.getURLBase())nexilis/pages/tab3-main-only?f_pin=\(me ?? "")&lang=\(intLang)"
|
|
myURL = URL(string: address)
|
|
myURL = URL(string: address)
|
|
case "2":
|
|
case "2":
|
|
- address = "\(PrefsUtil.getURLBase() ?? "https://qmera.io/")nexilis/pages/tab1-main?f_pin=\(me ?? "")&lang=\(intLang)"
|
|
|
|
|
|
+ address = "\(PrefsUtil.getURLBase())nexilis/pages/tab1-main?f_pin=\(me ?? "")&lang=\(intLang)"
|
|
myURL = URL(string: address)
|
|
myURL = URL(string: address)
|
|
case "3":
|
|
case "3":
|
|
- address = "\(PrefsUtil.getURLBase() ?? "https://qmera.io/")nexilis/pages/tab3-commerce?f_pin=\(me ?? "")&lang=\(intLang)"
|
|
|
|
|
|
+ address = "\(PrefsUtil.getURLBase())nexilis/pages/tab3-commerce?f_pin=\(me ?? "")&lang=\(intLang)"
|
|
myURL = URL(string: address)
|
|
myURL = URL(string: address)
|
|
case "4":
|
|
case "4":
|
|
- address = "\(PrefsUtil.getURLBase() ?? "https://qmera.io/")nexilis/pages/tab1-video?f_pin=\(me ?? "")&lang=\(intLang)"
|
|
|
|
|
|
+ address = "\(PrefsUtil.getURLBase())nexilis/pages/tab1-video?f_pin=\(me ?? "")&lang=\(intLang)"
|
|
myURL = URL(string: address)
|
|
myURL = URL(string: address)
|
|
default:
|
|
default:
|
|
if(!ViewController.tab3.isEmpty){
|
|
if(!ViewController.tab3.isEmpty){
|
|
@@ -165,6 +165,14 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
|
|
}
|
|
}
|
|
ViewController.removeMiddleButton()
|
|
ViewController.removeMiddleButton()
|
|
}
|
|
}
|
|
|
|
+ } else if PrefsUtil.getCpaasMode() != PrefsUtil.CPAAS_MODE_DOCKED {
|
|
|
|
+ DispatchQueue.main.async {
|
|
|
|
+ if let viewController = viewController as? ViewController {
|
|
|
|
+ if !viewController.tabBar.isHidden {
|
|
|
|
+ viewController.tabBar.isHidden = true
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -182,6 +190,14 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
|
|
viewController.tabBar.isHidden = false
|
|
viewController.tabBar.isHidden = false
|
|
ViewController.middleButton.isHidden = false
|
|
ViewController.middleButton.isHidden = false
|
|
}
|
|
}
|
|
|
|
+ } else if PrefsUtil.getCpaasMode() != PrefsUtil.CPAAS_MODE_DOCKED {
|
|
|
|
+ DispatchQueue.main.async {
|
|
|
|
+ if let viewController = viewController as? ViewController {
|
|
|
|
+ if viewController.tabBar.isHidden {
|
|
|
|
+ viewController.tabBar.isHidden = false
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|