diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 3d7258f..daa2226 100644 Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 6922e5b..51dde0b 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -5270,8 +5270,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1428" - endingLineNumber = "1428" + startingLineNumber = "1432" + endingLineNumber = "1432" landmarkName = "updateData(taskModel:)" landmarkType = "7"> @@ -5542,8 +5542,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1434" - endingLineNumber = "1434" + startingLineNumber = "1438" + endingLineNumber = "1438" landmarkName = "listView()" landmarkType = "7"> diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index fdd9731..50bdc9d 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -1354,6 +1354,7 @@ class VMLDContainerView : DDView , JXCategoryListContentViewDelegate { addSubview(orderNumLabel) addSubview(titleLabel) + stateLabel.numberOfLines = 0 addSubview(stateLabel) line.backgroundColor = .hex("F1F2F5") addSubview(line) @@ -1371,14 +1372,17 @@ class VMLDContainerView : DDView , JXCategoryListContentViewDelegate { make.top.equalTo(auto(15)) } + titleLabel.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal) titleLabel.snp.makeConstraints { make in make.left.equalTo(orderNumLabel.snp.right).offset(auto(5)) make.centerY.equalTo(orderNumLabel) } + stateLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal) stateLabel.snp.makeConstraints { make in make.right.equalTo(-auto(20)) make.centerY.equalTo(orderNumLabel) + make.left.greaterThanOrEqualTo(titleLabel.snp.right).offset(auto(5)) } line.snp.makeConstraints { make in diff --git a/fastlane/report.xml b/fastlane/report.xml index 5ef37ff..d89da7d 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +