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

中华联合和监控不在缩小图标

Browse Source
This commit is contained in:
ddisfriend
2024-09-10 16:58:27 +08:00
parent 68c4d51355
commit ac19826ef2
232 changed files with 8063 additions and 7876 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.DS_Store
Vendored
BIN
View File
Binary file not shown.
OrderScheduling.xcodeproj/project.pbxproj
+6 -10
View File
@@ -51,7 +51,6 @@
794FBB212A934E0A00D57BB8 /* AppUpdateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FBB202A934E0A00D57BB8 /* AppUpdateView.swift */; };
794FBB232A93519800D57BB8 /* AppUpdateTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 794FBB222A93519800D57BB8 /* AppUpdateTool.swift */; };
795B949B2BECDB56008F3205 /* NewTraining.swift in Sources */ = {isa = PBXBuildFile; fileRef = 795B949A2BECDB56008F3205 /* NewTraining.swift */; };
795FF3E02AA991E70058454C /* appointmentOrder.wav in Resources */ = {isa = PBXBuildFile; fileRef = 795FF3DF2AA991E70058454C /* appointmentOrder.wav */; };
79B966382AB0651C00308A8D /* VehicleLogoutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79B966372AB0651C00308A8D /* VehicleLogoutView.swift */; };
79CB07CC2AA8465A00154B61 /* UserPermission.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79CB07CB2AA8465A00154B61 /* UserPermission.swift */; };
79CECC122A89BD1A00B95D8B /* MessageCenterController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79CECC112A89BD1A00B95D8B /* MessageCenterController.swift */; };
@@ -161,7 +160,6 @@
794FBB202A934E0A00D57BB8 /* AppUpdateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUpdateView.swift; sourceTree = "<group>"; };
794FBB222A93519800D57BB8 /* AppUpdateTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppUpdateTool.swift; sourceTree = "<group>"; };
795B949A2BECDB56008F3205 /* NewTraining.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTraining.swift; sourceTree = "<group>"; };
795FF3DF2AA991E70058454C /* appointmentOrder.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = appointmentOrder.wav; sourceTree = "<group>"; };
79B966372AB0651C00308A8D /* VehicleLogoutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VehicleLogoutView.swift; sourceTree = "<group>"; };
79CB07CB2AA8465A00154B61 /* UserPermission.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPermission.swift; sourceTree = "<group>"; };
79CECC112A89BD1A00B95D8B /* MessageCenterController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageCenterController.swift; sourceTree = "<group>"; };
@@ -682,7 +680,6 @@
79DD0DAB2A94A0EE00768FE7 /* Source */ = {
isa = PBXGroup;
children = (
795FF3DF2AA991E70058454C /* appointmentOrder.wav */,
79FB760E2A9C6CAF00DB00A4 /* newJuheOrderAudio.wav */,
79FB76122A9C6CC100DB00A4 /* newOrderAudio.wav */,
);
@@ -913,7 +910,6 @@
files = (
79FB76102A9C6CAF00DB00A4 /* newJuheOrderAudio.wav in Resources */,
79EAD8172A7B86610036E093 /* LaunchScreen.storyboard in Resources */,
795FF3E02AA991E70058454C /* appointmentOrder.wav in Resources */,
7949FF172B5144B300B75A21 /* style.data in Resources */,
79EAD8142A7B86610036E093 /* Assets.xcassets in Resources */,
79FB76132A9C6CC100DB00A4 /* newOrderAudio.wav in Resources */,
@@ -1170,7 +1166,7 @@
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
FRAMEWORK_SEARCH_PATHS = (
@@ -1199,7 +1195,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.0.4;
MARKETING_VERSION = 4.0.5;
PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1385,7 +1381,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
@@ -1416,7 +1412,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.0.4;
MARKETING_VERSION = 4.0.5;
PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1444,7 +1440,7 @@
CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV;
FRAMEWORK_SEARCH_PATHS = (
@@ -1473,7 +1469,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.0.4;
MARKETING_VERSION = 4.0.5;
PRODUCT_BUNDLE_IDENTIFIER = com.sino.supplier;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
Generated
BIN
View File
Binary file not shown.
OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+128 -64
View File
@@ -222,8 +222,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1056"
endingLineNumber = "1056"
startingLineNumber = "1081"
endingLineNumber = "1081"
landmarkName = "collectionView(_:cellForItemAt:)"
landmarkType = "7">
</BreakpointContent>
@@ -814,8 +814,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "272"
endingLineNumber = "272"
startingLineNumber = "297"
endingLineNumber = "297"
landmarkName = "entry(model:remarkId:)"
landmarkType = "7">
</BreakpointContent>
@@ -1326,8 +1326,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1067"
endingLineNumber = "1067"
startingLineNumber = "1092"
endingLineNumber = "1092"
landmarkName = "collectionView(_:didSelectItemAt:)"
landmarkType = "7">
</BreakpointContent>
@@ -1374,8 +1374,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "347"
endingLineNumber = "347"
startingLineNumber = "372"
endingLineNumber = "372"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -1390,8 +1390,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "336"
endingLineNumber = "336"
startingLineNumber = "361"
endingLineNumber = "361"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -1406,8 +1406,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "338"
endingLineNumber = "338"
startingLineNumber = "363"
endingLineNumber = "363"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -1502,8 +1502,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "96"
endingLineNumber = "96"
startingLineNumber = "121"
endingLineNumber = "121"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2254,8 +2254,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1003"
endingLineNumber = "1003"
startingLineNumber = "1028"
endingLineNumber = "1028"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
</BreakpointContent>
@@ -2270,8 +2270,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1008"
endingLineNumber = "1008"
startingLineNumber = "1033"
endingLineNumber = "1033"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
</BreakpointContent>
@@ -2558,8 +2558,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "229"
endingLineNumber = "229"
startingLineNumber = "254"
endingLineNumber = "254"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2574,8 +2574,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "236"
endingLineNumber = "236"
startingLineNumber = "261"
endingLineNumber = "261"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2590,8 +2590,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "108"
endingLineNumber = "108"
startingLineNumber = "133"
endingLineNumber = "133"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2606,8 +2606,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "107"
endingLineNumber = "107"
startingLineNumber = "132"
endingLineNumber = "132"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2622,8 +2622,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "381"
endingLineNumber = "381"
startingLineNumber = "406"
endingLineNumber = "406"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2638,8 +2638,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "391"
endingLineNumber = "391"
startingLineNumber = "416"
endingLineNumber = "416"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2654,8 +2654,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "315"
endingLineNumber = "315"
startingLineNumber = "340"
endingLineNumber = "340"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -2910,8 +2910,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "2036"
endingLineNumber = "2036"
startingLineNumber = "2062"
endingLineNumber = "2062"
landmarkName = "init(style:reuseIdentifier:)"
landmarkType = "7">
</BreakpointContent>
@@ -2926,8 +2926,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "2043"
endingLineNumber = "2043"
startingLineNumber = "2069"
endingLineNumber = "2069"
landmarkName = "init(style:reuseIdentifier:)"
landmarkType = "7">
</BreakpointContent>
@@ -2942,8 +2942,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "682"
endingLineNumber = "682"
startingLineNumber = "707"
endingLineNumber = "707"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
</BreakpointContent>
@@ -3022,8 +3022,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "995"
endingLineNumber = "995"
startingLineNumber = "1020"
endingLineNumber = "1020"
landmarkName = "tableView(_:cellForRowAt:)"
landmarkType = "7">
</BreakpointContent>
@@ -3822,8 +3822,8 @@
filePath = "OrderScheduling/Global/GroupData/GroupData.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "97"
endingLineNumber = "97"
startingLineNumber = "91"
endingLineNumber = "91"
landmarkName = "newMessageSound"
landmarkType = "24">
</BreakpointContent>
@@ -3854,8 +3854,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "367"
endingLineNumber = "367"
startingLineNumber = "392"
endingLineNumber = "392"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -3870,8 +3870,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1111"
endingLineNumber = "1111"
startingLineNumber = "1137"
endingLineNumber = "1137"
landmarkName = "addSubviews()"
landmarkType = "7">
</BreakpointContent>
@@ -3886,8 +3886,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1140"
endingLineNumber = "1140"
startingLineNumber = "1166"
endingLineNumber = "1166"
landmarkName = "addSubviews()"
landmarkType = "7">
</BreakpointContent>
@@ -3902,8 +3902,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1193"
endingLineNumber = "1193"
startingLineNumber = "1219"
endingLineNumber = "1219"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
@@ -3918,8 +3918,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1233"
endingLineNumber = "1233"
startingLineNumber = "1259"
endingLineNumber = "1259"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
@@ -3934,8 +3934,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1271"
endingLineNumber = "1271"
startingLineNumber = "1297"
endingLineNumber = "1297"
landmarkName = "viewDidLoad()"
landmarkType = "7">
</BreakpointContent>
@@ -3966,8 +3966,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1254"
endingLineNumber = "1254"
startingLineNumber = "1280"
endingLineNumber = "1280"
landmarkName = "RescuePendingDispatchController"
landmarkType = "3">
</BreakpointContent>
@@ -3998,8 +3998,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "497"
endingLineNumber = "497"
startingLineNumber = "522"
endingLineNumber = "522"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
</BreakpointContent>
@@ -4014,8 +4014,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "494"
endingLineNumber = "494"
startingLineNumber = "519"
endingLineNumber = "519"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
</BreakpointContent>
@@ -4030,8 +4030,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "483"
endingLineNumber = "483"
startingLineNumber = "508"
endingLineNumber = "508"
landmarkName = "listContainerView(_:initListFor:)"
landmarkType = "7">
</BreakpointContent>
@@ -4574,8 +4574,8 @@
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "230"
endingLineNumber = "230"
startingLineNumber = "255"
endingLineNumber = "255"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
@@ -4660,5 +4660,69 @@
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "C97F65BA-CF53-4460-8D2C-518BAB0CAB5A"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderSchedulingNotificationService/NotificationService.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "20"
endingLineNumber = "20"
landmarkName = "didReceive(_:withContentHandler:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "40A62922-7BBE-47C7-BCAB-F6D51BD8169D"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderSchedulingNotificationService/NotificationService.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "41"
endingLineNumber = "41"
landmarkName = "didReceive(_:withContentHandler:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "D7EBE8BC-7E4D-48EC-8E10-FFA59494A7DF"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "122"
endingLineNumber = "122"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "061E80D7-413E-4129-94BC-0D48E2539709"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "123"
endingLineNumber = "123"
landmarkName = "addActions()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
OrderScheduling/Global/GroupData/GroupData.swift
+4 -10
View File
@@ -34,23 +34,17 @@ open class GroupData {
// 判断新推送是不是新订单
func isOrderPushNotification(userInfo:[AnyHashable:Any]?) -> Bool {
if let userInfo {
if let dict = parserAlertToDictionary(userInfo: userInfo), dict[pushNoti_title_key] == pushNoti_newOrder_key {
return true
}
if let string = parserAlertToString(userInfo: userInfo), string.contains(pushNoti_newOrder_key) == true {
if let dict = parserAlertToDictionary(userInfo: userInfo), dict[pushNoti_pushType_key] == "1" {
return true
}
}
return false
}
// 判断新推送是不是预约订单
func isAppointmentPushNotification(userInfo:[AnyHashable:Any]?) -> Bool {
// 判断新推送是不是取消订单
func isCancelOrderPushNotification(userInfo:[AnyHashable:Any]?) -> Bool {
if let userInfo {
if let dict = parserAlertToDictionary(userInfo: userInfo), dict[pushNoti_title_key] == pushNoti_appointmentOrder_key {
return true
}
if let string = parserAlertToString(userInfo: userInfo), string.contains(pushNoti_appointmentOrder_key) == true {
if let dict = parserAlertToDictionary(userInfo: userInfo), dict[pushNoti_pushType_key] == "8" {
return true
}
}
OrderScheduling/HttpRequestCenter/ApiList.swift
+4
View File
@@ -61,4 +61,8 @@ open class ApiList {
public let vehicleLogout = "/supplierAppV2/dispatchApp/order/vehicleLogout"
public let jumpNewTrain = "/supplierAppV2/dispatchApp/user/jumpNewTrain"
public let giveUpUserOrder = "/supplierAppV2/dispatchApp/order/giveUpUserOrder"
public let appPushRecordList = "/supplierAppV2/dispatchApp/order/appPushRecordList"
}
OrderScheduling/HttpRequestCenter/ParametersList.swift
+5
View File
@@ -225,3 +225,8 @@ public struct UploadCallRecordParameters : Encodable {
public struct VehicleLogoutParameters : Encodable {
var vehicleId : Int
}
public struct GiveUpUserOrderParameters : Encodable {
var userOrderId : Int?
var taskOrderId : Int?
}
OrderScheduling/HttpRequestCenter/RequestList.swift
+8
View File
@@ -128,4 +128,12 @@ open class RequestList {
func jumpNewTrain() -> Single<ResponseModel<Bool>?> {
return DDAF.post(urlString: HOST+API.jumpNewTrain,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<Bool>.self)
}
func giveUpUserOrder<P:Encodable>(parameters:P) -> Single<ResponseModel<String>?> {
return DDAF.post(urlString: HOST+API.giveUpUserOrder,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self)
}
func appPushRecordList() -> Single<ResponseModel<[AppPushRecordListDataModel]>?> {
return DDAF.post(urlString: HOST+API.appPushRecordList,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[AppPushRecordListDataModel]>.self)
}
}
OrderScheduling/HttpResponseModel/ResponseModel.swift
+26 -1
View File
@@ -321,4 +321,29 @@ public class UserOperationPermissionsDataModel : Decodable {
}
}
public class AppPushRecordListDataModel : Decodable {
var id : Int?
var orderId : Int?
var orderCode : String?
var supplierId : Int?
var appType : Int?
var pushType : String?
var pushPayload : String?
var pushPayloadObj : AppPushRecordListDataPayloadModel?
var regId : String?
var deviceId : String?
var pushResult : String?
var pushState : Int?
var pushTime : String?
var handleTime : String?
var handleUser : String?
public class AppPushRecordListDataPayloadModel : Decodable {
var id : Int?
var userOrderId : Int?
var taskOrderId : Int?
var cancelButtonText : String?
var confirmButtonText : String?
var title : String?
var content : String?
}
}
OrderScheduling/Rescue/View/PushNotiCommonTool.swift
+63 -1
View File
@@ -17,6 +17,8 @@ open class PushNotiCommonTool : NSObject {
func open(userInfo:[AnyHashable:Any]?) {
let commonView = PushNotiCommonView()
var userOrderId : Int?
var taskOrderId : Int?
if let dict = GROUP.parserAlertToDictionary(userInfo: userInfo) {
if let title = dict[pushNoti_title_key] {
commonView.titleLabel.text = title
@@ -24,6 +26,12 @@ open class PushNotiCommonTool : NSObject {
if let body = dict[pushNoti_body_key] {
commonView.contentLabel.text = body
}
if let orderId = dict[pushNoti_orderId_key] {
userOrderId = Int(orderId)
}
if let taskId = dict[pushNoti_orderId_key] {
taskOrderId = Int(taskId)
}
}
if let cancel = (userInfo?[pushNoti_cancelButtonText_key] as? String) {
commonView.cancelButton.setTitle(cancel, for: .normal)
@@ -43,8 +51,11 @@ open class PushNotiCommonTool : NSObject {
.disposed(by: disposeBag)
commonView.sureButton.rx.tap
.flatMapLatest({ _ in
return (GROUP.isCancelOrderPushNotification(userInfo: userInfo) == true) ? RQ.giveUpUserOrder(parameters: GiveUpUserOrderParameters(userOrderId: userOrderId,taskOrderId: taskOrderId)) : Single.just(nil)
})
.observe(on: MainScheduler.instance)
.subscribe(onNext: {
.subscribe(onNext: { _ in
ENTRY.dismiss(name: pushNotiCommonViewEntry) {
// 停止声音播放
TOOL.stopVoice()
@@ -54,4 +65,55 @@ open class PushNotiCommonTool : NSObject {
ENTRY.showPushNotiCommonEntry(view: commonView,name: pushNotiCommonViewEntry)
}
func open(model:AppPushRecordListDataModel?,continueHandler: (() -> Void)? = nil) {
let commonView = PushNotiCommonView()
var userOrderId : Int?
var taskOrderId : Int?
if let title = model?.pushPayloadObj?.title {
commonView.titleLabel.text = title
}
if let body = model?.pushPayloadObj?.content {
commonView.contentLabel.text = body
}
if let orderId = model?.pushPayloadObj?.userOrderId {
userOrderId = Int(orderId)
}
if let taskId = model?.pushPayloadObj?.taskOrderId {
taskOrderId = Int(taskId)
}
if let cancel = model?.pushPayloadObj?.cancelButtonText {
commonView.cancelButton.setTitle(cancel, for: .normal)
}
if let sure = model?.pushPayloadObj?.confirmButtonText {
commonView.sureButton.setTitle(sure, for: .normal)
}
commonView.cancelButton.rx.tap
.observe(on: MainScheduler.instance)
.subscribe(onNext: {
ENTRY.dismiss(name: pushNotiCommonViewEntry) {
// 停止声音播放
TOOL.stopVoice()
}
})
.disposed(by: disposeBag)
commonView.sureButton.rx.tap
.flatMapLatest({ _ in
return RQ.giveUpUserOrder(parameters: GiveUpUserOrderParameters(userOrderId: userOrderId,taskOrderId: taskOrderId))
})
.observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in
ENTRY.dismiss(name: pushNotiCommonViewEntry) {
// 停止声音播放
TOOL.stopVoice()
continueHandler?()
}
})
.disposed(by: disposeBag)
ENTRY.showPushNotiCommonEntry(view: commonView,name: pushNotiCommonViewEntry)
}
}
OrderScheduling/Rescue/ViewController/RescueController.swift
+27 -1
View File
@@ -84,8 +84,33 @@ extension RescueController {
.disposed(by: disposeBag)
USER.refreshTokenSub
.subscribe(onNext: { _ in
.subscribe(onNext: {[weak self] _ in
NewTraining.default.newTrainingRelay.accept(nil)
self?.appPushRecordRelay.accept(nil)
})
.disposed(by: disposeBag)
appPushRecordRelay
.flatMapLatest { _ in
return RQ.appPushRecordList()
}
.observe(on: MainScheduler.instance)
.subscribe(onNext: {[weak self] response in
if response?.success == true {
var flag = false
if (response?.data?.count ?? 0) > 1 {
flag = true
}
if let model = response?.data?.first {
PushNotiCommonTool.default.open(model: model) {[weak self] in
if flag == true {
self?.appPushRecordRelay.accept(nil)
}
}
}
}else{
self?.view.dd_makeToast(response?.msg)
}
})
.disposed(by: disposeBag)
@@ -1085,6 +1110,7 @@ class RescueController : ZDViewController {
private var isRescueTableView : DDTableView?
private var preRefreshRelay = ReplayRelay<Any?>.create(bufferSize: 1)
private var appPushRecordRelay = ReplayRelay<Any?>.create(bufferSize: 1)
override func viewDidLoad() {
super.viewDidLoad()
OrderScheduling/Source/appointmentOrder.wav
BIN
View File
Binary file not shown.
OrderScheduling/Strings/CommonKeyStrings.swift
+6 -5
View File
@@ -20,10 +20,6 @@ public let pushNoti_juheVehcileName_key = "juheVehcileName"
public let pushNoti_taskCode_key = "taskCode"
public let pushNoti_newOrder_key = "新订单"
public let pushNoti_appointmentOrder_key = "预约订单提醒"
public let pushNoti_broadcastKeywords_key = "broadcastKeywords"
public let pushNoti_isShowPop_key = "isShowPop"
@@ -34,12 +30,17 @@ public let pushNoti_confirmButtonText_key = "confirmButtonText"
public let pushNoti_cancelButtonText_key = "cancelButtonText"
public let pushNoti_orderId_key = "orderId"
public let pushNoti_taskId_key = "taskId"
public let pushNoti_pushType_key = "pushType"
// 本地音频的键
public let newJuheOrderAudio_key = "newJuheOrderAudio.wav"
public let newOrderAudio_key = "newOrderAudio.wav"
public let appointmentOrderAudio_key = "appointmentOrder.wav"
// 电话消息的键
public let noti_isCallSuccess_key = "isCallSuccess"
OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
+13 -13
View File
@@ -303,18 +303,18 @@ extension VehicleMonitoringController : DDMAMapViewDelegate {
}
public func dd_mapView(_ mapView: MAMapView, mapDidZoomByUser wasUserAction: Bool) {
/// 缩小过一次后就不需要频繁调用移除添加
if mapView.zoomLevel <= 14 {
shouldShowSmallAnnotation = true
if isShowSmallAnnotation == false {
let annotations = mapView.annotations
mapView.removeAnnotations(annotations)
mapView.addAnnotations(annotations)
isShowSmallAnnotation = true
}
}else{
// //// 缩小过一次后就不需要频繁调用移除添加
// if mapView.zoomLevel <= 14 {
// shouldShowSmallAnnotation = true
//
// if isShowSmallAnnotation == false {
// let annotations = mapView.annotations
// mapView.removeAnnotations(annotations)
// mapView.addAnnotations(annotations)
//
// isShowSmallAnnotation = true
// }
// }else{
shouldShowSmallAnnotation = false
if isShowSmallAnnotation == true {
@@ -323,7 +323,7 @@ extension VehicleMonitoringController : DDMAMapViewDelegate {
mapView.addAnnotations(annotations)
isShowSmallAnnotation = false
}
}
// }
}
}
OrderSchedulingNotificationService/NotificationService.swift
-16
View File
@@ -61,16 +61,8 @@ class NotificationService: UNNotificationServiceExtension {
}
}
// 语音播报能力不具备，只播放默认声音
if GROUP.isAppointmentPushNotification(userInfo: userInfo) == true {
bestAttemptContent.sound = UNNotificationSound(named: UNNotificationSoundName(rawValue: appointmentOrderAudio_key))
contentHandler(bestAttemptContent)
}else if let broadcastKeywords = (userInfo[pushNoti_broadcastKeywords_key] as? String),broadcastKeywords.isEmpty == false {
bestAttemptContent.sound = .default
contentHandler(bestAttemptContent)
}else{
bestAttemptContent.sound = .default
contentHandler(bestAttemptContent)
}
}
}
}
@@ -116,16 +108,8 @@ class NotificationService: UNNotificationServiceExtension {
}
}
// 语音播报能力不具备，只播放默认声音
if GROUP.isAppointmentPushNotification(userInfo: userInfo) == true {
bestAttemptContent.sound = UNNotificationSound(named: UNNotificationSoundName(rawValue: appointmentOrderAudio_key))
contentHandler(bestAttemptContent)
}else if let broadcastKeywords = (userInfo[pushNoti_broadcastKeywords_key] as? String),broadcastKeywords.isEmpty == false {
bestAttemptContent.sound = .default
contentHandler(bestAttemptContent)
}else{
bestAttemptContent.sound = .default
contentHandler(bestAttemptContent)
}
}
}
}
Podfile
+1 -1
View File
@@ -13,7 +13,7 @@ target 'OrderScheduling' do
pod 'DDColorKit_Private'
pod 'DDFontKit_Private'
pod 'IQKeyboardManagerSwift'
pod 'DDMAMapKit_Private', :path => '/Users/zd/Desktop/PodRepository/DDMAMapKit_Private'
pod 'DDMAMapKit_Private'
pod 'SnapKit'
pod 'DDAutoUIKit_Private'
pod 'RxSwift'
Podfile.lock
+36 -46
View File
@@ -3,9 +3,9 @@ PODS:
- AMapFoundation-NO-IDFA (1.8.2)
- AMapLocation-NO-IDFA (2.10.0):
- AMapFoundation-NO-IDFA (>= 1.8.0)
- AMapNavi-NO-IDFA (10.0.600):
- AMapNavi-NO-IDFA (10.0.800):
- AMapFoundation-NO-IDFA (>= 1.8.2)
- AMapSearch-NO-IDFA (9.7.0):
- AMapSearch-NO-IDFA (9.7.2):
- AMapFoundation-NO-IDFA (>= 1.8.0)
- AMapTrack-NO-IDFA (1.4.2):
- AMapFoundation-NO-IDFA (>= 1.6.4)
@@ -210,55 +210,48 @@ PODS:
- DDLogKit_Private/SwiftLog (= 0.1.4)
- DDLogKit_Private/OCLog (0.1.4)
- DDLogKit_Private/SwiftLog (0.1.4)
- DDMAMapKit_Private (0.2.4):
- DDMAMapKit_Private/DDMALocation (= 0.2.4)
- DDMAMapKit_Private/DDMAMap (= 0.2.4)
- DDMAMapKit_Private/DDMANaviManager (= 0.2.4)
- DDMAMapKit_Private/DDMASearch (= 0.2.4)
- DDMAMapKit_Private/DDMATrackManager (= 0.2.4)
- DDMAMapKit_Private/DDMAUtil (= 0.2.4)
- DDMAMapKit_Private/DDMALocation (0.2.4):
- DDMAMapKit_Private (0.2.7):
- DDMAMapKit_Private/DDMALocation (= 0.2.7)
- DDMAMapKit_Private/DDMAMap (= 0.2.7)
- DDMAMapKit_Private/DDMANaviManager (= 0.2.7)
- DDMAMapKit_Private/DDMASearch (= 0.2.7)
- DDMAMapKit_Private/DDMATrackManager (= 0.2.7)
- DDMAMapKit_Private/DDMAUtil (= 0.2.7)
- DDMAMapKit_Private/DDMALocation (0.2.7):
- AMapLocation-NO-IDFA (= 2.10.0)
- DDMAMapKit_Private/DDMAMap (0.2.4):
- "DDCategoryKit_Private/UIImage+DDCategory"
- DDMAMapKit_Private/DDMAMap/Annotation (= 0.2.4)
- DDMAMapKit_Private/DDMAMap/AnnotationView (= 0.2.4)
- DDMAMapKit_Private/DDMAMap/MapView (= 0.2.4)
- DDMAMapKit_Private/DDMAMap/Overlay (= 0.2.4)
- DDMAMapKit_Private/DDMAMap/Sources (= 0.2.4)
- DDMAMapKit_Private/DDMAMap/Trace (= 0.2.4)
- DDMAMapKit_Private/DDMAMap (0.2.7):
- DDMAMapKit_Private/DDMAMap/Annotation (= 0.2.7)
- DDMAMapKit_Private/DDMAMap/AnnotationView (= 0.2.7)
- DDMAMapKit_Private/DDMAMap/MapView (= 0.2.7)
- DDMAMapKit_Private/DDMAMap/Overlay (= 0.2.7)
- DDMAMapKit_Private/DDMAMap/Sources (= 0.2.7)
- DDMAMapKit_Private/DDMAMap/Trace (= 0.2.7)
- DDMAMapKit_Private/DDMANaviManager
- DDMAMapKit_Private/DDMAMap/Annotation (0.2.4):
- "DDCategoryKit_Private/UIImage+DDCategory"
- DDMAMapKit_Private/DDMAMap/Annotation (0.2.7):
- DDMAMapKit_Private/DDMANaviManager
- DDMAMapKit_Private/DDMAMap/AnnotationView (0.2.4):
- "DDCategoryKit_Private/UIImage+DDCategory"
- DDMAMapKit_Private/DDMAMap/AnnotationView (0.2.7):
- DDMAMapKit_Private/DDMANaviManager
- DDMAMapKit_Private/DDMAMap/MapView (0.2.4):
- "DDCategoryKit_Private/UIImage+DDCategory"
- DDMAMapKit_Private/DDMAMap/MapView (0.2.7):
- DDMAMapKit_Private/DDMAMap/Annotation
- DDMAMapKit_Private/DDMAMap/AnnotationView
- DDMAMapKit_Private/DDMAMap/Overlay
- DDMAMapKit_Private/DDMAMap/Sources
- DDMAMapKit_Private/DDMAMap/Trace
- DDMAMapKit_Private/DDMANaviManager
- DDMAMapKit_Private/DDMAMap/Overlay (0.2.4):
- "DDCategoryKit_Private/UIImage+DDCategory"
- DDMAMapKit_Private/DDMAMap/Overlay (0.2.7):
- DDMAMapKit_Private/DDMANaviManager
- DDMAMapKit_Private/DDMAMap/Sources (0.2.4):
- "DDCategoryKit_Private/UIImage+DDCategory"
- DDMAMapKit_Private/DDMAMap/Sources (0.2.7):
- DDMAMapKit_Private/DDMANaviManager
- DDMAMapKit_Private/DDMAMap/Trace (0.2.4):
- "DDCategoryKit_Private/UIImage+DDCategory"
- DDMAMapKit_Private/DDMAMap/Trace (0.2.7):
- DDMAMapKit_Private/DDMANaviManager
- DDMAMapKit_Private/DDMANaviManager (0.2.4):
- DDMAMapKit_Private/DDMANaviManager (0.2.7):
- AMapFoundation-NO-IDFA (= 1.8.2)
- AMapNavi-NO-IDFA (= 10.0.600)
- DDMAMapKit_Private/DDMASearch (0.2.4):
- AMapSearch-NO-IDFA (= 9.7.0)
- DDMAMapKit_Private/DDMATrackManager (0.2.4):
- AMapNavi-NO-IDFA (= 10.0.800)
- DDMAMapKit_Private/DDMASearch (0.2.7):
- AMapSearch-NO-IDFA (= 9.7.2)
- DDMAMapKit_Private/DDMATrackManager (0.2.7):
- AMapTrack-NO-IDFA (= 1.4.2)
- DDMAMapKit_Private/DDMAUtil (0.2.4):
- DDMAMapKit_Private/DDMAUtil (0.2.7):
- DDMAMapKit_Private/DDMAMap
- DDNetworkingOfAlamofireKit_Private (0.2.1):
- Alamofire
@@ -333,7 +326,7 @@ DEPENDENCIES:
- DDControlsKit_Private (= 0.1.4)
- DDDateKit_Private
- DDFontKit_Private
- DDMAMapKit_Private (from `/Users/zd/Desktop/PodRepository/DDMAMapKit_Private`)
- DDMAMapKit_Private
- DDNetworkingOfAlamofireKit_Private
- DDPersistenceKit_Private
- DDProgressHUDKit_Private
@@ -368,6 +361,7 @@ SPEC REPOS:
- DDDateKit_Private
- DDFontKit_Private
- DDLogKit_Private
- DDMAMapKit_Private
- DDNetworkingOfAlamofireKit_Private
- DDPersistenceKit_Private
- DDProgressHUDKit_Private
@@ -401,16 +395,12 @@ SPEC REPOS:
- SwiftyRSA
- ZLPhotoBrowser
EXTERNAL SOURCES:
DDMAMapKit_Private:
:path: "/Users/zd/Desktop/PodRepository/DDMAMapKit_Private"
SPEC CHECKSUMS:
Alamofire: 3ca42e259043ee0dc5c0cdd76c4bc568b8e42af7
AMapFoundation-NO-IDFA: 6ce0ef596d4eb8d934ff498e56747b6de1247b05
AMapLocation-NO-IDFA: 735791aeb1ba52dff666e4158b86caf4b68b5be7
AMapNavi-NO-IDFA: 73e5daa43db59027f599ad4e59590b0ad0a0e79e
AMapSearch-NO-IDFA: 749f73d5a773758f01a24eb8872f8798c8b47cb4
AMapNavi-NO-IDFA: 11afbfa606171e804f0b98c358a44413d5c0ce1b
AMapSearch-NO-IDFA: bb8c40ee370efdc2e55a83d4a334e6428f26b8a7
AMapTrack-NO-IDFA: 7109cf1867f5d6c407c8191492b1f73101e1682e
BRPickerView: a0ff460bf092bc069db5a54153395b1f7e8f5300
Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da
@@ -423,7 +413,7 @@ SPEC CHECKSUMS:
DDDateKit_Private: f8348d10cec77ccacd2f5ec27d587ea2898ae90a
DDFontKit_Private: 7b8f4ebf0f60622874036202734d8460dc7b3806
DDLogKit_Private: 1ed442cc7be004bd05f27bfda9b525e113df54e0
DDMAMapKit_Private: c3b269542a14daf41dcbb92c41f83e676c6c5e7e
DDMAMapKit_Private: 5169a662319b4e1e8a2068d35c5f1d1b127fae3d
DDNetworkingOfAlamofireKit_Private: 652eb70a7d8bac81d77d036fabeb52f807120f6d
DDPersistenceKit_Private: c150822543ffa6ece3900178629812f64902ed90
DDProgressHUDKit_Private: 1e219062ddeb7801a4bb13b367efa1f3fbf17f1e
@@ -448,6 +438,6 @@ SPEC CHECKSUMS:
SwiftyRSA: 8c6dd1ea7db1b8dc4fb517a202f88bb1354bc2c6
ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b
PODFILE CHECKSUM: b067106a4676a3e3160413679e28a95aa08ace77
PODFILE CHECKSUM: b761c472715038dca820593e44c8ed57f7d5338d
COCOAPODS: 1.11.3
COCOAPODS: 1.15.2
Pods/.DS_Store
Generated Vendored
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_1_d_21_1680092748.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_1_d_21_1716369317.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_1_s_21_1680092748.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_1_s_21_1716369317.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_1_sh_21_1680057953.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_1_sh_21_1684757273.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_1_sh_l_21_1680057953.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_1_sh_l_21_1684757273.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_1_sh_m_21_1680057953.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_1_sh_m_21_1684757273.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_1_sl_21_1680092748.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_1_sl_21_1716369317.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_2_d_21_1680589176.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_2_d_21_1685432206.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_2_s_21_1680589176.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_2_s_21_1685432206.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_2_sh_21_1680057953.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_2_sh_21_1684757273.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_2_sh_l_21_1680057953.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_2_sh_l_21_1684757273.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_2_sh_m_21_1680057953.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_2_sh_m_21_1684757273.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_2_sl_21_1680589176.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_2_sl_21_1685432206.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_4_s_21_1678776087.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_4_s_21_1685348571.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_5_s_21_1678776244.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/style_5_s_21_1685348588.data
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMap.bundle/AMap3D.bundle/styleiconslist.data
Generated
+14 -14
View File
@@ -27,19 +27,19 @@ style_16_s_21_1678776309.data
style_17_s_21_1655347084.data
style_18_s_21_1678776921.data
style_19_s_21_1678776357.data
style_1_d_21_1680092748.data
style_1_s_21_1680092748.data
style_1_sh_21_1680057953.data
style_1_sh_l_21_1680057953.data
style_1_sh_m_21_1680057953.data
style_1_sl_21_1680092748.data
style_1_d_21_1716369317.data
style_1_s_21_1716369317.data
style_1_sh_21_1684757273.data
style_1_sh_l_21_1684757273.data
style_1_sh_m_21_1684757273.data
style_1_sl_21_1716369317.data
style_29_s_21_1679988739.data
style_2_d_21_1680589176.data
style_2_s_21_1680589176.data
style_2_sh_21_1680057953.data
style_2_sh_l_21_1680057953.data
style_2_sh_m_21_1680057953.data
style_2_sl_21_1680589176.data
style_2_d_21_1685432206.data
style_2_s_21_1685432206.data
style_2_sh_21_1684757273.data
style_2_sh_l_21_1684757273.data
style_2_sh_m_21_1684757273.data
style_2_sl_21_1685432206.data
style_35_s_21_1681131121.data
style_35_sh_21_1680057953.data
style_35_sl_21_1681131121.data
@@ -49,9 +49,9 @@ style_36_sl_21_1678777060.data
style_38_s_21_1678777083.data
style_39_s_21_1678777105.data
style_3_s_21_1678710524.data
style_4_s_21_1678776087.data
style_4_s_21_1685348571.data
style_50_s_21_1675145929.data
style_5_s_21_1678776244.data
style_5_s_21_1685348588.data
style_6_s_21_1678776860.data
style_8_s_21_1678776272.data
style_100_s_21_1670999202.data
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/AMapNavi.bundle/eyrie/horusAssets/cloudres/C1TemplateAssets/074b85d99fb1c889e8ee827913190cf3.xml
Generated
+1 -1
View File
File diff suppressed because one or more lines are too long
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/Headers/AMapNaviDriveManager.h
Generated
+3
View File
@@ -126,6 +126,9 @@ NS_ASSUME_NONNULL_BEGIN
///默认为10, 范围为[ 5, 15 ], 单位秒. 表示有连续的10s, 定位信号质量都比较差, 就会触发手机卫星定位信号弱的回调. 值越小, 就越容易触发. since 6.6.0
@property (nonatomic, assign) NSUInteger gpsWeakDetecedInterval __attribute__((deprecated("已废弃，since 7.8.0")));
///设置是否显示红绿灯倒计时。since 10.0.700
- (void)setIsOpenTrafficLight:(NSString *)key;
#pragma mark - Calculate Route
// 以下算路方法需要高德坐标(GCJ02)
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/Headers/AMapNaviVersion.h
Generated
+1 -1
View File
@@ -12,7 +12,7 @@
#ifndef AMapNaviVersion_h
#define AMapNaviVersion_h
#define AMapNaviVersionNumber 10000600
#define AMapNaviVersionNumber 10000800
#define AMapNaviFoundationVersionMinRequired 10802
#define AMapNavi3DMapVersionMinRequired 90000
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/Headers/MAMapVersion.h
Generated
+1 -1
View File
@@ -12,7 +12,7 @@
#ifndef MAMapVersion_h
#define MAMapVersion_h
#define MAMapVersionNumber 10000600
#define MAMapVersionNumber 10000800
#define MAMapMinRequiredFoundationVersion 10802
// 依赖库版本检测
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/Headers/MAMapView.h
Generated
+18
View File
@@ -20,6 +20,7 @@
#import "MAMapCustomStyleOptions.h"
#import <AMapFoundationKit/AMapServices.h>
#import "MABaseEngineOverlay.h"
#import "MAPoiFilter.h"
///地图类型
typedef NS_ENUM(NSInteger, MAMapType)
@@ -805,6 +806,23 @@ extern NSString * const kMAMapLayerCameraDegreeKey;
- (void)addEngineOverlay:(MABaseEngineOverlay *)overlay;
@end
@interface MAMapView (PoiFilter)
/**
* @brief 添加poi避让框
* @param poiFilter
*/
- (void)addPoiFilter:(MAPoiFilter *)poiFilter;
/**
* @brief 移除poi避让框
* @param keyName 名称
*/
- (void)removePoiFilter:(NSString *)keyName;
/**
* @brief 清除poi避让框
*/
- (void)clearPoiFilter;
@end
#pragma mark - MAMapViewDelegate
@protocol MAMapViewDelegate <NSObject>
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/Headers/MAOverlayPathRenderer.h
Generated
+2
View File
@@ -35,4 +35,6 @@
///虚线类型, since 5.5.0
@property (nonatomic, assign) MALineDashType lineDashType;
///是否抽稀，默认为YES，since 10.0.8000
@property (nonatomic, assign) BOOL reducePoint;
@end
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/Headers/MAPoiFilter.h
Generated
+29
View File
@@ -0,0 +1,29 @@
//
// MAPoiFilter.h
// MAMapKit
//
// Created by linshiqing on 2024/6/18.
// Copyright © 2024 Amap. All rights reserved.
//
#import <Foundation/Foundation.h>
@class MAMapView;
NS_ASSUME_NONNULL_BEGIN
typedef NS_OPTIONS(NSUInteger, MAPoiFilterType) {
MAPoiFilterTypePoi = 0x00000001, //!< 避让POI
MAPoiFilterTypeRoadName = 0x00000002, //!< 避让底图路名
MAPoiFilterTypeRoadShield = 0x00000004, //!< 避让路牌
MAPoiFilterTypeLabel3rd = 0x00000008, //!< 避让第三方label
MAPoiFilterTypeAll = 0xFFFFFFFF //!< 避让所有
};
@interface MAPoiFilter : NSObject
@property (nonatomic, assign) MAPoiFilterType filterType; //!< 避让类型
// 请将CLLocationCoordinate2D类型使用[NSValue valueWithMACoordinate:]包装下
@property (nonatomic, copy) NSArray<NSValue *> *position; //!< 四边形避让框坐标
@property (nonatomic, copy) NSString *keyName; //!< 避让框名称
+ (instancetype)poiFilter:(MAMapView *)mapView filterType:(MAPoiFilterType)filterType keyName:(NSString *)keyName center:(CLLocationCoordinate2D)center width:(CGFloat)width height:(CGFloat)height;
@end
NS_ASSUME_NONNULL_END
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/Headers/MARouteOverlayModel.h
Generated
+7 -7
View File
@@ -136,23 +136,23 @@ typedef NS_ENUM(NSInteger, MAMapRouteHighLightType) {
@property (nonatomic, assign) uint32_t roadClass; //!< 道路等级 4B
@end
@interface MAMapPoint2I : NSObject
@property (nonatomic, assign) int32_t x;
@property (nonatomic, assign) int32_t y;
@interface MAMapPoint2F : NSObject
@property (nonatomic, assign) CGFloat x;
@property (nonatomic, assign) CGFloat y;
@end
@interface MAMapPoint3I : MAMapPoint2I
@property (nonatomic, assign) int32_t z;
@interface MAMapPoint3F : MAMapPoint2F
@property (nonatomic, assign) CGFloat z;
@end
@interface MAMapRouteOverlayData : NSObject
@property (nonatomic, assign) uint32_t checkFlag;
@property (nonatomic, assign) uint32_t routeType;
@property (nonatomic, copy) NSArray<MAMapPoint2I *> *point2DArray;
@property (nonatomic, copy) NSArray<MAMapPoint2F *> *point2DArray;
@property (nonatomic, copy) NSArray<MAMapRouteOverlayTrafficState *> *trafficStateArray;
@property (nonatomic, copy) NSArray<MAMapRouteOverlayRoadName *> *roadNameArray;
@property (nonatomic, copy) NSArray<NSNumber *> *point2DFlagArray;
@property (nonatomic, copy) NSArray<MAMapPoint3I *> *point3DArray;
@property (nonatomic, copy) NSArray<MAMapPoint3F *> *point3DArray;
@property (nonatomic, copy) NSArray<NSNumber *> *point3DFlagArray;
@property (nonatomic, copy) NSArray<MAMapRouteOverlayColorIndex *> *colorIndexArray;
@end
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/Info.plist
Generated
BIN
View File
Binary file not shown.
Pods/AMapNavi-NO-IDFA/AMapNaviKit.framework/version.txt
Generated
+3 -3
View File
@@ -1,3 +1,3 @@
10.0.600+3dmap.145e9ead.1210
10.0.600+3dcom.145e9ead.1210
10.0.600+navi.9e599e8.1210
10.0.800+3dmap.289bb2fe.1210
10.0.800+3dcom.289bb2fe.1210
10.0.800+navi.1641873.1210
Pods/AMapSearch-NO-IDFA/AMapSearchKit.framework/AMapSearchKit
Generated
BIN
View File
Binary file not shown.
Pods/AMapSearch-NO-IDFA/AMapSearchKit.framework/Headers/AMapSearchVersion.h
Generated
+1 -1
View File
@@ -12,7 +12,7 @@
#ifndef AMapSearchVersion_h
#define AMapSearchVersion_h
#define AMapSearchVersionNumber 90700
#define AMapSearchVersionNumber 90702
#define AMapSearchMinRequiredFoundationVersion 10800
// 依赖库版本检测
Pods/AMapSearch-NO-IDFA/AMapSearchKit.framework/Info.plist
Generated
BIN
View File
Binary file not shown.
Pods/AMapSearch-NO-IDFA/AMapSearchKit.framework/Modules/module.modulemap
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
framework module AMapSearchKit {
umbrella header "AMapSearchKit.h"
export *
module * { export * }
}
Pods/AMapSearch-NO-IDFA/AMapSearchKit.framework/version.txt
Generated
+1 -1
View File
@@ -1 +1 @@
9.7.0+sea.bc644ac
9.7.2+sea.5c0f843
Pods/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMALocation/DDMALocationManager.m
Generated
+8 -8
View File
@@ -5,7 +5,7 @@
#import "DDMALocationManager.h"
#import <DDLogKit_Private/DDOCLog.h>
//#import <DDLogKit_Private/DDOCLog.h>
@interface DDMALocationManager ()<AMapLocationManagerDelegate>
@@ -82,29 +82,29 @@
- (void)ddMACombineManager:(AMapLocationManager *)manager locationManager:(CLLocationManager *_Nullable)locationManager didChangeAuthorization:(CLAuthorizationStatus)authorizationStatus accuracyAuthorization:(CLAccuracyAuthorization)accuracyAuthorization{
switch (authorizationStatus) {
case kCLAuthorizationStatusNotDetermined:
DDLog("当前定位权限 - kCLAuthorizationStatusNotDetermined");
// DDLog("当前定位权限 - kCLAuthorizationStatusNotDetermined");
break;
case kCLAuthorizationStatusDenied:
DDLog("当前定位权限 - kCLAuthorizationStatusDenied");
// DDLog("当前定位权限 - kCLAuthorizationStatusDenied");
break;
case kCLAuthorizationStatusRestricted:
DDLog("当前定位权限 - kCLAuthorizationStatusRestricted");
// DDLog("当前定位权限 - kCLAuthorizationStatusRestricted");
break;
case kCLAuthorizationStatusAuthorizedAlways:
DDLog("当前定位权限 - kCLAuthorizationStatusAuthorizedAlways");
// DDLog("当前定位权限 - kCLAuthorizationStatusAuthorizedAlways");
break;
case kCLAuthorizationStatusAuthorizedWhenInUse:
DDLog("当前定位权限 - kCLAuthorizationStatusAuthorizedWhenInUse");
// DDLog("当前定位权限 - kCLAuthorizationStatusAuthorizedWhenInUse");
break;
default:
break;
}
switch (accuracyAuthorization) {
case CLAccuracyAuthorizationFullAccuracy:
DDLog("当前精度 - CLAccuracyAuthorizationFullAccuracy");
// DDLog("当前精度 - CLAccuracyAuthorizationFullAccuracy");
break;
case CLAccuracyAuthorizationReducedAccuracy:
DDLog("当前精度 - CLAccuracyAuthorizationReducedAccuracy");
// DDLog("当前精度 - CLAccuracyAuthorizationReducedAccuracy");
break;
default:
break;
Pods/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/MapView/DDMAMapView.m
Generated
-1
View File
@@ -6,7 +6,6 @@
#import "DDMAMapView.h"
#import <objc/runtime.h>
#import <DDCategoryKit_Private/UIImage+DDCategory.h>
#import <DDMAMapKit_Private/MAPointAnnotation+DDCategory.h>
#import <DDMAMapKit_Private/MABaseOverlay+DDCategory.h>
#import <DDMAMapKit_Private/DriveRouteCustomAnnotationView.h>
Pods/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Trace/MATraceReplayOverlayRender.m
Generated
+11 -2
View File
@@ -11,7 +11,6 @@
#import "MATraceReplayOverlay+Addition.h"
#import <GLKit/GLKit.h>
#import <OpenGLES/ES2/gl.h>
#import <DDCategoryKit_Private/UIImage+DDCategory.h>
typedef struct _MADrawPoint {
float x;
@@ -53,7 +52,17 @@ typedef struct _MADrawPoint {
_patchLineRender = [[MAPolylineRenderer alloc] initWithPolyline:[traceOverlay getPatchPolyline]];
_patchLineRender.strokeColor = _proxyRender.strokeColors.lastObject;
_carImage = [UIImage dd_imageNamed:@"car_xingshi" bundleName:@"DDMAMapKit_Private" aClass:[self class]];
NSString *bundlePath = [[NSBundle bundleForClass:[self class]].resourcePath stringByAppendingPathComponent:@"DDMAMapKit_Private"];
NSString *bundleType = @".bundle";
if (![bundlePath hasSuffix:bundleType]) {
bundlePath = [bundlePath stringByAppendingString:bundleType];
}
NSBundle *sourceBundle = [NSBundle bundleWithPath:bundlePath];
if (sourceBundle == nil) {
return nil;
}
UIImage *image = [UIImage imageNamed:@"car_xingshi" inBundle:sourceBundle compatibleWithTraitCollection:nil];
_carImage = image;
}
return self;
Pods/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMANaviManager/DDMANaviManager.h
Generated
+11
View File
@@ -5,10 +5,19 @@
#import <Foundation/Foundation.h>
#import <AMapNaviKit/AMapNaviKit.h>
NS_ASSUME_NONNULL_BEGIN
struct CLLocationCoordinate2D;
@protocol DDAMapNaviCompositeManagerDelegate <NSObject>
@optional
- (void)dd_compositeManager:(AMapNaviCompositeManager *_Nonnull)compositeManager didStartNavi:(AMapNaviMode)naviMode;
- (void)dd_compositeManager:(AMapNaviCompositeManager *_Nonnull)compositeManager onDriveStrategyChanged:(AMapNaviDrivingStrategy)driveStrategy;
- (void)dd_compositeManagerOnCalculateRouteSuccess:(AMapNaviCompositeManager *_Nonnull)compositeManager;
@end
@interface DDMANaviManager : NSObject
+ (instancetype)shareManager;
+ (instancetype)new NS_UNAVAILABLE;
@@ -20,6 +29,8 @@ struct CLLocationCoordinate2D;
// 在创建该类实例前调用
+ (void)agreePrivacy;
@property (nonatomic, weak)id<DDAMapNaviCompositeManagerDelegate> delegate;
- (void)presentRoutePlanViewControllerFromCoordinate:(CLLocationCoordinate2D)fromCoordinate fromName:(nullable NSString *)fromName fromPOIId:(nullable NSString *)fromPOIId toCoordinate:(CLLocationCoordinate2D)toCoordinate toName:(nullable NSString *)toName toPOIId:(nullable NSString *)toPOIId startNaviDirectly:(BOOL)isDirectly;
@end
Pods/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMANaviManager/DDMANaviManager.m
Generated
+20
View File
@@ -58,6 +58,8 @@
[config setStartNaviDirectly:isDirectly];
[config setShowBackupRoute: NO];
//传入起点，并且带高德POIId
[config setRoutePlanPOIType:AMapNaviRoutePlanPOITypeStart location:[AMapNaviPoint locationWithLatitude:fromCoordinate.latitude longitude:fromCoordinate.longitude] name:fromName POIId:fromPOIId];
//传入终点，并且带高德POIId
@@ -79,4 +81,22 @@
[strongSelf.compositeManager dismissWithAnimated:YES];
});
}
- (void)compositeManager:(AMapNaviCompositeManager *_Nonnull)compositeManager didStartNavi:(AMapNaviMode)naviMode {
if ([self.delegate respondsToSelector:@selector(dd_compositeManager:didStartNavi:)]) {
[self.delegate dd_compositeManager:compositeManager didStartNavi:naviMode];
}
}
- (void)compositeManager:(AMapNaviCompositeManager *_Nonnull)compositeManager onDriveStrategyChanged:(AMapNaviDrivingStrategy)driveStrategy {
if ([self.delegate respondsToSelector:@selector(dd_compositeManager:onDriveStrategyChanged:)]) {
[self.delegate dd_compositeManager:compositeManager onDriveStrategyChanged:driveStrategy];
}
}
- (void)compositeManagerOnCalculateRouteSuccess:(AMapNaviCompositeManager *_Nonnull)compositeManager {
if ([self.delegate respondsToSelector:@selector(dd_compositeManagerOnCalculateRouteSuccess:)]) {
[self.delegate dd_compositeManagerOnCalculateRouteSuccess:compositeManager];
}
}
@end
Pods/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMATrackManager/DDMATrackManager.m
Generated
+24 -24
View File
@@ -5,7 +5,7 @@
#import "DDMATrackManager.h"
#import <DDLogKit_Private/DDOCLog.h>
//#import <DDLogKit_Private/DDOCLog.h>
@interface DDMATrackManager ()<AMapTrackManagerDelegate>
@property (nonatomic, strong)AMapTrackManager *trackManager;
@@ -75,14 +75,14 @@
//查询到结果，使用 Terminal ID
NSString *terminalID = [[[response terminals] firstObject] tid];
DDLog(@"--------------------------------LBS查询终端成功,terminalID = %@--------------------------------\n--------------------------------准备启动服务--------------------------------",terminalID);
// DDLog(@"--------------------------------LBS查询终端成功,terminalID = %@--------------------------------\n--------------------------------准备启动服务--------------------------------",terminalID);
//启动上报服务(service id)，参考下一步
self.terminalID = terminalID;
[self startService];
}
else {
DDLog(@"--------------------------------LBS查询终端为空--------------------------------\n--------------------------------准备创建终端--------------------------------");
// DDLog(@"--------------------------------LBS查询终端为空--------------------------------\n--------------------------------准备创建终端--------------------------------");
//查询结果为空，创建新的terminal
[self addTerminal:request.terminalName];
}
@@ -98,7 +98,7 @@
//创建终端结果
- (void)onAddTerminalDone:(AMapTrackAddTerminalRequest *)request response:(AMapTrackAddTerminalResponse *)response {
DDLog(@"--------------------------------LBS创建终端成功--------------------------------\n--------------------------------准备开启服务--------------------------------");
// DDLog(@"--------------------------------LBS创建终端成功--------------------------------\n--------------------------------准备开启服务--------------------------------");
//创建terminal成功
NSString *terminalID = [response terminalID];
@@ -111,32 +111,32 @@
- (void)didFailWithError:(NSError *)error associatedRequest:(id)request {
if ([request isKindOfClass:[AMapTrackQueryTerminalRequest class]]) {
//查询参数错误
DDLog(@"--------------------------------LBS查询终端失败--------------------------------");
// DDLog(@"--------------------------------LBS查询终端失败--------------------------------");
}
if ([request isKindOfClass:[AMapTrackAddTerminalRequest class]]) {
//创建terminal失败
DDLog(@"--------------------------------LBS创建终端失败--------------------------------");
// DDLog(@"--------------------------------LBS创建终端失败--------------------------------");
}
if ([request isKindOfClass:[AMapTrackAddTrackRequest class]]) {
//创建轨迹失败
DDLog(@"--------------------------------LBS创建轨迹失败--------------------------------");
// DDLog(@"--------------------------------LBS创建轨迹失败--------------------------------");
}
if ([request isKindOfClass:[AMapTrackQueryLastPointRequest class]]) {
//查询失败
DDLog(@"--------------------------------LBS查询最后位置失败--------------------------------");
// DDLog(@"--------------------------------LBS查询最后位置失败--------------------------------");
}
if ([request isKindOfClass:[AMapTrackQueryTrackDistanceRequest class]]) {
//查询失败
DDLog(@"--------------------------------LBS查询距离失败--------------------------------");
// DDLog(@"--------------------------------LBS查询距离失败--------------------------------");
}
if ([request isKindOfClass:[AMapTrackQueryTrackInfoRequest class]]) {
//查询轨迹点数据失败
DDLog(@"--------------------------------LBS查询历史轨迹点位数据失败--------------------------------");
// DDLog(@"--------------------------------LBS查询历史轨迹点位数据失败--------------------------------");
}
if (self.queryFailWithErrorOnDone) {
@@ -157,7 +157,7 @@
//创建轨迹成功，开始采集
self.trackID = response.trackID;
DDLog(@"---------------------------------创建轨迹成功----------------------------------")
// DDLog(@"---------------------------------创建轨迹成功----------------------------------")
if (self.addTrackOnDone != nil) {
self.addTrackOnDone(request, response);
@@ -183,8 +183,8 @@
- (void)startGatherAndPack{
if (self.trackID != nil) {
self.trackManager.trackID = self.trackID;
NSLog(@"轨迹id---------------%@",self.trackID);
DDLog(@"---------------------------------设置轨迹成功----------------------------------")
// NSLog(@"轨迹id---------------%@",self.trackID);
// DDLog(@"---------------------------------设置轨迹成功----------------------------------")
}
[self.trackManager startGatherAndPack];
}
@@ -196,13 +196,13 @@
//service 开启结果回调
- (void)onStartService:(AMapTrackErrorCode)errorCode {
if (errorCode == AMapTrackErrorOK) {
DDLog("--------------------------------开启猎鹰服务成功--------------------------------\n--------------------------------准备采集--------------------------------");
// DDLog("--------------------------------开启猎鹰服务成功--------------------------------\n--------------------------------准备采集--------------------------------");
// 已开启服务成功
self.isServing = YES;
} else {
//开始服务失败
DDLog("--------------------------------开启猎鹰服务失败--%ld",errorCode);
// DDLog("--------------------------------开启猎鹰服务失败--%ld",errorCode);
}
if (self.startServiceOnDone) {
self.startServiceOnDone(errorCode);
@@ -215,10 +215,10 @@
//关闭猎鹰服务成功
self.isServing = false;
DDLog(@"--------------------------------关闭猎鹰服务成功--------------------------------");
// DDLog(@"--------------------------------关闭猎鹰服务成功--------------------------------");
} else {
//关闭猎鹰服务失败
DDLog(@"--------------------------------关闭猎鹰服务失败--------------------------------");
// DDLog(@"--------------------------------关闭猎鹰服务失败--------------------------------");
}
if (self.stopServiceOnDone) {
@@ -231,10 +231,10 @@
if (errorCode == AMapTrackErrorOK) {
//开始采集成功
self.isGathering = YES;
DDLog(@"--------------------------------开始猎鹰采集成功--------------------------------");
// DDLog(@"--------------------------------开始猎鹰采集成功--------------------------------");
} else {
//开始采集失败
DDLog(@"--------------------------------开始猎鹰采集失败--------------------------------");
// DDLog(@"--------------------------------开始猎鹰采集失败--------------------------------");
}
if (self.startGatherAndPackOnDone) {
@@ -247,10 +247,10 @@
if (errorCode == AMapTrackErrorOK) {
//关闭采集成功
self.isGathering = NO;
DDLog(@"--------------------------------关闭猎鹰采集成功--------------------------------");
// DDLog(@"--------------------------------关闭猎鹰采集成功--------------------------------");
} else {
//关闭采集失败
DDLog(@"--------------------------------关闭猎鹰采集失败--------------------------------");
// DDLog(@"--------------------------------关闭猎鹰采集失败--------------------------------");
}
if (self.stopGatherAndPackOnDone) {
@@ -287,16 +287,16 @@
if (trackID != nil) {
request.trackID = self.trackManager.trackID;
}
DDLog(@"--------------------------------当前猎鹰查询distance:\n起始时间:%lld\n结束时间:%lld--------------------------------",startTime,endTime);
// DDLog(@"--------------------------------当前猎鹰查询distance:\n起始时间:%lld\n结束时间:%lld--------------------------------",startTime,endTime);
[self.trackManager AMapTrackQueryTrackDistance:request];
}
- (void)onQueryTrackDistanceDone:(AMapTrackQueryTrackDistanceRequest *)request response:(AMapTrackQueryTrackDistanceResponse *)response
{
//查询成功
DDLog(@"--------------------------------onQueryTrackDistanceDone%@--------------------------------", response.formattedDescription);
// DDLog(@"--------------------------------onQueryTrackDistanceDone%@--------------------------------", response.formattedDescription);
if (self.queryTrackDistanceOnDone != nil) {
DDLog(@"--------------------------------当前猎鹰查询distance:%lu--------------------------------",(unsigned long)response.distance);
// DDLog(@"--------------------------------当前猎鹰查询distance:%lu--------------------------------",(unsigned long)response.distance);
self.queryTrackDistanceOnDone(request, response);
}
}
Pods/Headers/Private/DDMAMapKit_Private/DDMAGeometry.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAUtil/DDMAGeometry.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAUtil/DDMAGeometry.h
Pods/Headers/Private/DDMAMapKit_Private/DDMALocationManager.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMALocation/DDMALocationManager.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMALocation/DDMALocationManager.h
Pods/Headers/Private/DDMAMapKit_Private/DDMAMapView.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/MapView/DDMAMapView.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/MapView/DDMAMapView.h
Pods/Headers/Private/DDMAMapKit_Private/DDMANaviManager.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMANaviManager/DDMANaviManager.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMANaviManager/DDMANaviManager.h
Pods/Headers/Private/DDMAMapKit_Private/DDMASearch.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMASearch/DDMASearch.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMASearch/DDMASearch.h
Pods/Headers/Private/DDMAMapKit_Private/DDMATrackManager.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMATrackManager/DDMATrackManager.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMATrackManager/DDMATrackManager.h
Pods/Headers/Private/DDMAMapKit_Private/DriveRouteCustomAnnotation.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Annotation/DriveRouteCustomAnnotation.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Annotation/DriveRouteCustomAnnotation.h
Pods/Headers/Private/DDMAMapKit_Private/DriveRouteCustomAnnotationView.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/AnnotationView/DriveRouteCustomAnnotationView.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/AnnotationView/DriveRouteCustomAnnotationView.h
Pods/Headers/Private/DDMAMapKit_Private/MABaseOverlay+DDCategory.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Overlay/MABaseOverlay+DDCategory.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Overlay/MABaseOverlay+DDCategory.h
Pods/Headers/Private/DDMAMapKit_Private/MAPointAnnotation+DDCategory.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Annotation/MAPointAnnotation+DDCategory.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Annotation/MAPointAnnotation+DDCategory.h
Pods/Headers/Private/DDMAMapKit_Private/MATraceReplayOverlay+Addition.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Trace/MATraceReplayOverlay+Addition.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Trace/MATraceReplayOverlay+Addition.h
Pods/Headers/Private/DDMAMapKit_Private/MATraceReplayOverlay.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Trace/MATraceReplayOverlay.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Trace/MATraceReplayOverlay.h
Pods/Headers/Private/DDMAMapKit_Private/MATraceReplayOverlayRender.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Trace/MATraceReplayOverlayRender.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Trace/MATraceReplayOverlayRender.h
Pods/Headers/Public/DDMAMapKit_Private/DDMAGeometry.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAUtil/DDMAGeometry.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAUtil/DDMAGeometry.h
Pods/Headers/Public/DDMAMapKit_Private/DDMALocationManager.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMALocation/DDMALocationManager.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMALocation/DDMALocationManager.h
Pods/Headers/Public/DDMAMapKit_Private/DDMAMapView.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/MapView/DDMAMapView.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/MapView/DDMAMapView.h
Pods/Headers/Public/DDMAMapKit_Private/DDMANaviManager.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMANaviManager/DDMANaviManager.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMANaviManager/DDMANaviManager.h
Pods/Headers/Public/DDMAMapKit_Private/DDMASearch.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMASearch/DDMASearch.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMASearch/DDMASearch.h
Pods/Headers/Public/DDMAMapKit_Private/DDMATrackManager.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMATrackManager/DDMATrackManager.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMATrackManager/DDMATrackManager.h
Pods/Headers/Public/DDMAMapKit_Private/DriveRouteCustomAnnotation.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Annotation/DriveRouteCustomAnnotation.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Annotation/DriveRouteCustomAnnotation.h
Pods/Headers/Public/DDMAMapKit_Private/DriveRouteCustomAnnotationView.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/AnnotationView/DriveRouteCustomAnnotationView.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/AnnotationView/DriveRouteCustomAnnotationView.h
Pods/Headers/Public/DDMAMapKit_Private/MABaseOverlay+DDCategory.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Overlay/MABaseOverlay+DDCategory.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Overlay/MABaseOverlay+DDCategory.h
Pods/Headers/Public/DDMAMapKit_Private/MAPointAnnotation+DDCategory.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Annotation/MAPointAnnotation+DDCategory.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Annotation/MAPointAnnotation+DDCategory.h
Pods/Headers/Public/DDMAMapKit_Private/MATraceReplayOverlay+Addition.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Trace/MATraceReplayOverlay+Addition.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Trace/MATraceReplayOverlay+Addition.h
Pods/Headers/Public/DDMAMapKit_Private/MATraceReplayOverlay.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Trace/MATraceReplayOverlay.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Trace/MATraceReplayOverlay.h
Pods/Headers/Public/DDMAMapKit_Private/MATraceReplayOverlayRender.h
Generated
+1 -1
View File
@@ -1 +1 @@
../../../../../../PodRepository/DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Trace/MATraceReplayOverlayRender.h
../../../DDMAMapKit_Private/DDMAMapKit_Private/Classes/DDMAMap/Trace/MATraceReplayOverlayRender.h
Pods/Local Podspecs/DDMAMapKit_Private.podspec.json
Generated
-136
View File
@@ -1,136 +0,0 @@
{
"name": "DDMAMapKit_Private",
"version": "0.2.4",
"summary": "A short description of DDMAMapKit_Private.",
"description": "TODO: Add long description of the pod here.",
"homepage": "https://github.com/DDIsFriend/DDMAMapKit_Private",
"license": {
"type": "MIT",
"file": "LICENSE"
},
"authors": {
"DDIsFriend": "DDIsFriend@163.com"
},
"source": {
"git": "git@bitbucket.org:ddisfriendly/mamapkit_private.git",
"tag": "0.2.4"
},
"platforms": {
"ios": "11.0"
},
"static_framework": true,
"pod_target_xcconfig": {
"VALID_ARCHS": "x86_64 armv7 arm64",
"EXCLUDED_ARCHS[sdk=iphonesimulator*]": "arm64",
"OTHER_LINKER_FLAGS": "$(inherited)",
"GCC_INPUT_FILETYPE": "sourcecode.cpp.objcpp"
},
"subspecs": [
{
"name": "DDMAMap",
"dependencies": {
"DDMAMapKit_Private/DDMANaviManager": [
],
"DDCategoryKit_Private/UIImage+DDCategory": [
]
},
"subspecs": [
{
"name": "MapView",
"source_files": "DDMAMapKit_Private/Classes/DDMAMap/MapView/*",
"dependencies": {
"DDMAMapKit_Private/DDMAMap/Annotation": [
],
"DDMAMapKit_Private/DDMAMap/Overlay": [
],
"DDMAMapKit_Private/DDMAMap/Trace": [
],
"DDMAMapKit_Private/DDMAMap/AnnotationView": [
],
"DDMAMapKit_Private/DDMAMap/Sources": [
]
}
},
{
"name": "Annotation",
"source_files": "DDMAMapKit_Private/Classes/DDMAMap/Annotation/*"
},
{
"name": "Overlay",
"source_files": "DDMAMapKit_Private/Classes/DDMAMap/Overlay/*"
},
{
"name": "Trace",
"source_files": "DDMAMapKit_Private/Classes/DDMAMap/Trace/*"
},
{
"name": "AnnotationView",
"source_files": "DDMAMapKit_Private/Classes/DDMAMap/AnnotationView/*"
},
{
"name": "Sources",
"resource_bundles": {
"DDMAMapKit_Private": [
"DDMAMapKit_Private/Assets/**"
]
}
}
]
},
{
"name": "DDMASearch",
"source_files": "DDMAMapKit_Private/Classes/DDMASearch/*",
"dependencies": {
"AMapSearch-NO-IDFA": [
"9.7.0"
]
}
},
{
"name": "DDMALocation",
"source_files": "DDMAMapKit_Private/Classes/DDMALocation/*",
"dependencies": {
"AMapLocation-NO-IDFA": [
"2.10.0"
]
}
},
{
"name": "DDMAUtil",
"source_files": "DDMAMapKit_Private/Classes/DDMAUtil/*",
"dependencies": {
"DDMAMapKit_Private/DDMAMap": [
]
}
},
{
"name": "DDMATrackManager",
"source_files": "DDMAMapKit_Private/Classes/DDMATrackManager/*",
"dependencies": {
"AMapTrack-NO-IDFA": [
"1.4.2"
]
}
},
{
"name": "DDMANaviManager",
"source_files": "DDMAMapKit_Private/Classes/DDMANaviManager",
"dependencies": {
"AMapNavi-NO-IDFA": [
"10.0.600"
],
"AMapFoundation-NO-IDFA": [
"1.8.2"
]
}
}
]
}
Pods/Manifest.lock
Generated
+36 -46
View File
@@ -3,9 +3,9 @@ PODS:
- AMapFoundation-NO-IDFA (1.8.2)
- AMapLocation-NO-IDFA (2.10.0):
- AMapFoundation-NO-IDFA (>= 1.8.0)
- AMapNavi-NO-IDFA (10.0.600):
- AMapNavi-NO-IDFA (10.0.800):
- AMapFoundation-NO-IDFA (>= 1.8.2)
- AMapSearch-NO-IDFA (9.7.0):
- AMapSearch-NO-IDFA (9.7.2):
- AMapFoundation-NO-IDFA (>= 1.8.0)
- AMapTrack-NO-IDFA (1.4.2):
- AMapFoundation-NO-IDFA (>= 1.6.4)
@@ -210,55 +210,48 @@ PODS:
- DDLogKit_Private/SwiftLog (= 0.1.4)
- DDLogKit_Private/OCLog (0.1.4)
- DDLogKit_Private/SwiftLog (0.1.4)
- DDMAMapKit_Private (0.2.4):
- DDMAMapKit_Private/DDMALocation (= 0.2.4)
- DDMAMapKit_Private/DDMAMap (= 0.2.4)
- DDMAMapKit_Private/DDMANaviManager (= 0.2.4)
- DDMAMapKit_Private/DDMASearch (= 0.2.4)
- DDMAMapKit_Private/DDMATrackManager (= 0.2.4)
- DDMAMapKit_Private/DDMAUtil (= 0.2.4)
- DDMAMapKit_Private/DDMALocation (0.2.4):
- DDMAMapKit_Private (0.2.7):
- DDMAMapKit_Private/DDMALocation (= 0.2.7)
- DDMAMapKit_Private/DDMAMap (= 0.2.7)
- DDMAMapKit_Private/DDMANaviManager (= 0.2.7)
- DDMAMapKit_Private/DDMASearch (= 0.2.7)
- DDMAMapKit_Private/DDMATrackManager (= 0.2.7)
- DDMAMapKit_Private/DDMAUtil (= 0.2.7)
- DDMAMapKit_Private/DDMALocation (0.2.7):
- AMapLocation-NO-IDFA (= 2.10.0)
- DDMAMapKit_Private/DDMAMap (0.2.4):
- "DDCategoryKit_Private/UIImage+DDCategory"
- DDMAMapKit_Private/DDMAMap/Annotation (= 0.2.4)
- DDMAMapKit_Private/DDMAMap/AnnotationView (= 0.2.4)
- DDMAMapKit_Private/DDMAMap/MapView (= 0.2.4)
- DDMAMapKit_Private/DDMAMap/Overlay (= 0.2.4)
- DDMAMapKit_Private/DDMAMap/Sources (= 0.2.4)
- DDMAMapKit_Private/DDMAMap/Trace (= 0.2.4)
- DDMAMapKit_Private/DDMAMap (0.2.7):
- DDMAMapKit_Private/DDMAMap/Annotation (= 0.2.7)
- DDMAMapKit_Private/DDMAMap/AnnotationView (= 0.2.7)
- DDMAMapKit_Private/DDMAMap/MapView (= 0.2.7)
- DDMAMapKit_Private/DDMAMap/Overlay (= 0.2.7)
- DDMAMapKit_Private/DDMAMap/Sources (= 0.2.7)
- DDMAMapKit_Private/DDMAMap/Trace (= 0.2.7)
- DDMAMapKit_Private/DDMANaviManager
- DDMAMapKit_Private/DDMAMap/Annotation (0.2.4):
- "DDCategoryKit_Private/UIImage+DDCategory"
- DDMAMapKit_Private/DDMAMap/Annotation (0.2.7):
- DDMAMapKit_Private/DDMANaviManager
- DDMAMapKit_Private/DDMAMap/AnnotationView (0.2.4):
- "DDCategoryKit_Private/UIImage+DDCategory"
- DDMAMapKit_Private/DDMAMap/AnnotationView (0.2.7):
- DDMAMapKit_Private/DDMANaviManager
- DDMAMapKit_Private/DDMAMap/MapView (0.2.4):
- "DDCategoryKit_Private/UIImage+DDCategory"
- DDMAMapKit_Private/DDMAMap/MapView (0.2.7):
- DDMAMapKit_Private/DDMAMap/Annotation
- DDMAMapKit_Private/DDMAMap/AnnotationView
- DDMAMapKit_Private/DDMAMap/Overlay
- DDMAMapKit_Private/DDMAMap/Sources
- DDMAMapKit_Private/DDMAMap/Trace
- DDMAMapKit_Private/DDMANaviManager
- DDMAMapKit_Private/DDMAMap/Overlay (0.2.4):
- "DDCategoryKit_Private/UIImage+DDCategory"
- DDMAMapKit_Private/DDMAMap/Overlay (0.2.7):
- DDMAMapKit_Private/DDMANaviManager
- DDMAMapKit_Private/DDMAMap/Sources (0.2.4):
- "DDCategoryKit_Private/UIImage+DDCategory"
- DDMAMapKit_Private/DDMAMap/Sources (0.2.7):
- DDMAMapKit_Private/DDMANaviManager
- DDMAMapKit_Private/DDMAMap/Trace (0.2.4):
- "DDCategoryKit_Private/UIImage+DDCategory"
- DDMAMapKit_Private/DDMAMap/Trace (0.2.7):
- DDMAMapKit_Private/DDMANaviManager
- DDMAMapKit_Private/DDMANaviManager (0.2.4):
- DDMAMapKit_Private/DDMANaviManager (0.2.7):
- AMapFoundation-NO-IDFA (= 1.8.2)
- AMapNavi-NO-IDFA (= 10.0.600)
- DDMAMapKit_Private/DDMASearch (0.2.4):
- AMapSearch-NO-IDFA (= 9.7.0)
- DDMAMapKit_Private/DDMATrackManager (0.2.4):
- AMapNavi-NO-IDFA (= 10.0.800)
- DDMAMapKit_Private/DDMASearch (0.2.7):
- AMapSearch-NO-IDFA (= 9.7.2)
- DDMAMapKit_Private/DDMATrackManager (0.2.7):
- AMapTrack-NO-IDFA (= 1.4.2)
- DDMAMapKit_Private/DDMAUtil (0.2.4):
- DDMAMapKit_Private/DDMAUtil (0.2.7):
- DDMAMapKit_Private/DDMAMap
- DDNetworkingOfAlamofireKit_Private (0.2.1):
- Alamofire
@@ -333,7 +326,7 @@ DEPENDENCIES:
- DDControlsKit_Private (= 0.1.4)
- DDDateKit_Private
- DDFontKit_Private
- DDMAMapKit_Private (from `/Users/zd/Desktop/PodRepository/DDMAMapKit_Private`)
- DDMAMapKit_Private
- DDNetworkingOfAlamofireKit_Private
- DDPersistenceKit_Private
- DDProgressHUDKit_Private
@@ -368,6 +361,7 @@ SPEC REPOS:
- DDDateKit_Private
- DDFontKit_Private
- DDLogKit_Private
- DDMAMapKit_Private
- DDNetworkingOfAlamofireKit_Private
- DDPersistenceKit_Private
- DDProgressHUDKit_Private
@@ -401,16 +395,12 @@ SPEC REPOS:
- SwiftyRSA
- ZLPhotoBrowser
EXTERNAL SOURCES:
DDMAMapKit_Private:
:path: "/Users/zd/Desktop/PodRepository/DDMAMapKit_Private"
SPEC CHECKSUMS:
Alamofire: 3ca42e259043ee0dc5c0cdd76c4bc568b8e42af7
AMapFoundation-NO-IDFA: 6ce0ef596d4eb8d934ff498e56747b6de1247b05
AMapLocation-NO-IDFA: 735791aeb1ba52dff666e4158b86caf4b68b5be7
AMapNavi-NO-IDFA: 73e5daa43db59027f599ad4e59590b0ad0a0e79e
AMapSearch-NO-IDFA: 749f73d5a773758f01a24eb8872f8798c8b47cb4
AMapNavi-NO-IDFA: 11afbfa606171e804f0b98c358a44413d5c0ce1b
AMapSearch-NO-IDFA: bb8c40ee370efdc2e55a83d4a334e6428f26b8a7
AMapTrack-NO-IDFA: 7109cf1867f5d6c407c8191492b1f73101e1682e
BRPickerView: a0ff460bf092bc069db5a54153395b1f7e8f5300
Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da
@@ -423,7 +413,7 @@ SPEC CHECKSUMS:
DDDateKit_Private: f8348d10cec77ccacd2f5ec27d587ea2898ae90a
DDFontKit_Private: 7b8f4ebf0f60622874036202734d8460dc7b3806
DDLogKit_Private: 1ed442cc7be004bd05f27bfda9b525e113df54e0
DDMAMapKit_Private: c3b269542a14daf41dcbb92c41f83e676c6c5e7e
DDMAMapKit_Private: 5169a662319b4e1e8a2068d35c5f1d1b127fae3d
DDNetworkingOfAlamofireKit_Private: 652eb70a7d8bac81d77d036fabeb52f807120f6d
DDPersistenceKit_Private: c150822543ffa6ece3900178629812f64902ed90
DDProgressHUDKit_Private: 1e219062ddeb7801a4bb13b367efa1f3fbf17f1e
@@ -448,6 +438,6 @@ SPEC CHECKSUMS:
SwiftyRSA: 8c6dd1ea7db1b8dc4fb517a202f88bb1354bc2c6
ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b
PODFILE CHECKSUM: b067106a4676a3e3160413679e28a95aa08ace77
PODFILE CHECKSUM: b761c472715038dca820593e44c8ed57f7d5338d
COCOAPODS: 1.11.3
COCOAPODS: 1.15.2
Pods/Pods.xcodeproj/project.pbxproj
Generated
+7362 -7359
View File
File diff suppressed because it is too large Load Diff
Pods/Pods.xcodeproj/xcuserdata/zd.xcuserdatad/xcschemes/AMapFoundation-NO-IDFA.xcscheme
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Pods/Pods.xcodeproj/xcuserdata/zd.xcuserdatad/xcschemes/AMapLocation-NO-IDFA.xcscheme
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Pods/Pods.xcodeproj/xcuserdata/zd.xcuserdatad/xcschemes/AMapNavi-NO-IDFA.xcscheme
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

Some files were not shown because too many files have changed in this diff Show More