Commit f01a4061 by pierce

fixed 如果超过6个tab的话。会跳转不了的问题

parent 106fae0d
......@@ -15,6 +15,8 @@ public extension UIViewController {
let navVC = vc as! UINavigationController
if let visibleVC = navVC.visibleViewController {
return self.getVisibleViewController(from: visibleVC)
} else if let selectedVC = navVC.tabBarController?.selectedViewController {
return navVC.tabBarController?.selectedViewController
} else {
return nil
}
......
......@@ -57,15 +57,16 @@ class GDTabBarModel {
case .me:
// 构建导航控制器
if let myPage = GDRouter.MyModule?.showMyPageVC() {
let navVC = BaseNavigationController()
navVC.modalPresentationStyle = .overFullScreen
navVC.addChild(myPage)
//TODO:tabbar如果没有传nav Controller进去的话。: added By Pidan
// let navVC = BaseNavigationController()
// navVC.modalPresentationStyle = .overFullScreen
// navVC.addChild(myPage)
return GDTabBarModel(type: type,
title: "我的",
normalImage:GDTabbarBundle.imageNamed( "tabbar_my_normal") ?? UIImage(),
selectImage:GDTabbarBundle.imageNamed( "tabbar_my_selected") ?? UIImage(),
animateImages: nil,
controller: navVC)
controller: myPage)
}
case .message:
if let messageVC = GDRouter.ChatRoom?.showMessageListVC() {
......@@ -83,29 +84,29 @@ class GDTabBarModel {
case .friend:
// 构建导航控制器
if let friendVC = GDRouter.Friend?.friendListVC() {
let navVC = BaseNavigationController()
navVC.modalPresentationStyle = .overFullScreen
navVC.addChild(friendVC)
// let navVC = BaseNavigationController()
// navVC.modalPresentationStyle = .overFullScreen
// navVC.addChild(friendVC)
return GDTabBarModel(type: type,
title: "好友",
normalImage:GDTabbarBundle.imageNamed("tabbar_friends_normal") ?? UIImage(),
selectImage:GDTabbarBundle.imageNamed("tabbar_friends_selected") ?? UIImage(),
animateImages: nil,
controller: navVC)
controller: friendVC)
}
break
case .showRoomList:
// 构建导航控制器
if let friendVC = GDRouter.RoomListRouter?.showRoomListVC() {
let navVC = BaseNavigationController()
navVC.modalPresentationStyle = .overFullScreen
navVC.addChild(friendVC)
if let roomListVC = GDRouter.RoomListRouter?.showRoomListVC() {
// let navVC = BaseNavigationController()
// navVC.modalPresentationStyle = .overFullScreen
// navVC.addChild(friendVC)
return GDTabBarModel(type: type,
title: "直播",
normalImage:GDTabbarBundle.imageNamed("tabbar_roomlist_normal") ?? UIImage(),
selectImage:GDTabbarBundle.imageNamed("tabbar_roomlist_selected") ?? UIImage(),
animateImages: nil,
controller: navVC)
controller: roomListVC)
}
break
case .prize:
......
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 sign in to comment