添加分段控制偏移的情况，解决自定义tabbarController图片加载问题

CoderLinLee · CoderLinLee · commit 8d9f095737ee · 2019-03-14T16:22:40.000+08:00
diff --git a/LLSegmentViewController.xcworkspace/xcuserdata/lilin.xcuserdatad/UserInterfaceState.xcuserstate b/LLSegmentViewController.xcworkspace/xcuserdata/lilin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/LLSegmentViewController/Example/CustomItemView/AttributeItemView.swift b/LLSegmentViewController/Example/CustomItemView/AttributeItemView.swift
@@ -62,7 +62,7 @@ class AttributeItemViewController: LLSegmentViewController {
     }
     
     func layoutContentView() {
-        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))
+        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)
         self.relayoutSubViews()
     }
     
diff --git a/LLSegmentViewController/Example/CustomTableViewController/SimpleTabViewController.swift b/LLSegmentViewController/Example/CustomTableViewController/SimpleTabViewController.swift
@@ -20,7 +20,7 @@ class SimpleTabViewController: LLSegmentViewController {
     }
     
     func layoutContentView() {
-        self.layoutInfo.segmentControlPositionType = .bottom(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))
+        self.layoutInfo.segmentControlPositionType = .bottom(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)
         self.relayoutSubViews()
     }
     
diff --git a/LLSegmentViewController/Example/CustomTableViewController/SinaViewController.swift b/LLSegmentViewController/Example/CustomTableViewController/SinaViewController.swift
@@ -19,7 +19,7 @@ class SinaViewController: LLSegmentViewController {
     }
     
     func layoutSegmentView() {
-        self.layoutInfo.segmentControlPositionType = .bottom(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))
+        self.layoutInfo.segmentControlPositionType = .bottom(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)
         relayoutSubViews()
     }
     
diff --git a/LLSegmentViewController/Example/DetailViewController/GoodsDetailViewController.swift b/LLSegmentViewController/Example/DetailViewController/GoodsDetailViewController.swift
@@ -27,7 +27,7 @@ class GoodsDetailViewController: LLSegmentViewController {
     
     func layoutContentView() {
         self.layoutInfo.headView = loadHeadView()
-        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))
+        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)
         self.relayoutSubViews()
     }
     
diff --git a/LLSegmentViewController/Example/DetailViewController/PersonDetailViewController.swift b/LLSegmentViewController/Example/DetailViewController/PersonDetailViewController.swift
@@ -27,7 +27,7 @@ class PersonDetailViewController: LLSegmentViewController {
         loadLufeiImageView()
         
         self.layoutInfo.headView = lufeiImageView
-        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))
+        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)
         self.relayoutSubViews()
     }
     
diff --git a/LLSegmentViewController/Example/IndicatorViewController/BadgeValueViewController.swift b/LLSegmentViewController/Example/IndicatorViewController/BadgeValueViewController.swift
@@ -18,7 +18,7 @@ class BadgeValueViewController: LLSegmentViewController {
     }
     
     func layoutContentView() {
-        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))
+        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)
         self.relayoutSubViews()
     }
     
diff --git a/LLSegmentViewController/Example/IndicatorViewController/LLMsgViewController.swift b/LLSegmentViewController/Example/IndicatorViewController/LLMsgViewController.swift
@@ -19,7 +19,7 @@ class LLMsgViewController: LLSegmentViewController {
     }
     
     func layoutContentView() {
-        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))
+        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:100)
         self.relayoutSubViews()
     }
     
diff --git a/LLSegmentViewController/Example/IndicatorViewController/TitleViewController.swift b/LLSegmentViewController/Example/IndicatorViewController/TitleViewController.swift
@@ -20,7 +20,7 @@ class TitleViewController: LLSegmentViewController {
     }
     
     func layoutContentView() {
-        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))
+        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)
         self.relayoutSubViews()
     }
     
diff --git a/LLSegmentViewController/Example/SpecialViewController/FootballViewController.swift b/LLSegmentViewController/Example/SpecialViewController/FootballViewController.swift
@@ -20,7 +20,7 @@ class FootballViewController: LLSegmentViewController {
     }
     
     func layoutContentView() {
-        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))
+        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)
         self.relayoutSubViews()
     }
     
diff --git a/LLSegmentViewController/Example/SpecialViewController/NestViewController.swift b/LLSegmentViewController/Example/SpecialViewController/NestViewController.swift
@@ -69,7 +69,7 @@ class NestSubViewController: LLSegmentViewController {
     }
     
     func layoutContentView() {
-        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))
+        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)
         self.relayoutSubViews()
     }
     
diff --git a/LLSegmentViewController/Example/SpecialViewController/TitleImageItemViewController.swift b/LLSegmentViewController/Example/SpecialViewController/TitleImageItemViewController.swift
@@ -19,7 +19,7 @@ class TitleImageItemViewController: LLSegmentViewController {
     }
     
     func layoutContentView() {
-        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))
+        self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)
         self.relayoutSubViews()
     }
 
diff --git a/LLSegmentViewController/LLSegmentViewController/LLSegmentViewController.swift b/LLSegmentViewController/LLSegmentViewController/LLSegmentViewController.swift
@@ -17,14 +17,14 @@ public enum LLDragRefreshType {
 //分段控件的位置
 public enum LLSegmentedCtontrolPositionType {
     case nav(size:CGSize)
-    case top(size:CGSize)
-    case bottom(size:CGSize)
+    case top(size:CGSize,offset:CGFloat)
+    case bottom(size:CGSize,offset:CGFloat)
 }
 
 //控件布局位置信息
 public class LLSubViewsLayoutInfo:NSObject{
     public var minimumHeight:CGFloat = 64
-    public var segmentControlPositionType:LLSegmentedCtontrolPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))
+    public var segmentControlPositionType:LLSegmentedCtontrolPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50), offset: 0)
     public var refreshType = LLDragRefreshType.container
     public var headView:UIView?
 }
