diff --git a/OrderScheduling/HttpResponseModel/ResponseModel.swift b/OrderScheduling/HttpResponseModel/ResponseModel.swift index 8e11926..4f8c9ca 100644 --- a/OrderScheduling/HttpResponseModel/ResponseModel.swift +++ b/OrderScheduling/HttpResponseModel/ResponseModel.swift @@ -177,7 +177,7 @@ public class VehicleMonitorListDataModel : Decodable { var vehicleName : String? var driverId : Int var driverName : String? - var driverPhone : String + var driverPhone : String? var vehicleType : String? var terminalType : String? var vehicleStatus : VehicleStatusModel? diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index 5f24fd6..7ca8906 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -213,7 +213,11 @@ extension VehicleMonitoringController { .observe(on: MainScheduler.instance) .subscribe(onNext: {[weak self] _ in if let model = self?.selectedModel { - URLLINKS.openUrl(type: .phone, appending: model.driverPhone) + guard let driverPhone = model.driverPhone else { + self?.view.dd_makeToast("空号") + return + } + URLLINKS.openUrl(type: .phone, appending: driverPhone) } }) .disposed(by: disposeBag) diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift index ef7f92d..7496eae 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringListController.swift @@ -98,8 +98,12 @@ extension VehicleMonitoringListController : UITableViewDelegate,UITableViewDataS cell?.callButton.rx.tap .observe(on: MainScheduler.instance) - .subscribe(onNext: { _ in - URLLINKS.openUrl(type: .phone, appending: model.driverPhone) + .subscribe(onNext: {[weak self] _ in + guard let driverPhone = model.driverPhone else { + self?.view.dd_makeToast("空号") + return + } + URLLINKS.openUrl(type: .phone, appending: driverPhone) }) .disposed(by: cell!.disposeBag) return cell!