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

optimise

Browse Source
This commit is contained in:
DDIsFriend
2023-08-18 17:53:12 +08:00
parent f0e8a1709d
commit 2fb6cb6dd4
15 changed files with 6050 additions and 6093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitorVideoController.swift
View File

@@ -27,7 +27,7 @@ extension VehicleMonitorVideoController {
self?.view.dd_showHUD()
})
.flatMapLatest {[weak self] _ in
return RQ.getRtspChannel(prameters: RtspChannelParameters(vehicleId: 203656))
return RQ.getRtspChannel(prameters: RtspChannelParameters(vehicleId: (self?.vehicleId)!))
}
.observe(on: MainScheduler.instance)
.do(onNext: {[weak self] _ in

25
OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
View File

@@ -251,19 +251,18 @@ extension VehicleMonitoringController : DDMAMapViewDelegate {
}
var vehicleMonitoringPointAnnotationNameInset = vehicleMonitoringPointAnnotationNameLeftInset + vehicleMonitoringPointAnnotationNameRightInset
// if model?.terminalType == .GPS {
// annotationView?.cameraBackgroundImageView.isHidden = false
// annotationView?.nameLabel.snp.updateConstraints({ make in
// make.right.equalToSuperview().offset(-auto(35))
// })
// }else{
// annotationView?.cameraBackgroundImageView.isHidden = true
// annotationView?.nameLabel.snp.updateConstraints({ make in
// make.right.equalToSuperview().offset(-auto(5))
// })
// vehicleMonitoringPointAnnotationNameInset = vehicleMonitoringPointAnnotationNameInset - auto(30)
// }
if model?.terminalType == .GPS {
annotationView?.cameraBackgroundImageView.isHidden = false
annotationView?.nameLabel.snp.updateConstraints({ make in
make.right.equalToSuperview().offset(-auto(35))
})
}else{
annotationView?.cameraBackgroundImageView.isHidden = true
annotationView?.nameLabel.snp.updateConstraints({ make in
make.right.equalToSuperview().offset(-auto(5))
})
vehicleMonitoringPointAnnotationNameInset = vehicleMonitoringPointAnnotationNameInset - auto(30)
}
let contentSizeH = annotationView?.contentLabel.sizeThatFits(CGSize(width: vehicleMonitoringPointAnnotationW, height: 1000)).height ?? 0
var nameSizeH = annotationView?.nameLabel.sizeThatFits(CGSize(width: vehicleMonitoringPointAnnotationW - vehicleMonitoringPointAnnotationNameInset, height: 1000)).height ?? 0
if nameSizeH < vehicleMonitoringPointAnnotationNameAtLeastH {