diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 99371f9..bdb867c 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/VehicleMonitoring/ViewController/VehicleMonitorVideoController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitorVideoController.swift index 8130e9a..16e987d 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitorVideoController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitorVideoController.swift @@ -68,15 +68,13 @@ extension VehicleMonitorVideoController : JXCategoryViewDelegate { open class VehicleMonitorVideoController : ZDViewController { private let vehicleId : Int? - private let deviceCode : String? private let vehicleMonitorVideoView : VehicleMonitorVideoView private let reloadRelay = ReplayRelay.create(bufferSize: 1) private let disposeBag = DisposeBag() private var videos : [String] = [] - public init(vehicleId:Int?,deviceCode:String?) { + public init(vehicleId:Int?) { self.vehicleId = vehicleId - self.deviceCode = deviceCode self.vehicleMonitorVideoView = VehicleMonitorVideoView() super.init(nibName: nil, bundle: nil) } diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index 41ebd3b..900b07b 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -200,7 +200,7 @@ extension VehicleMonitoringController { .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in ENTRY.dismiss(name: vehicleMonitoringConfigEntry) {[weak self] in - let vc = VehicleMonitorVideoController.init(vehicleId: self?.selectedModel?.vehicleId, deviceCode: nil) + let vc = VehicleMonitorVideoController.init(vehicleId: self?.selectedModel?.vehicleId) self?.navigationController?.pushViewController(vc, animated: true) } })