Skip to content

iOSTeam / Majiabao / TealiveModule

Go to a project
Commit f01a4061 by pierce
Options

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

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