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

事发地可为空

Browse Source
This commit is contained in:
ddisfriend
2025-10-31 15:12:37 +08:00
parent 75c0b5dcc9
commit 86c463c811
4 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OrderScheduling.xcodeproj/project.pbxproj
View File

@@ -1307,12 +1307,10 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements; CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = X9WF5T89LV;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/OrderScheduling/Player/Classes/ijkplayer", "$(PROJECT_DIR)/OrderScheduling/Player/Classes/ijkplayer",
@@ -1343,7 +1341,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier; PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "supplier adhoc";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO; SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -1361,12 +1358,10 @@
buildSettings = { buildSettings = {
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements; CODE_SIGN_ENTITLEMENTS = OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements;
CODE_SIGN_IDENTITY = "Apple Distribution"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = X9WF5T89LV;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = OrderSchedulingNotificationService/Info.plist; INFOPLIST_FILE = OrderSchedulingNotificationService/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = OrderSchedulingNotificationService; INFOPLIST_KEY_CFBundleDisplayName = OrderSchedulingNotificationService;
@@ -1386,7 +1381,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier.OrderSchedulingNotificationService; PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier.OrderSchedulingNotificationService;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "sino supplier notification service extension adhoc";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h";
@@ -1579,11 +1573,10 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements; CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = X9WF5T89LV;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/OrderScheduling/Player/Classes/ijkplayer", "$(PROJECT_DIR)/OrderScheduling/Player/Classes/ijkplayer",
@@ -1614,7 +1607,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier; PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = SinoSupplierDistribution;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO; SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
@@ -1670,12 +1662,10 @@
buildSettings = { buildSettings = {
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements; CODE_SIGN_ENTITLEMENTS = OrderSchedulingNotificationService/OrderSchedulingNotificationService.entitlements;
CODE_SIGN_IDENTITY = "Apple Distribution"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 8; CURRENT_PROJECT_VERSION = 8;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = X9WF5T89LV;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = OrderSchedulingNotificationService/Info.plist; INFOPLIST_FILE = OrderSchedulingNotificationService/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = OrderSchedulingNotificationService; INFOPLIST_KEY_CFBundleDisplayName = OrderSchedulingNotificationService;
@@ -1695,7 +1685,6 @@
PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier.OrderSchedulingNotificationService; PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier.OrderSchedulingNotificationService;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "sino supplier notification service extension distr";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "OrderSchedulingNotificationService/OrderSchedulingNotificationService-Bridging-Header.h";

12
OrderScheduling/HttpResponseModel/ResponseModel.swift
View File

@@ -53,9 +53,9 @@ class LoginDataModel : Decodable {
class OrderListDataModel: Decodable { class OrderListDataModel: Decodable {
var brand : String? var brand : String?
var model : String? var model : String?
var vehiclePointAddress : String var vehiclePointAddress : String?
var vehiclePointLongitude : Double var vehiclePointLongitude : Double?
var vehiclePointLatitude : Double var vehiclePointLatitude : Double?
var vehiclePointRemark : String? var vehiclePointRemark : String?
var juheVehicleId : Int? var juheVehicleId : Int?
var juheVehcileName : String? var juheVehcileName : String?
@@ -226,9 +226,9 @@ public class VehicleMonitorListDataModel : Decodable {
var taskStatus : Int var taskStatus : Int
var taskStatusString : String var taskStatusString : String
var flowId : Int var flowId : Int
var vehiclePointLongitude : Double var vehiclePointLongitude : Double?
var vehiclePointLatitude : Double var vehiclePointLatitude : Double?
var vehiclePointAddress : String var vehiclePointAddress : String?
var destinationLongitude : Double? var destinationLongitude : Double?
var destinationLatitude : Double? var destinationLatitude : Double?
var destinationAddress : String? var destinationAddress : String?

6
OrderScheduling/Rescue/ViewController/DispatchOrderController.swift
View File

@@ -564,8 +564,8 @@ open class DispatchOrderController : ZDViewController {
private let userOrderId : Int private let userOrderId : Int
private let taskOrderId : Int private let taskOrderId : Int
private let serviceAddressLat : Double private let serviceAddressLat : Double?
private let serviceAddressLon : Double private let serviceAddressLon : Double?
private var resultArr : [DispatchVehicleListDataModel] = [] private var resultArr : [DispatchVehicleListDataModel] = []
@@ -582,7 +582,7 @@ open class DispatchOrderController : ZDViewController {
private let pannelPanGes = DDUIPanGestureRecognizer.init() /// 用于pannel的拖动效果 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.userOrderId = userOrderId
self.taskOrderId = taskOrderId self.taskOrderId = taskOrderId
self.serviceAddressLat = serviceAddressLat self.serviceAddressLat = serviceAddressLat

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

@@ -1376,7 +1376,9 @@ class VehicleMonitoringListDetailView : DDView, JXCategoryListContainerViewDeleg
func categoryView(_ categoryView: JXCategoryBaseView!, didSelectedItemAt index: Int) { func categoryView(_ categoryView: JXCategoryBaseView!, didSelectedItemAt index: Int) {
pageNumLabel.text = "\(index + 1)/\(taskModels.count)" pageNumLabel.text = "\(index + 1)/\(taskModels.count)"
let taskModel = taskModels[index] 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] public var taskModels : [VehicleMonitorListDataModel.TaskModel]