@@ -79,16 +79,16 @@ extension LLSegmentViewController{
             segmentControlSize = size
             segmentCtlViewY = 0
             
-        case .top(let size):
+        case .top(let size,let offset):
             let height = size.height
-            containerHeight = screenH - (containerScrView.paralaxHeader.minimumHeight + height)
-            containerFrameY = height
+            containerHeight = screenH - (containerScrView.paralaxHeader.minimumHeight + height + offset)
+            containerFrameY = height + offset
             
             segmentControlSize = size
-            segmentCtlViewY = 0
+            segmentCtlViewY = offset
             
-        case .bottom(let size):
-            containerHeight = screenH - (containerScrView.paralaxHeader.minimumHeight + size.height)
+        case .bottom(let size,let offset):
+            containerHeight = screenH - (containerScrView.paralaxHeader.minimumHeight + size.height + offset)
             containerFrameY = 0
             
             segmentControlSize = size
diff --git a/LLSegmentViewController/LLSegmentViewController/LLSegmentedControl/LLSegmentCtlItemView/LLSegmentItemTabbarView.swift b/LLSegmentViewController/LLSegmentViewController/LLSegmentedControl/LLSegmentCtlItemView/LLSegmentItemTabbarView.swift
@@ -54,7 +54,6 @@ open class LLSegmentItemTabbarView: LLSegmentItemBadgeView {
     
     override open func titleChange(title: String) {
         super.titleChange(title: title)
-
         titleLabel.text = title
     }
     
@@ -71,6 +70,7 @@ open class LLSegmentItemTabbarView: LLSegmentItemBadgeView {
     
     open override func layoutSubviews() {
         super.layoutSubviews()
+        titleLabel.sizeToFit()
         let titleLabelHeight = titleLabel.bounds.height
         let titleLabelY = bounds.height - tabbarViewStyle.titleBottomGap - titleLabelHeight
         titleLabel.frame = CGRect.init(x: 0, y: titleLabelY, width: bounds.width, height: titleLabelHeight)
@@ -80,5 +80,11 @@ open class LLSegmentItemTabbarView: LLSegmentItemBadgeView {
         imageView.center = CGPoint.init(x: bounds.width/2, y:bounds.height - bottomMargin - imgSize.height/2)
         imageView.bounds = CGRect.init(origin: CGPoint.zero, size: imgSize)
         layoutBadgeLabel()
+        
+        if percent == 1 {
+            imageView.image = associateViewCtl?.tabBarItem.selectedImage
+        }else{
+            imageView.image = associateViewCtl?.tabBarItem.image
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class AttributeItemViewController: LLSegmentViewController {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`func layoutContentView() {`
`65`		`- self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))`
	`65`	`+ self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)`
`66`	`66`	`self.relayoutSubViews()`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class SimpleTabViewController: LLSegmentViewController {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`func layoutContentView() {`
`23`		`- self.layoutInfo.segmentControlPositionType = .bottom(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))`
	`23`	`+ self.layoutInfo.segmentControlPositionType = .bottom(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)`
`24`	`24`	`self.relayoutSubViews()`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class SinaViewController: LLSegmentViewController {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`func layoutSegmentView() {`
`22`		`- self.layoutInfo.segmentControlPositionType = .bottom(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))`
	`22`	`+ self.layoutInfo.segmentControlPositionType = .bottom(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)`
`23`	`23`	`relayoutSubViews()`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class GoodsDetailViewController: LLSegmentViewController {`
`27`	`27`
`28`	`28`	`func layoutContentView() {`
`29`	`29`	`self.layoutInfo.headView = loadHeadView()`
`30`		`- self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))`
	`30`	`+ self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)`
`31`	`31`	`self.relayoutSubViews()`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class PersonDetailViewController: LLSegmentViewController {`
`27`	`27`	`loadLufeiImageView()`
`28`	`28`
`29`	`29`	`self.layoutInfo.headView = lufeiImageView`
`30`		`- self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))`
	`30`	`+ self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)`
`31`	`31`	`self.relayoutSubViews()`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class BadgeValueViewController: LLSegmentViewController {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`func layoutContentView() {`
`21`		`- self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))`
	`21`	`+ self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)`
`22`	`22`	`self.relayoutSubViews()`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class LLMsgViewController: LLSegmentViewController {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`func layoutContentView() {`
`22`		`- self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))`
	`22`	`+ self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:100)`
`23`	`23`	`self.relayoutSubViews()`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class TitleViewController: LLSegmentViewController {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`func layoutContentView() {`
`23`		`- self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))`
	`23`	`+ self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)`
`24`	`24`	`self.relayoutSubViews()`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class FootballViewController: LLSegmentViewController {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`func layoutContentView() {`
`23`		`- self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50))`
	`23`	`+ self.layoutInfo.segmentControlPositionType = .top(size: CGSize.init(width: UIScreen.main.bounds.width, height: 50),offset:0)`
`24`	`24`	`self.relayoutSubViews()`
`25`	`25`	`}`
`26`	`26`