dezhong/OrderScheduling
18
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改首页界面的约束

Browse Source
This commit is contained in:
DDIsFriend
2023-10-25 15:45:46 +08:00
parent cdec507fb3
commit 0dcf430c17
5 changed files with 48 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

88
OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@@ -1333,10 +1333,10 @@
filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "274"
endingLineNumber = "274"
landmarkName = "reloadData()"
landmarkType = "7">
startingLineNumber = "277"
endingLineNumber = "277"
landmarkName = "ReviewFailedController"
landmarkType = "3">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
@@ -2556,8 +2556,8 @@
filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "273"
endingLineNumber = "273"
startingLineNumber = "276"
endingLineNumber = "276"
landmarkName = "reloadData()"
landmarkType = "7">
</BreakpointContent>
@@ -2572,8 +2572,8 @@
filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "272"
endingLineNumber = "272"
startingLineNumber = "275"
endingLineNumber = "275"
landmarkName = "reloadData()"
landmarkType = "7">
</BreakpointContent>
@@ -2945,22 +2945,6 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "E4297D03-4063-4D45-AB9B-81F44210A191"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1115"
endingLineNumber = "1115"
landmarkName = "viewSafeAreaInsetsDidChange()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
@@ -4573,54 +4557,6 @@
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "9EF47E0B-6F13-446E-B20D-D257803ECD5D"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "260"
endingLineNumber = "260"
landmarkName = "viewSafeAreaInsetsDidChange()"
landmarkType = "7">
<Locations>
<Location
uuid = "9EF47E0B-6F13-446E-B20D-D257803ECD5D - 641a45e4e8b60464"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.ReviewFailedController.viewSafeAreaInsetsDidChange() -&gt; ()"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "260"
endingLineNumber = "260"
offsetFromSymbolStart = "92">
</Location>
<Location
uuid = "9EF47E0B-6F13-446E-B20D-D257803ECD5D - 199313feb1c692cb"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #1 (SnapKit.ConstraintMaker) -&gt; () in OrderScheduling.ReviewFailedController.viewSafeAreaInsetsDidChange() -&gt; ()"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "261"
endingLineNumber = "261"
offsetFromSymbolStart = "84">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
@@ -4743,8 +4679,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1959"
endingLineNumber = "1959"
startingLineNumber = "1963"
endingLineNumber = "1963"
landmarkName = "init(style:reuseIdentifier:)"
landmarkType = "7">
<Locations>
@@ -4791,8 +4727,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1966"
endingLineNumber = "1966"
startingLineNumber = "1970"
endingLineNumber = "1970"
landmarkName = "init(style:reuseIdentifier:)"
landmarkType = "7">
<Locations>

30
OrderScheduling/History/ViewController/HistoryController.swift
View File

@@ -329,11 +329,7 @@ open class HistoryController : ZDViewController {
categoryView.backgroundColor = .hex("F4F5F7")
categoryView.delegate = self
view.addSubview(categoryView)
categoryView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalTo(CGRectGetMaxY(navigationController?.navigationBar.frame ?? CGRectZero) + CGRectGetHeight(UIApplication.shared.dd_statusBarFrame))
make.height.equalTo(auto(44))
}
// 指示器
let indicator = JXCategoryIndicatorLineView()
indicator.indicatorColor = .hex("3678FF")
@@ -344,11 +340,6 @@ open class HistoryController : ZDViewController {
// 内容
view.addSubview(categoryContainerView!)
categoryView.listContainer = categoryContainerView
categoryContainerView?.snp.makeConstraints({ make in
make.top.equalTo(categoryView.snp.bottom)
make.left.right.equalToSuperview()
make.bottom.equalTo(-(view.safeAreaInsets.bottom+CGRectGetHeight(tabBarController?.tabBar.frame ?? CGRectZero)))
})
messageView.titleLabel.text = "消息"
messageView.addGestureRecognizer(messageTapGes)
@@ -367,6 +358,25 @@ open class HistoryController : ZDViewController {
}
}
open override func viewSafeAreaInsetsDidChange() {
super.viewSafeAreaInsetsDidChange()
categoryView.snp.remakeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalTo(view.safeAreaInsets.top)
make.height.equalTo(auto(44))
}
// view.safeAreaInsets.bottom为0的时候是hiddenBottomBar的时候，此时不必约束，由于是首页所以view.safeAreaInsets.bottom一定是大于0的
if view.safeAreaInsets.bottom != 0 {
categoryContainerView?.snp.makeConstraints({ make in
make.top.equalTo(categoryView.snp.bottom)
make.left.right.equalToSuperview()
make.bottom.equalTo(-view.safeAreaInsets.bottom)
})
}
}
open override func reloadData() {
super.reloadData()
preRefreshRelay.accept(nil)

4
OrderScheduling/Rescue/ViewController/RescueController.swift
View File

@@ -1107,12 +1107,16 @@ class RescueController : ZDViewController {
make.height.equalTo(auto(44))
}
// view.safeAreaInsets.bottom为0的时候是hiddenBottomBar的时候，此时不必约束，由于是首页所以view.safeAreaInsets.bottom一定是大于0的
if view.safeAreaInsets.bottom == 0 {
}else{
categoryContainerView?.snp.remakeConstraints({ make in
make.top.equalTo(categoryView.snp.bottom)
make.left.right.equalToSuperview()
make.bottom.equalTo(-view.safeAreaInsets.bottom)
})
}
}
override func reloadData() {
super.reloadData()

3
OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift
View File

@@ -257,12 +257,15 @@ open class ReviewFailedController : ZDViewController {
open override func viewSafeAreaInsetsDidChange() {
super.viewSafeAreaInsetsDidChange()
// view.safeAreaInsets.bottom为0的时候是hiddenBottomBar的时候，此时不必约束，由于是首页所以view.safeAreaInsets.bottom一定是大于0的
if view.safeAreaInsets.bottom != 0 {
reviewFailedView.snp.remakeConstraints { make in
make.top.equalTo(view.safeAreaInsets.top)
make.left.right.equalToSuperview()
make.bottom.equalTo(-view.safeAreaInsets.bottom)
}
}
}
open override var preferredStatusBarStyle: UIStatusBarStyle {
return .lightContent