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

update

Browse Source
This commit is contained in:
DDIsFriend
2023-08-23 18:37:36 +08:00
parent 63ca919ed5
commit a48690ccf8
49 changed files with 8332 additions and 7622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ import SnapKit
import DDTimerKit_Private
fileprivate let vehicleMonitoringPannelViewHeight = auto(300)
fileprivate let vehicleMonitoringPannelViewTopInset = auto(90)
fileprivate let vehicleMonitoringPannelViewTopInset = auto(72)
fileprivate let vehicleMonitoringPointAnnotationW = auto(120)
fileprivate let vehicleMonitoringPointAnnotationNameLeftInset = auto(35)
@@ -161,11 +161,22 @@ extension VehicleMonitoringController {
})
.disposed(by: disposeBag)
// vehicleMonitoringView.refreshButton.rx.tap
// .subscribe(onNext: {[weak self] _ in
// self?.reloadRelay.accept(nil)
// })
// .disposed(by: disposeBag)
// 点击tabBar 需要刷下下列
preRefreshRelay
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] _ in
NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
self?.reloadRelay.accept(nil)
})
.disposed(by: disposeBag)
refreshButton.rx.tap
.subscribe(onNext: {[weak self] _ in
NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
self?.reloadRelay.accept(nil)
})
.disposed(by: disposeBag)
// vehicleMonitoringView.refreshButton.sendActions(for: .touchUpInside)
// var duration = 0
// DDTimerManager.dd_share().dd_addTimer(withName: refresh_vehicle_monitoring_key, timeInterval: 1, repeatCount: 0, delay: 0) {[weak self] (manager, obj, index) in
@@ -180,10 +191,6 @@ extension VehicleMonitoringController {
// }
}
public func refreshData() {
reloadRelay.accept(nil)
}
public override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
@@ -501,7 +508,9 @@ open class VehicleMonitoringController : DDViewController {
private let messageView = MessageView()
private let pendingTapGes = UITapGestureRecognizer()
private let pendingView = MessageView()
private var preRefreshRelay = ReplayRelay<Any?>.create(bufferSize: 1)
public let refreshButton = DDButton.dd_initCustom()
open override func viewDidLoad() {
super.viewDidLoad()
dd_navigationItemTitle = "车辆监控"
@@ -538,15 +547,22 @@ open class VehicleMonitoringController : DDViewController {
make.width.greaterThanOrEqualTo(40)
}
pendingView.titleLabel.text = "待办"
pendingView.addGestureRecognizer(pendingTapGes)
navigationItem.rightBarButtonItem = UIBarButtonItem(customView: pendingView)
refreshButton.setTitle("刷新", for: .normal)
refreshButton.setTitleColor(.hex("FFFFFF").alpha(0.7), for: .normal)
refreshButton.titleLabel?.font = .mediumFont(auto(14))
// pendingView.titleLabel.text = "待办"
// pendingView.addGestureRecognizer(pendingTapGes)
navigationItem.rightBarButtonItem = UIBarButtonItem(customView: refreshButton)
pendingView.snp.makeConstraints { make in
make.height.equalTo(40)
make.width.greaterThanOrEqualTo(40)
}
}
open override func reloadData() {
super.reloadData()
preRefreshRelay.accept(nil)
}
}
// MARK: UI
@@ -556,14 +572,12 @@ open class VehicleMonitoringView : DDView {
public let coverView : DDView
public let tapGes : UITapGestureRecognizer
public let panGes : UIPanGestureRecognizer
public let refreshButton : DDButton
public init(titles:[String]) {
vehicleMonitoringPannelView = VehicleMonitoringPannelView(titles:titles)
maMapView = DDMAMapView()
coverView = DDView()
tapGes = UITapGestureRecognizer()
panGes = UIPanGestureRecognizer()
refreshButton = DDButton.dd_initCustom()
super.init(frame: .zero)
maMapView.maMapView.logoCenter = CGPoint(x: 100, y: 100)
@@ -574,12 +588,7 @@ open class VehicleMonitoringView : DDView {
addSubview(coverView)
vehicleMonitoringPannelView.layer.cornerRadius = auto(16)
addSubview(vehicleMonitoringPannelView)
refreshButton.setTitle("手动刷新", for: .normal)
refreshButton.setTitleColor(.hex("000000"), for: .normal)
refreshButton.titleLabel?.font = .mediumFont(auto(14))
refreshButton.isHidden = true
addSubview(refreshButton)
maMapView.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
make.bottom.equalTo(vehicleMonitoringPannelView.snp.top).offset(auto(30))
@@ -594,12 +603,7 @@ open class VehicleMonitoringView : DDView {
make.left.right.equalToSuperview()
make.height.equalTo(vehicleMonitoringPannelViewHeight)
}
refreshButton.snp.makeConstraints { make in
make.bottom.equalTo(vehicleMonitoringPannelView.snp.top).offset(-auto(0))
make.right.equalTo(-auto(20))
make.height.equalTo(auto(30))
}
}
required public init?(coder: NSCoder) {
@@ -643,8 +647,9 @@ open class VehicleMonitoringPannelView : DDView {
}
tapButton.snp.makeConstraints { make in
make.top.equalTo(auto(7))
make.height.width.equalTo(auto(23))
make.top.equalTo(auto(6))
make.height.equalTo(auto(9))
make.width.equalTo(auto(19))
make.centerX.equalToSuperview()
}

3
OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift
View File

@@ -101,6 +101,7 @@ open class VehicleMonitoringListController : DDViewController {
make.edges.equalToSuperview()
}
vehicleMonitoringListView.tableView.backgroundColor = .hex("FAFAFA")
vehicleMonitoringListView.tableView.addSubview(emptyView)
emptyView.snp.makeConstraints { make in
make.centerX.centerY.equalToSuperview()
@@ -203,8 +204,8 @@ open class VehicleMonitoringListCell : DDTableViewCell {
radiusView.addSubview(line)
radiusView.snp.makeConstraints { make in
make.edges.equalToSuperview()
make.height.greaterThanOrEqualTo(auto(44))
make.edges.equalToSuperview()
}
icon.snp.makeConstraints { make in