diff --git a/OrderScheduling.xcodeproj/project.pbxproj b/OrderScheduling.xcodeproj/project.pbxproj index d0a5152..1da9adb 100644 --- a/OrderScheduling.xcodeproj/project.pbxproj +++ b/OrderScheduling.xcodeproj/project.pbxproj @@ -1307,12 +1307,10 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; + DEVELOPMENT_TEAM = X9WF5T89LV; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/OrderScheduling/Player/Classes/ijkplayer", @@ -1343,7 +1341,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "supplier adhoc"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -1361,12 +1358,10 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements; - CODE_SIGN_IDENTITY = "Apple Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 8; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; + DEVELOPMENT_TEAM = X9WF5T89LV; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = OrderSchedulingNotificationService/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = OrderSchedulingNotificationService; @@ -1386,7 +1381,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier.OrderSchedulingNotificationService; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "sino supplier notification service extension adhoc"; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = "OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h"; @@ -1579,11 +1573,10 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; + DEVELOPMENT_TEAM = X9WF5T89LV; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/OrderScheduling/Player/Classes/ijkplayer", @@ -1614,7 +1607,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = SinoSupplierDistribution; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -1670,12 +1662,10 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements; - CODE_SIGN_IDENTITY = "Apple Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 8; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; + DEVELOPMENT_TEAM = X9WF5T89LV; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = OrderSchedulingNotificationService/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = OrderSchedulingNotificationService; @@ -1695,7 +1685,6 @@ PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier.OrderSchedulingNotificationService; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "sino supplier notification service extension distr"; SKIP_INSTALL = YES; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = "OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h"; diff --git a/OrderScheduling/HttpResponseModel/ResponseModel.swift b/OrderScheduling/HttpResponseModel/ResponseModel.swift index 7371c3b..9ebfe02 100644 --- a/OrderScheduling/HttpResponseModel/ResponseModel.swift +++ b/OrderScheduling/HttpResponseModel/ResponseModel.swift @@ -53,9 +53,9 @@ class LoginDataModel : Decodable { class OrderListDataModel: Decodable { var brand : String? var model : String? - var vehiclePointAddress : String - var vehiclePointLongitude : Double - var vehiclePointLatitude : Double + var vehiclePointAddress : String? + var vehiclePointLongitude : Double? + var vehiclePointLatitude : Double? var vehiclePointRemark : String? var juheVehicleId : Int? var juheVehcileName : String? @@ -226,9 +226,9 @@ public class VehicleMonitorListDataModel : Decodable { var taskStatus : Int var taskStatusString : String var flowId : Int - var vehiclePointLongitude : Double - var vehiclePointLatitude : Double - var vehiclePointAddress : String + var vehiclePointLongitude : Double? + var vehiclePointLatitude : Double? + var vehiclePointAddress : String? var destinationLongitude : Double? var destinationLatitude : Double? var destinationAddress : String? diff --git a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift index 4752079..b369a7c 100644 --- a/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift +++ b/OrderScheduling/Rescue/ViewController/DispatchOrderController.swift @@ -564,8 +564,8 @@ open class DispatchOrderController : ZDViewController { private let userOrderId : Int private let taskOrderId : Int - private let serviceAddressLat : Double - private let serviceAddressLon : Double + private let serviceAddressLat : Double? + private let serviceAddressLon : Double? private var resultArr : [DispatchVehicleListDataModel] = [] @@ -582,7 +582,7 @@ open class DispatchOrderController : ZDViewController { private let pannelPanGes = DDUIPanGestureRecognizer.init() /// 用于pannel的拖动效果 - public init(userOrderId:Int,taskOrderId:Int,serviceAddressLat:Double,serviceAddressLon:Double) { + public init(userOrderId:Int,taskOrderId:Int,serviceAddressLat:Double?,serviceAddressLon:Double?) { self.userOrderId = userOrderId self.taskOrderId = taskOrderId self.serviceAddressLat = serviceAddressLat diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index 7a5f4cd..1efddb4 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -1376,7 +1376,9 @@ class VehicleMonitoringListDetailView : DDView, JXCategoryListContainerViewDeleg func categoryView(_ categoryView: JXCategoryBaseView!, didSelectedItemAt index: Int) { pageNumLabel.text = "\(index + 1)/\(taskModels.count)" let taskModel = taskModels[index] - showIncidentLocationHandler?(CLLocationCoordinate2D(latitude: taskModel.vehiclePointLatitude, longitude: taskModel.vehiclePointLongitude),(taskModel.destinationLatitude != nil && taskModel.destinationLongitude != nil) ? CLLocationCoordinate2D(latitude: taskModel.destinationLatitude!, longitude: taskModel.destinationLongitude!) : nil) + if let vehiclePointLatitude = taskModel.vehiclePointLatitude, let vehiclePointLongitude = taskModel.vehiclePointLongitude { + showIncidentLocationHandler?(CLLocationCoordinate2D(latitude: vehiclePointLatitude, longitude: vehiclePointLongitude),(taskModel.destinationLatitude != nil && taskModel.destinationLongitude != nil) ? CLLocationCoordinate2D(latitude: taskModel.destinationLatitude!, longitude: taskModel.destinationLongitude!) : nil) + } } public var taskModels : [VehicleMonitorListDataModel.TaskModel]