swift版本升级代码适配,pod库更新

This commit is contained in:
DDIsFriend
2023-09-22 17:50:01 +08:00
parent 004df124ed
commit 29203ddf64
7 changed files with 63 additions and 215 deletions

View File

@@ -495,83 +495,6 @@
endingLineNumber = "35" endingLineNumber = "35"
landmarkName = "+dd_thumbnailImageForVideo:" landmarkName = "+dd_thumbnailImageForVideo:"
landmarkType = "7"> landmarkType = "7">
<Locations>
<Location
uuid = "F60CEE6A-AA19-4BDA-96D1-8F3B46A87FF5 - 219f1d7491de6c1b"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "+[UIImage(DDCategory) dd_thumbnailImageForVideo:]"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/Pods/DDCategoryKit_Private/DDCategoryKit_Private/Classes/UIImage+DDCategory/UIImage+DDCategory.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "35"
endingLineNumber = "35"
offsetFromSymbolStart = "648">
</Location>
<Location
uuid = "F60CEE6A-AA19-4BDA-96D1-8F3B46A87FF5 - 219f1d7491de6c1b"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "+[UIImage(DDCategory) dd_thumbnailImageForVideo:]"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/Pods/DDCategoryKit_Private/DDCategoryKit_Private/Classes/UIImage+DDCategory/UIImage+DDCategory.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "35"
endingLineNumber = "35"
offsetFromSymbolStart = "504">
</Location>
<Location
uuid = "F60CEE6A-AA19-4BDA-96D1-8F3B46A87FF5 - 7f2f3b14f8e01946"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "+[UIImage(DDCategory) dd_thumbnailImageForVideo:]"
moduleName = "OrderSchedulingNotificationService"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/Pods/DDCategoryKit_Private/DDCategoryKit_Private/Classes/UIImage+DDCategory/UIImage+DDCategory.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "35"
endingLineNumber = "35"
offsetFromSymbolStart = "504">
</Location>
<Location
uuid = "F60CEE6A-AA19-4BDA-96D1-8F3B46A87FF5 - 219f1d7491de6c1b"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "+[UIImage(DDCategory) dd_thumbnailImageForVideo:]"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/Pods/DDCategoryKit_Private/DDCategoryKit_Private/Classes/UIImage+DDCategory/UIImage+DDCategory.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "35"
endingLineNumber = "35"
offsetFromSymbolStart = "376">
</Location>
<Location
uuid = "F60CEE6A-AA19-4BDA-96D1-8F3B46A87FF5 - 219f1d7491de6c1b"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "+[UIImage(DDCategory) dd_thumbnailImageForVideo:]"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/Pods/DDCategoryKit_Private/DDCategoryKit_Private/Classes/UIImage+DDCategory/UIImage+DDCategory.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "35"
endingLineNumber = "35"
offsetFromSymbolStart = "236">
</Location>
</Locations>
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </BreakpointProxy>
<BreakpointProxy <BreakpointProxy
@@ -813,22 +736,7 @@
landmarkType = "7"> landmarkType = "7">
<Locations> <Locations>
<Location <Location
uuid = "28B37EB8-258D-4651-ABD8-4F9802840682 - d438f33cff2a295d" uuid = "28B37EB8-258D-4651-ABD8-4F9802840682 - 2bb21665aef44078"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "OrderScheduling.VehicleMonitoringController.dd_mapView(_: __C.MAMapView, viewFor: __C.MAAnnotation) -&gt; __C.MAAnnotationView"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "367"
endingLineNumber = "367"
offsetFromSymbolStart = "6896">
</Location>
<Location
uuid = "28B37EB8-258D-4651-ABD8-4F9802840682 - 2bb21665aef443ec"
shouldBeEnabled = "Yes" shouldBeEnabled = "Yes"
ignoreCount = "0" ignoreCount = "0"
continueAfterRunningActions = "No" continueAfterRunningActions = "No"
@@ -838,54 +746,9 @@
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift" urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807" startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "367" startingLineNumber = "379"
endingLineNumber = "367" endingLineNumber = "379"
offsetFromSymbolStart = "24"> offsetFromSymbolStart = "60">
</Location>
<Location
uuid = "28B37EB8-258D-4651-ABD8-4F9802840682 - 2bb21665aef443ec"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #3 (__C.UITapGestureRecognizer) -&gt; () in OrderScheduling.VehicleMonitoringController.dd_mapView(_: __C.MAMapView, viewFor: __C.MAAnnotation) -&gt; __C.MAAnnotationView"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "367"
endingLineNumber = "367"
offsetFromSymbolStart = "28">
</Location>
<Location
uuid = "28B37EB8-258D-4651-ABD8-4F9802840682 - 2bb21665aef443ec"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #3 (__C.UITapGestureRecognizer) -&gt; () in OrderScheduling.VehicleMonitoringController.dd_mapView(_: __C.MAMapView, viewFor: __C.MAAnnotation) -&gt; __C.MAAnnotationView"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "367"
endingLineNumber = "367"
offsetFromSymbolStart = "121">
</Location>
<Location
uuid = "28B37EB8-258D-4651-ABD8-4F9802840682 - 2bb21665aef443ec"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #3 (__C.UITapGestureRecognizer) -&gt; () in OrderScheduling.VehicleMonitoringController.dd_mapView(_: __C.MAMapView, viewFor: __C.MAAnnotation) -&gt; __C.MAAnnotationView"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "367"
endingLineNumber = "367"
offsetFromSymbolStart = "163">
</Location> </Location>
<Location <Location
uuid = "28B37EB8-258D-4651-ABD8-4F9802840682 - 2bb21665aef44078" uuid = "28B37EB8-258D-4651-ABD8-4F9802840682 - 2bb21665aef44078"
@@ -900,22 +763,7 @@
endingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807"
startingLineNumber = "379" startingLineNumber = "379"
endingLineNumber = "379" endingLineNumber = "379"
offsetFromSymbolStart = "22"> offsetFromSymbolStart = "120">
</Location>
<Location
uuid = "28B37EB8-258D-4651-ABD8-4F9802840682 - 2bb21665aef44078"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "closure #3 (__C.UITapGestureRecognizer) -&gt; () in OrderScheduling.VehicleMonitoringController.dd_mapView(_: __C.MAMapView, viewFor: __C.MAAnnotation) -&gt; __C.MAAnnotationView"
moduleName = "OrderScheduling"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "379"
endingLineNumber = "379"
offsetFromSymbolStart = "27">
</Location> </Location>
</Locations> </Locations>
</BreakpointContent> </BreakpointContent>

