diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 48b438b..476681d 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 cd91563..1672164 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -2029,8 +2029,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "707" - endingLineNumber = "707" + startingLineNumber = "714" + endingLineNumber = "714" landmarkName = "viewDidLoad()" landmarkType = "7"> @@ -4839,8 +4839,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "750" - endingLineNumber = "750" + startingLineNumber = "757" + endingLineNumber = "757" landmarkName = "addSubviews()" landmarkType = "7"> @@ -5015,8 +5015,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "815" - endingLineNumber = "815" + startingLineNumber = "822" + endingLineNumber = "822" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5095,8 +5095,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1220" - endingLineNumber = "1220" + startingLineNumber = "1227" + endingLineNumber = "1227" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5143,8 +5143,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1232" - endingLineNumber = "1232" + startingLineNumber = "1239" + endingLineNumber = "1239" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5191,8 +5191,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1234" - endingLineNumber = "1234" + startingLineNumber = "1241" + endingLineNumber = "1241" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5286,8 +5286,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1061" - endingLineNumber = "1061" + startingLineNumber = "1068" + endingLineNumber = "1068" landmarkName = "listContainerView(_:initListFor:)" landmarkType = "7"> @@ -5302,8 +5302,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1362" - endingLineNumber = "1362" + startingLineNumber = "1369" + endingLineNumber = "1369" landmarkName = "updateData(taskModel:)" landmarkType = "7"> @@ -5334,8 +5334,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1223" - endingLineNumber = "1223" + startingLineNumber = "1230" + endingLineNumber = "1230" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5350,8 +5350,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1236" - endingLineNumber = "1236" + startingLineNumber = "1243" + endingLineNumber = "1243" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5366,8 +5366,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1066" - endingLineNumber = "1066" + startingLineNumber = "1073" + endingLineNumber = "1073" landmarkName = "categoryView(_:didSelectedItemAt:)" landmarkType = "7"> @@ -5382,8 +5382,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1235" - endingLineNumber = "1235" + startingLineNumber = "1242" + endingLineNumber = "1242" landmarkName = "init(taskModels:)" landmarkType = "7"> @@ -5462,8 +5462,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "795" - endingLineNumber = "795" + startingLineNumber = "802" + endingLineNumber = "802" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5478,8 +5478,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "801" - endingLineNumber = "801" + startingLineNumber = "808" + endingLineNumber = "808" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5494,8 +5494,8 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "807" - endingLineNumber = "807" + startingLineNumber = "814" + endingLineNumber = "814" landmarkName = "viewSafeAreaInsetsDidChange()" landmarkType = "7"> @@ -5574,11 +5574,59 @@ filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "1368" - endingLineNumber = "1368" + startingLineNumber = "1375" + endingLineNumber = "1375" landmarkName = "listView()" landmarkType = "7"> + + + + + + + + + + diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index 665d6f2..cef529b 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -626,7 +626,9 @@ extension VehicleMonitoringController { vehicleMonitoringListDetailView.updateData(taskModels: vehicleModel.taskList ?? []) /// 收回pannelView - previousStateOfPannelView = pannelPanGes.panGesValue.expandLevel + if isListDetailViewShowed == false { + previousStateOfPannelView = pannelPanGes.panGesValue.expandLevel + } pannelPanGes.expand(.default) /// 改变约束 @@ -636,6 +638,8 @@ extension VehicleMonitoringController { UIView.animate(withDuration: 0.25) {[weak self] in self?.view.layoutIfNeeded() } + + isListDetailViewShowed = true } func hideListDetail() { @@ -653,6 +657,8 @@ extension VehicleMonitoringController { }else if previousStateOfPannelView == .max { pannelPanGes.expand(.max) } + + isListDetailViewShowed = false } func resetSelectedOfData() { @@ -685,6 +691,7 @@ open class VehicleMonitoringController : ZDViewController { private var selectedModel : VehicleMonitorListDataModel.ItemModel? /// 用于选中 private var previousStateOfPannelView : DDUIPanGestureRecognizer.ExpandLevel = .min /// 用于记录显示详情前,pannelview的弹出状态,返回时保持这个状态 + private var isListDetailViewShowed : Bool = false /// 当选中一个model后,直接在地图中继续选择另外的model,从详情返回就无法记录最初的pannel高度了,所以选中后就不需要记录expandlevel private var shouldShowSmallAnnotation : Bool? = false /// 用于标记是否需要显示最小的annotation private var isShowSmallAnnotation : Bool? = false /// 用于标记是否已经显示最小的annotation