1.更新样式支持

BottomBar/Assets.xcassets/Normal/Contents.json

@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}

BottomBar/Assets.xcassets/bbs_selected.imageset/Contents.json → BottomBar/Assets.xcassets/Normal/tabVC_mine.imageset/Contents.json

@@ -1,16 +1,16 @@
 {
  "images" : [
  {
- "filename" : "bbs_selected.png",
  "idiom" : "universal",
  "scale" : "1x"
  },
  {
- "filename" : "bbs_selected@2x.png",
+ "filename" : "tabVC_mine@2x.png",
  "idiom" : "universal",
  "scale" : "2x"
  },
  {
+ "filename" : "[email protected]",
  "idiom" : "universal",
  "scale" : "3x"
  }

BottomBar/Assets.xcassets/account_selected.imageset/Contents.json → BottomBar/Assets.xcassets/Normal/tabVC_mine_h.imageset/Contents.json

@@ -1,11 +1,11 @@
 {
  "images" : [
  {
- "filename" : "account_selected.png",
  "idiom" : "universal",
  "scale" : "1x"
  },
  {
+ "filename" : "[email protected]",
  "idiom" : "universal",
  "scale" : "2x"
  },

BottomBar/Assets.xcassets/Normal/tabVC_music.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}

BottomBar/Assets.xcassets/account_unselect.imageset/Contents.json → BottomBar/Assets.xcassets/Normal/tabVC_music_h.imageset/Contents.json

@@ -1,11 +1,11 @@
 {
  "images" : [
  {
- "filename" : "account_unselect.png",
  "idiom" : "universal",
  "scale" : "1x"
  },
  {
+ "filename" : "[email protected]",
  "idiom" : "universal",
  "scale" : "2x"
  },

BottomBar/Assets.xcassets/Normal/tabVC_putoo.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}

BottomBar/Assets.xcassets/bbs_unselect.imageset/Contents.json → BottomBar/Assets.xcassets/Normal/tabVC_putoo_h.imageset/Contents.json

@@ -1,12 +1,11 @@
 {
  "images" : [
  {
- "filename" : "bbs_unselect.png",
  "idiom" : "universal",
  "scale" : "1x"
  },
  {
- "filename" : "bbs_unselect@2x.png",
+ "filename" : "tabVC_putoo_h@2x.png",
  "idiom" : "universal",
  "scale" : "2x"
  },

BottomBar/Assets.xcassets/Normal/tabVC_video.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}

BottomBar/Assets.xcassets/Normal/tabVC_video_h.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+ "images" : [
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}

BottomBar/MusicViewController.swift

@@ -13,6 +13,7 @@ class MusicViewController: UIViewController {
  override func viewDidLoad() {
  super.viewDidLoad()
  self.view.backgroundColor = .white
+ self.navigationController?.delegate = self
  // Do any additional setup after loading the view.
  }
 
@@ -27,3 +28,17 @@ class MusicViewController: UIViewController {
  }
  }
 }
+
+extension MusicViewController: UINavigationControllerDelegate {
+ func navigationController(_ navigationController: UINavigationController, animationControllerFor operation: UINavigationController.Operation, from fromVC: UIViewController, to toVC: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+ return nil
+ }
+
+ func navigationController(_ navigationController: UINavigationController, interactionControllerFor animationController: UIViewControllerAnimatedTransitioning) -> UIViewControllerInteractiveTransitioning? {
+ return nil
+ }
+
+ func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {
+
+ }
+}

BottomBar/RootTabBarController.swift

@@ -17,21 +17,35 @@ enum BottomBarStyle {
 class RootTabBarController: UITabBarController {
 
  private var bottomBarStyle = BottomBarStyle.miniPlayViewOnly
-// private let iconList = ["music_unselect", "video_unselect", "bbs_unselect", "account_unselect"]
- private let iconList = ["skin_tab_home_normal", "skin_tab_video_normal", "skin_tab_putoo_normal", "skin_tab_mine_normal"]
- private let titleList = ["音乐", "视频", "扑通", "我的"]
+ private var itemList = [RootTabBarItem]()
+ private let itemsInfo: [(normal:String?, select:String?, title:String?)] =
+ [("tabVC_music","tabVC_music_h","音乐"),
+ ("tabVC_video","tabVC_video_h","视频"),
+ ("tabVC_putoo","tabVC_putoo_h","扑通"),
+ ("tabVC_mine","tabVC_mine_h","我的"),]
+
+// private let itemsInfo: [(normal:String?, select:String?, title:String?)] =
+// [("tabVC_music","tabVC_music_h",nil),
+// ("tabVC_video","tabVC_video_h",nil),
+// ("tabVC_putoo","tabVC_putoo_h",nil),
+// ("tabVC_mine","tabVC_mine_h",nil),]
 
  override func viewDidLoad() {
  super.viewDidLoad()
 
  let tabBar = RootTabBar()
  tabBar.RTDelegate = self
 
- var itemList = [RootTabBarItem]()
- for (index, item) in iconList.enumerated() {
+ for (index, info) in itemsInfo.enumerated() {
  let tabBatItem = RootTabBarItem()
- tabBatItem.icon = item
- tabBatItem.title = titleList[index]
+ if let iconNormal = info.normal, let iconSelect = info.select {
+ tabBatItem.iconNormal = iconNormal
+ tabBatItem.iconSelected = iconSelect
+ }
+
+ if let title = info.title {
+ tabBatItem.title = title
+ }
  tabBatItem.tag = index
  itemList.append(tabBatItem)
  }
@@ -71,6 +85,7 @@ class RootTabBarController: UITabBarController {
  }
 
  self.tabBar.frame = CGRect.init(x: 0, y: tabBarY, width: screenWidth, height: layout.tabBarHeight + layout.miniPlayViewHeight + safeAreaBottomHeight)
+ self.updateBarItems(selected: self.selectedIndex)
  }
 
  func updateBottomStyle(_ style: BottomBarStyle) {
@@ -81,12 +96,20 @@ class RootTabBarController: UITabBarController {
  self.view.layoutIfNeeded()
  }, completion: nil)
  }
+
+ func updateBarItems(selected:Int) {
+ for (idx,item) in itemList.enumerated() {
+ let state:itemState = selected==idx ? .selected : .normal
+ item.reloadData(state: state)
+ }
+ }
 
 }
 
 extension RootTabBarController: MainTabBarDelegate {
  func tabBar(_ tabBar: RootTabBar, didSelectedIndex: Int) {
  self.selectedIndex = didSelectedIndex;
+ self.updateBarItems(selected: didSelectedIndex)
  }
 
 }