View File

@@ -20,47 +20,47 @@ open class RequestList {
return httpHeader return httpHeader
} }
func loginCode(parameters:Encodable) -> Single<ResponseModel<String>?> { func loginCode<P:Encodable>(parameters:P) -> Single<ResponseModel<String>?> {
return DDAF.post(urlString: HOST+API.verifyCode,parameters: parameters,encoding: JSONParameterEncoder.default,responseType: ResponseModel<String>.self) return DDAF.post(urlString: HOST+API.verifyCode,parameters: parameters,encoding: JSONParameterEncoder.default,responseType: ResponseModel<String>.self)
} }
func checkLogin(parameters:Encodable) -> Single<ResponseModel<String>?> { func checkLogin<P:Encodable>(parameters:P) -> Single<ResponseModel<String>?> {
return DDAF.post(urlString: HOST+API.checkLogin,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [],responseType: ResponseModel<String>.self) return DDAF.post(urlString: HOST+API.checkLogin,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [],responseType: ResponseModel<String>.self)
} }
func login(parameters:Encodable) -> Single<ResponseModel<LoginDataModel>?> { func login<P:Encodable>(parameters:P) -> Single<ResponseModel<LoginDataModel>?> {
return DDAF.post(urlString: HOST+API.login,parameters: parameters,headers: ["Authorization":"Basic c3VwcGxpZXItYXBwOiQyYSQxMCRXZ1pIdzVSamoxcGpIYnJucG00YlYuTWlTZ0o2aWpzYWlNeHN2OUhwZWlYR094UWtWRWVaNg=="],responseType: ResponseModel<LoginDataModel>.self) return DDAF.post(urlString: HOST+API.login,parameters: parameters,headers: ["Authorization":"Basic c3VwcGxpZXItYXBwOiQyYSQxMCRXZ1pIdzVSamoxcGpIYnJucG00YlYuTWlTZ0o2aWpzYWlNeHN2OUhwZWlYR094UWtWRWVaNg=="],responseType: ResponseModel<LoginDataModel>.self)
} }
func token(parameters:Encodable) -> Single<ResponseModel<LoginDataModel>?> { func token<P:Encodable>(parameters:P) -> Single<ResponseModel<LoginDataModel>?> {
return DDAF.post(urlString: HOST+API.token,parameters: parameters,headers: ["Authorization":"Basic c3VwcGxpZXItYXBwOiQyYSQxMCRXZ1pIdzVSamoxcGpIYnJucG00YlYuTWlTZ0o2aWpzYWlNeHN2OUhwZWlYR094UWtWRWVaNg=="],responseType: ResponseModel<LoginDataModel>.self) return DDAF.post(urlString: HOST+API.token,parameters: parameters,headers: ["Authorization":"Basic c3VwcGxpZXItYXBwOiQyYSQxMCRXZ1pIdzVSamoxcGpIYnJucG00YlYuTWlTZ0o2aWpzYWlNeHN2OUhwZWlYR094UWtWRWVaNg=="],responseType: ResponseModel<LoginDataModel>.self)
} }
func logout(parameters:Encodable) -> Single<ResponseModel<String>?> { func logout<P:Encodable>(parameters:P) -> Single<ResponseModel<String>?> {
return DDAF.post(urlString: HOST+API.logout,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self) return DDAF.post(urlString: HOST+API.logout,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self)
} }
func orderList(parameters:Encodable) -> Single<ResponseModel<[OrderListDataModel]>?> { func orderList<P:Encodable>(parameters:P) -> Single<ResponseModel<[OrderListDataModel]>?> {
return DDAF.post(urlString: HOST+API.orderList,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[OrderListDataModel]>.self) return DDAF.post(urlString: HOST+API.orderList,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[OrderListDataModel]>.self)
} }
func acceptDispatch(parameters:Encodable) -> Single<ResponseModel<String>?> { func acceptDispatch<P:Encodable>(parameters:P) -> Single<ResponseModel<String>?> {
return DDAF.post(urlString: HOST+API.acceptDispatch,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self) return DDAF.post(urlString: HOST+API.acceptDispatch,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self)
} }
func refuseDispatch(parameters:Encodable) -> Single<ResponseModel<String>?> { func refuseDispatch<P:Encodable>(parameters:P) -> Single<ResponseModel<String>?> {
return DDAF.post(urlString: HOST+API.refuseDispatch,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self) return DDAF.post(urlString: HOST+API.refuseDispatch,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self)
} }
func orderReport(parameters:Encodable) -> Single<ResponseModel<String>?> { func orderReport<P:Encodable>(parameters:P) -> Single<ResponseModel<String>?> {
return DDAF.post(urlString: HOST+API.orderReport,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self) return DDAF.post(urlString: HOST+API.orderReport,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self)
} }
func dispatchVehicleList(parameters:Encodable) -> Single<ResponseModel<[DispatchVehicleListDataModel]>?> { func dispatchVehicleList<P:Encodable>(parameters:P) -> Single<ResponseModel<[DispatchVehicleListDataModel]>?> {
return DDAF.post(urlString: HOST+API.dispatchVehicleList,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[DispatchVehicleListDataModel]>.self) return DDAF.post(urlString: HOST+API.dispatchVehicleList,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[DispatchVehicleListDataModel]>.self)
} }
func dispatchVehicle(parameters:Encodable) -> Single<ResponseModel<String>?> { func dispatchVehicle<P:Encodable>(parameters:P) -> Single<ResponseModel<String>?> {
return DDAF.post(urlString: HOST+API.dispatchVehicle,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self) return DDAF.post(urlString: HOST+API.dispatchVehicle,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self)
} }
@@ -72,15 +72,15 @@ open class RequestList {
return DDAF.post(urlString: HOST+API.vehicleMonitorList,encoding: URLEncodedFormParameterEncoder(destination: .httpBody),headers: [tokenHeader()],responseType: ResponseModel<VehicleMonitorListDataModel>.self) return DDAF.post(urlString: HOST+API.vehicleMonitorList,encoding: URLEncodedFormParameterEncoder(destination: .httpBody),headers: [tokenHeader()],responseType: ResponseModel<VehicleMonitorListDataModel>.self)
} }
func getRtspChannel(prameters:Encodable) -> Single<ResponseModel<[String]>?> { func getRtspChannel<P:Encodable>(prameters:P) -> Single<ResponseModel<[String]>?> {
return DDAF.post(urlString: HOST+API.getRtspChannel,parameters: prameters,encoding: URLEncodedFormParameterEncoder(destination: .httpBody),headers: [tokenHeader()],responseType: ResponseModel<[String]>.self) return DDAF.post(urlString: HOST+API.getRtspChannel,parameters: prameters,encoding: URLEncodedFormParameterEncoder(destination: .httpBody),headers: [tokenHeader()],responseType: ResponseModel<[String]>.self)
} }
func orderPhotoList(prameters:Encodable) -> Single<ResponseModel<[OrderPhotoListDataModel]>?> { func orderPhotoList<P:Encodable>(prameters:P) -> Single<ResponseModel<[OrderPhotoListDataModel]>?> {
return DDAF.post(urlString: HOST+API.orderPhotoList,parameters: prameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[OrderPhotoListDataModel]>.self) return DDAF.post(urlString: HOST+API.orderPhotoList,parameters: prameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[OrderPhotoListDataModel]>.self)
} }
func supplementOrderPhoto(prameters:Encodable,multipartFormData: @escaping (MultipartFormData) -> Void,uploadProgress: @escaping (Progress) -> Void) -> Single<ResponseModel<String>?> { func supplementOrderPhoto<P:Encodable>(prameters:P,multipartFormData: @escaping (MultipartFormData) -> Void,uploadProgress: @escaping (Progress) -> Void) -> Single<ResponseModel<String>?> {
return DDAF.upload(urlString: HOST+API.supplementOrderPhoto, headers: [tokenHeader()], responseType: ResponseModel<String>.self,multipartFormData: multipartFormData,uploadProgress: uploadProgress) return DDAF.upload(urlString: HOST+API.supplementOrderPhoto, headers: [tokenHeader()], responseType: ResponseModel<String>.self,multipartFormData: multipartFormData,uploadProgress: uploadProgress)
} }
@@ -92,19 +92,19 @@ open class RequestList {
return DDAF.post(urlString: HOST+API.dispatchAppH5Urls,encoding: URLEncodedFormParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<DispatchAppH5UrlDataModel>.self) return DDAF.post(urlString: HOST+API.dispatchAppH5Urls,encoding: URLEncodedFormParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<DispatchAppH5UrlDataModel>.self)
} }
func versionCheck(parameters:Encodable) -> Single<ResponseModel<VersionCheckDataModel>?> { func versionCheck<P:Encodable>(parameters:P) -> Single<ResponseModel<VersionCheckDataModel>?> {
return DDAF.post(urlString: HOST+API.versionCheck,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<VersionCheckDataModel>.self) return DDAF.post(urlString: HOST+API.versionCheck,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<VersionCheckDataModel>.self)
} }
func messageReminderList(parameters:Encodable) -> Single<ResponseModel<[MessageReminderListDataModel]>?> { func messageReminderList<P:Encodable>(parameters:P) -> Single<ResponseModel<[MessageReminderListDataModel]>?> {
return DDAF.post(urlString: HOST+API.messageReminderList,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[MessageReminderListDataModel]>.self) return DDAF.post(urlString: HOST+API.messageReminderList,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[MessageReminderListDataModel]>.self)
} }
func readMessageReminder(parameters:Encodable) -> Single<ResponseModel<String>?> { func readMessageReminder<P:Encodable>(parameters:P) -> Single<ResponseModel<String>?> {
return DDAF.post(urlString: HOST+API.readMessageReminder,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self) return DDAF.post(urlString: HOST+API.readMessageReminder,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self)
} }
func uploadCallRecord(parameters:Encodable) -> Single<ResponseModel<String>?> { func uploadCallRecord<P:Encodable>(parameters:P) -> Single<ResponseModel<String>?> {
return DDAF.post(urlString: HOST+API.uploadCallRecord,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self) return DDAF.post(urlString: HOST+API.uploadCallRecord,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self)
} }
@@ -112,7 +112,7 @@ open class RequestList {
return DDAF.post(urlString: HOST+API.userOperationPermissions,encoding: URLEncodedFormParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[String]>.self) return DDAF.post(urlString: HOST+API.userOperationPermissions,encoding: URLEncodedFormParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[String]>.self)
} }
func vehicleLogout(parameters:Encodable) -> Single<ResponseModel<String>?> { func vehicleLogout<P:Encodable>(parameters:P) -> Single<ResponseModel<String>?> {
return DDAF.post(urlString: HOST+API.vehicleLogout,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self) return DDAF.post(urlString: HOST+API.vehicleLogout,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<String>.self)
} }
} }

View File

@@ -25,40 +25,40 @@ PODS:
- Bugly (2.5.93) - Bugly (2.5.93)
- DDAudioPlayerKit_Private (0.1.5) - DDAudioPlayerKit_Private (0.1.5)
- DDAutoUIKit_Private (0.1.3) - DDAutoUIKit_Private (0.1.3)
- DDBasicControlsKit_Private/DDBaseAnimation/DDTransitionAnimation (0.3.2) - DDBasicControlsKit_Private/DDBaseAnimation/DDTransitionAnimation (0.3.3)
- DDBasicControlsKit_Private/DDBaseAttributedString (0.3.2): - DDBasicControlsKit_Private/DDBaseAttributedString (0.3.3):
- "DDCategoryKit_Private/NSAttributedString+DDCategory" - "DDCategoryKit_Private/NSAttributedString+DDCategory"
- DDBasicControlsKit_Private/DDBaseButton (0.3.2): - DDBasicControlsKit_Private/DDBaseButton (0.3.3):
- "DDCategoryKit_Private/UIButton+DDCategory" - "DDCategoryKit_Private/UIButton+DDCategory"
- DDBasicControlsKit_Private/DDBaseCollectionView (0.3.2): - DDBasicControlsKit_Private/DDBaseCollectionView (0.3.3):
- "DDCategoryKit_Private/UICollectionView+DDCategory" - "DDCategoryKit_Private/UICollectionView+DDCategory"
- DDBasicControlsKit_Private/DDBaseCollectionViewCell (0.3.2): - DDBasicControlsKit_Private/DDBaseCollectionViewCell (0.3.3):
- "DDCategoryKit_Private/UICollectionViewCell+DDCategory" - "DDCategoryKit_Private/UICollectionViewCell+DDCategory"
- DDBasicControlsKit_Private/DDBaseImage (0.3.2): - DDBasicControlsKit_Private/DDBaseImage (0.3.3):
- "DDCategoryKit_Private/UIImage+DDCategory" - "DDCategoryKit_Private/UIImage+DDCategory"
- DDBasicControlsKit_Private/DDBaseImageView (0.3.2): - DDBasicControlsKit_Private/DDBaseImageView (0.3.3):
- "DDCategoryKit_Private/UIImageView+DDCategory" - "DDCategoryKit_Private/UIImageView+DDCategory"
- DDBasicControlsKit_Private/DDBaseLabel (0.3.2): - DDBasicControlsKit_Private/DDBaseLabel (0.3.3):
- "DDCategoryKit_Private/UILabel+DDCategory" - "DDCategoryKit_Private/UILabel+DDCategory"
- DDBasicControlsKit_Private/DDBaseNavigationController (0.3.2): - DDBasicControlsKit_Private/DDBaseNavigationController (0.3.3):
- DDBasicControlsKit_Private/DDBaseAnimation/DDTransitionAnimation - DDBasicControlsKit_Private/DDBaseAnimation/DDTransitionAnimation
- "DDCategoryKit_Private/UINavigationController+DDCategory" - "DDCategoryKit_Private/UINavigationController+DDCategory"
- DDLogKit_Private - DDLogKit_Private
- DDBasicControlsKit_Private/DDBaseScrollView (0.3.2): - DDBasicControlsKit_Private/DDBaseScrollView (0.3.3):
- "DDCategoryKit_Private/UIScrollView+DDCategory" - "DDCategoryKit_Private/UIScrollView+DDCategory"
- DDBasicControlsKit_Private/DDBaseSwitch (0.3.2): - DDBasicControlsKit_Private/DDBaseSwitch (0.3.3):
- "DDCategoryKit_Private/UISwitch+DDCategory" - "DDCategoryKit_Private/UISwitch+DDCategory"
- DDBasicControlsKit_Private/DDBaseTableView (0.3.2): - DDBasicControlsKit_Private/DDBaseTableView (0.3.3):
- "DDCategoryKit_Private/UITableView+DDCategory" - "DDCategoryKit_Private/UITableView+DDCategory"
- DDBasicControlsKit_Private/DDBaseTableViewCell (0.3.2): - DDBasicControlsKit_Private/DDBaseTableViewCell (0.3.3):
- "DDCategoryKit_Private/UITableViewCell+DDCategory" - "DDCategoryKit_Private/UITableViewCell+DDCategory"
- DDBasicControlsKit_Private/DDBaseTextField (0.3.2): - DDBasicControlsKit_Private/DDBaseTextField (0.3.3):
- "DDCategoryKit_Private/UITextField+DDCategory" - "DDCategoryKit_Private/UITextField+DDCategory"
- DDBasicControlsKit_Private/DDBaseTextView (0.3.2): - DDBasicControlsKit_Private/DDBaseTextView (0.3.3):
- "DDCategoryKit_Private/UITextView+DDCategory" - "DDCategoryKit_Private/UITextView+DDCategory"
- DDBasicControlsKit_Private/DDBaseView (0.3.2): - DDBasicControlsKit_Private/DDBaseView (0.3.3):
- "DDCategoryKit_Private/UIView+DDCategory" - "DDCategoryKit_Private/UIView+DDCategory"
- DDBasicControlsKit_Private/DDBaseViewController (0.3.2): - DDBasicControlsKit_Private/DDBaseViewController (0.3.3):
- "DDCategoryKit_Private/UIImage+DDCategory" - "DDCategoryKit_Private/UIImage+DDCategory"
- "DDCategoryKit_Private/UIViewController+DDCategory" - "DDCategoryKit_Private/UIViewController+DDCategory"
- DDLogKit_Private - DDLogKit_Private
@@ -387,7 +387,7 @@ SPEC CHECKSUMS:
Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da
DDAudioPlayerKit_Private: c2bab407c6c6bb92b005315a72c8ee3768ffc6b3 DDAudioPlayerKit_Private: c2bab407c6c6bb92b005315a72c8ee3768ffc6b3
DDAutoUIKit_Private: 188066b4d13c8096676ddd9efa15974238f6dca3 DDAutoUIKit_Private: 188066b4d13c8096676ddd9efa15974238f6dca3
DDBasicControlsKit_Private: d3aebc505eaac273a8f6b85238662ad6e64a1a08 DDBasicControlsKit_Private: 4fb51a0ccefc9e62791352a0d55e86c4f679a5c9
DDCategoryKit_Private: 19d515c43d5e9c4ee80b8ccf3fb8ab40368b8668 DDCategoryKit_Private: 19d515c43d5e9c4ee80b8ccf3fb8ab40368b8668
DDColorKit_Private: 77fddb62410a2d5e6fb003083d233c0d7ea0a08f DDColorKit_Private: 77fddb62410a2d5e6fb003083d233c0d7ea0a08f
DDControlsKit_Private: c3ac79b391cec6ecb26262a0d3b02718f696ab19 DDControlsKit_Private: c3ac79b391cec6ecb26262a0d3b02718f696ab19

View File

@@ -84,8 +84,8 @@
fromVC.tabBarController.tabBar.hidden = YES; fromVC.tabBarController.tabBar.hidden = YES;
} }
[fromVC.navigationController.view addSubview:fromVC.view]; [fromVC.navigationController.view insertSubview:fromVC.view atIndex:0];
[fromVC.navigationController.view addSubview:toVC.view]; [fromVC.navigationController.view insertSubview:toVC.view aboveSubview:fromVC.view];
[UIView animateWithDuration:[self transitionDuration:transitionContext] animations:^{ [UIView animateWithDuration:[self transitionDuration:transitionContext] animations:^{
fromVC.view.frame = fromVCToRect; fromVC.view.frame = fromVCToRect;

36
Pods/Manifest.lock generated
View File

@@ -25,40 +25,40 @@ PODS:
- Bugly (2.5.93) - Bugly (2.5.93)
- DDAudioPlayerKit_Private (0.1.5) - DDAudioPlayerKit_Private (0.1.5)
- DDAutoUIKit_Private (0.1.3) - DDAutoUIKit_Private (0.1.3)
- DDBasicControlsKit_Private/DDBaseAnimation/DDTransitionAnimation (0.3.2) - DDBasicControlsKit_Private/DDBaseAnimation/DDTransitionAnimation (0.3.3)
- DDBasicControlsKit_Private/DDBaseAttributedString (0.3.2): - DDBasicControlsKit_Private/DDBaseAttributedString (0.3.3):
- "DDCategoryKit_Private/NSAttributedString+DDCategory" - "DDCategoryKit_Private/NSAttributedString+DDCategory"
- DDBasicControlsKit_Private/DDBaseButton (0.3.2): - DDBasicControlsKit_Private/DDBaseButton (0.3.3):
- "DDCategoryKit_Private/UIButton+DDCategory" - "DDCategoryKit_Private/UIButton+DDCategory"
- DDBasicControlsKit_Private/DDBaseCollectionView (0.3.2): - DDBasicControlsKit_Private/DDBaseCollectionView (0.3.3):
- "DDCategoryKit_Private/UICollectionView+DDCategory" - "DDCategoryKit_Private/UICollectionView+DDCategory"
- DDBasicControlsKit_Private/DDBaseCollectionViewCell (0.3.2): - DDBasicControlsKit_Private/DDBaseCollectionViewCell (0.3.3):
- "DDCategoryKit_Private/UICollectionViewCell+DDCategory" - "DDCategoryKit_Private/UICollectionViewCell+DDCategory"
- DDBasicControlsKit_Private/DDBaseImage (0.3.2): - DDBasicControlsKit_Private/DDBaseImage (0.3.3):
- "DDCategoryKit_Private/UIImage+DDCategory" - "DDCategoryKit_Private/UIImage+DDCategory"
- DDBasicControlsKit_Private/DDBaseImageView (0.3.2): - DDBasicControlsKit_Private/DDBaseImageView (0.3.3):
- "DDCategoryKit_Private/UIImageView+DDCategory" - "DDCategoryKit_Private/UIImageView+DDCategory"
- DDBasicControlsKit_Private/DDBaseLabel (0.3.2): - DDBasicControlsKit_Private/DDBaseLabel (0.3.3):
- "DDCategoryKit_Private/UILabel+DDCategory" - "DDCategoryKit_Private/UILabel+DDCategory"
- DDBasicControlsKit_Private/DDBaseNavigationController (0.3.2): - DDBasicControlsKit_Private/DDBaseNavigationController (0.3.3):
- DDBasicControlsKit_Private/DDBaseAnimation/DDTransitionAnimation - DDBasicControlsKit_Private/DDBaseAnimation/DDTransitionAnimation
- "DDCategoryKit_Private/UINavigationController+DDCategory" - "DDCategoryKit_Private/UINavigationController+DDCategory"
- DDLogKit_Private - DDLogKit_Private
- DDBasicControlsKit_Private/DDBaseScrollView (0.3.2): - DDBasicControlsKit_Private/DDBaseScrollView (0.3.3):
- "DDCategoryKit_Private/UIScrollView+DDCategory" - "DDCategoryKit_Private/UIScrollView+DDCategory"
- DDBasicControlsKit_Private/DDBaseSwitch (0.3.2): - DDBasicControlsKit_Private/DDBaseSwitch (0.3.3):
- "DDCategoryKit_Private/UISwitch+DDCategory" - "DDCategoryKit_Private/UISwitch+DDCategory"
- DDBasicControlsKit_Private/DDBaseTableView (0.3.2): - DDBasicControlsKit_Private/DDBaseTableView (0.3.3):
- "DDCategoryKit_Private/UITableView+DDCategory" - "DDCategoryKit_Private/UITableView+DDCategory"
- DDBasicControlsKit_Private/DDBaseTableViewCell (0.3.2): - DDBasicControlsKit_Private/DDBaseTableViewCell (0.3.3):
- "DDCategoryKit_Private/UITableViewCell+DDCategory" - "DDCategoryKit_Private/UITableViewCell+DDCategory"
- DDBasicControlsKit_Private/DDBaseTextField (0.3.2): - DDBasicControlsKit_Private/DDBaseTextField (0.3.3):
- "DDCategoryKit_Private/UITextField+DDCategory" - "DDCategoryKit_Private/UITextField+DDCategory"
- DDBasicControlsKit_Private/DDBaseTextView (0.3.2): - DDBasicControlsKit_Private/DDBaseTextView (0.3.3):
- "DDCategoryKit_Private/UITextView+DDCategory" - "DDCategoryKit_Private/UITextView+DDCategory"
- DDBasicControlsKit_Private/DDBaseView (0.3.2): - DDBasicControlsKit_Private/DDBaseView (0.3.3):
- "DDCategoryKit_Private/UIView+DDCategory" - "DDCategoryKit_Private/UIView+DDCategory"
- DDBasicControlsKit_Private/DDBaseViewController (0.3.2): - DDBasicControlsKit_Private/DDBaseViewController (0.3.3):
- "DDCategoryKit_Private/UIImage+DDCategory" - "DDCategoryKit_Private/UIImage+DDCategory"
- "DDCategoryKit_Private/UIViewController+DDCategory" - "DDCategoryKit_Private/UIViewController+DDCategory"
- DDLogKit_Private - DDLogKit_Private
@@ -387,7 +387,7 @@ SPEC CHECKSUMS:
Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da
DDAudioPlayerKit_Private: c2bab407c6c6bb92b005315a72c8ee3768ffc6b3 DDAudioPlayerKit_Private: c2bab407c6c6bb92b005315a72c8ee3768ffc6b3
DDAutoUIKit_Private: 188066b4d13c8096676ddd9efa15974238f6dca3 DDAutoUIKit_Private: 188066b4d13c8096676ddd9efa15974238f6dca3
DDBasicControlsKit_Private: d3aebc505eaac273a8f6b85238662ad6e64a1a08 DDBasicControlsKit_Private: 4fb51a0ccefc9e62791352a0d55e86c4f679a5c9
DDCategoryKit_Private: 19d515c43d5e9c4ee80b8ccf3fb8ab40368b8668 DDCategoryKit_Private: 19d515c43d5e9c4ee80b8ccf3fb8ab40368b8668
DDColorKit_Private: 77fddb62410a2d5e6fb003083d233c0d7ea0a08f DDColorKit_Private: 77fddb62410a2d5e6fb003083d233c0d7ea0a08f
DDControlsKit_Private: c3ac79b391cec6ecb26262a0d3b02718f696ab19 DDControlsKit_Private: c3ac79b391cec6ecb26262a0d3b02718f696ab19

View File

@@ -13,7 +13,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>BNDL</string> <string>BNDL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.3.2</string> <string>0.3.3</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>