diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index dfe90f8..ec26c10 100644 Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 2534f6e..6c97232 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -495,83 +495,6 @@ endingLineNumber = "35" landmarkName = "+dd_thumbnailImageForVideo:" landmarkType = "7"> - - - - - - - - - - - - - - - - - - - - + startingLineNumber = "379" + endingLineNumber = "379" + offsetFromSymbolStart = "60"> - - + offsetFromSymbolStart = "120"> diff --git a/OrderScheduling/HttpRequestCenter/RequestList.swift b/OrderScheduling/HttpRequestCenter/RequestList.swift index bad5952..75a3be6 100644 --- a/OrderScheduling/HttpRequestCenter/RequestList.swift +++ b/OrderScheduling/HttpRequestCenter/RequestList.swift @@ -20,47 +20,47 @@ open class RequestList { return httpHeader } - func loginCode(parameters:Encodable) -> Single?> { + func loginCode(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.verifyCode,parameters: parameters,encoding: JSONParameterEncoder.default,responseType: ResponseModel.self) } - func checkLogin(parameters:Encodable) -> Single?> { + func checkLogin(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.checkLogin,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [],responseType: ResponseModel.self) } - func login(parameters:Encodable) -> Single?> { + func login(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.login,parameters: parameters,headers: ["Authorization":"Basic c3VwcGxpZXItYXBwOiQyYSQxMCRXZ1pIdzVSamoxcGpIYnJucG00YlYuTWlTZ0o2aWpzYWlNeHN2OUhwZWlYR094UWtWRWVaNg=="],responseType: ResponseModel.self) } - func token(parameters:Encodable) -> Single?> { + func token(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.token,parameters: parameters,headers: ["Authorization":"Basic c3VwcGxpZXItYXBwOiQyYSQxMCRXZ1pIdzVSamoxcGpIYnJucG00YlYuTWlTZ0o2aWpzYWlNeHN2OUhwZWlYR094UWtWRWVaNg=="],responseType: ResponseModel.self) } - func logout(parameters:Encodable) -> Single?> { + func logout(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.logout,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) } - func orderList(parameters:Encodable) -> Single?> { + func orderList(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.orderList,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[OrderListDataModel]>.self) } - func acceptDispatch(parameters:Encodable) -> Single?> { + func acceptDispatch(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.acceptDispatch,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) } - func refuseDispatch(parameters:Encodable) -> Single?> { + func refuseDispatch(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.refuseDispatch,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) } - func orderReport(parameters:Encodable) -> Single?> { + func orderReport(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.orderReport,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) } - func dispatchVehicleList(parameters:Encodable) -> Single?> { + func dispatchVehicleList(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.dispatchVehicleList,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[DispatchVehicleListDataModel]>.self) } - func dispatchVehicle(parameters:Encodable) -> Single?> { + func dispatchVehicle(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.dispatchVehicle,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) } @@ -72,15 +72,15 @@ open class RequestList { return DDAF.post(urlString: HOST+API.vehicleMonitorList,encoding: URLEncodedFormParameterEncoder(destination: .httpBody),headers: [tokenHeader()],responseType: ResponseModel.self) } - func getRtspChannel(prameters:Encodable) -> Single?> { + func getRtspChannel(prameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.getRtspChannel,parameters: prameters,encoding: URLEncodedFormParameterEncoder(destination: .httpBody),headers: [tokenHeader()],responseType: ResponseModel<[String]>.self) } - func orderPhotoList(prameters:Encodable) -> Single?> { + func orderPhotoList(prameters:P) -> Single?> { 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?> { + func supplementOrderPhoto(prameters:P,multipartFormData: @escaping (MultipartFormData) -> Void,uploadProgress: @escaping (Progress) -> Void) -> Single?> { return DDAF.upload(urlString: HOST+API.supplementOrderPhoto, headers: [tokenHeader()], responseType: ResponseModel.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.self) } - func versionCheck(parameters:Encodable) -> Single?> { + func versionCheck(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.versionCheck,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) } - func messageReminderList(parameters:Encodable) -> Single?> { + func messageReminderList(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.messageReminderList,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[MessageReminderListDataModel]>.self) } - func readMessageReminder(parameters:Encodable) -> Single?> { + func readMessageReminder(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.readMessageReminder,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) } - func uploadCallRecord(parameters:Encodable) -> Single?> { + func uploadCallRecord(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.uploadCallRecord,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) } @@ -112,7 +112,7 @@ open class RequestList { return DDAF.post(urlString: HOST+API.userOperationPermissions,encoding: URLEncodedFormParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel<[String]>.self) } - func vehicleLogout(parameters:Encodable) -> Single?> { + func vehicleLogout(parameters:P) -> Single?> { return DDAF.post(urlString: HOST+API.vehicleLogout,parameters: parameters,encoding: JSONParameterEncoder.default,headers: [tokenHeader()],responseType: ResponseModel.self) } } diff --git a/Podfile.lock b/Podfile.lock index 4b027c1..13af90a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -25,40 +25,40 @@ PODS: - Bugly (2.5.93) - DDAudioPlayerKit_Private (0.1.5) - DDAutoUIKit_Private (0.1.3) - - DDBasicControlsKit_Private/DDBaseAnimation/DDTransitionAnimation (0.3.2) - - DDBasicControlsKit_Private/DDBaseAttributedString (0.3.2): + - DDBasicControlsKit_Private/DDBaseAnimation/DDTransitionAnimation (0.3.3) + - DDBasicControlsKit_Private/DDBaseAttributedString (0.3.3): - "DDCategoryKit_Private/NSAttributedString+DDCategory" - - DDBasicControlsKit_Private/DDBaseButton (0.3.2): + - DDBasicControlsKit_Private/DDBaseButton (0.3.3): - "DDCategoryKit_Private/UIButton+DDCategory" - - DDBasicControlsKit_Private/DDBaseCollectionView (0.3.2): + - DDBasicControlsKit_Private/DDBaseCollectionView (0.3.3): - "DDCategoryKit_Private/UICollectionView+DDCategory" - - DDBasicControlsKit_Private/DDBaseCollectionViewCell (0.3.2): + - DDBasicControlsKit_Private/DDBaseCollectionViewCell (0.3.3): - "DDCategoryKit_Private/UICollectionViewCell+DDCategory" - - DDBasicControlsKit_Private/DDBaseImage (0.3.2): + - DDBasicControlsKit_Private/DDBaseImage (0.3.3): - "DDCategoryKit_Private/UIImage+DDCategory" - - DDBasicControlsKit_Private/DDBaseImageView (0.3.2): + - DDBasicControlsKit_Private/DDBaseImageView (0.3.3): - "DDCategoryKit_Private/UIImageView+DDCategory" - - DDBasicControlsKit_Private/DDBaseLabel (0.3.2): + - DDBasicControlsKit_Private/DDBaseLabel (0.3.3): - "DDCategoryKit_Private/UILabel+DDCategory" - - DDBasicControlsKit_Private/DDBaseNavigationController (0.3.2): + - DDBasicControlsKit_Private/DDBaseNavigationController (0.3.3): - DDBasicControlsKit_Private/DDBaseAnimation/DDTransitionAnimation - "DDCategoryKit_Private/UINavigationController+DDCategory" - DDLogKit_Private - - DDBasicControlsKit_Private/DDBaseScrollView (0.3.2): + - DDBasicControlsKit_Private/DDBaseScrollView (0.3.3): - "DDCategoryKit_Private/UIScrollView+DDCategory" - - DDBasicControlsKit_Private/DDBaseSwitch (0.3.2): + - DDBasicControlsKit_Private/DDBaseSwitch (0.3.3): - "DDCategoryKit_Private/UISwitch+DDCategory" - - DDBasicControlsKit_Private/DDBaseTableView (0.3.2): + - DDBasicControlsKit_Private/DDBaseTableView (0.3.3): - "DDCategoryKit_Private/UITableView+DDCategory" - - DDBasicControlsKit_Private/DDBaseTableViewCell (0.3.2): + - DDBasicControlsKit_Private/DDBaseTableViewCell (0.3.3): - "DDCategoryKit_Private/UITableViewCell+DDCategory" - - DDBasicControlsKit_Private/DDBaseTextField (0.3.2): + - DDBasicControlsKit_Private/DDBaseTextField (0.3.3): - "DDCategoryKit_Private/UITextField+DDCategory" - - DDBasicControlsKit_Private/DDBaseTextView (0.3.2): + - DDBasicControlsKit_Private/DDBaseTextView (0.3.3): - "DDCategoryKit_Private/UITextView+DDCategory" - - DDBasicControlsKit_Private/DDBaseView (0.3.2): + - DDBasicControlsKit_Private/DDBaseView (0.3.3): - "DDCategoryKit_Private/UIView+DDCategory" - - DDBasicControlsKit_Private/DDBaseViewController (0.3.2): + - DDBasicControlsKit_Private/DDBaseViewController (0.3.3): - "DDCategoryKit_Private/UIImage+DDCategory" - "DDCategoryKit_Private/UIViewController+DDCategory" - DDLogKit_Private @@ -387,7 +387,7 @@ SPEC CHECKSUMS: Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da DDAudioPlayerKit_Private: c2bab407c6c6bb92b005315a72c8ee3768ffc6b3 DDAutoUIKit_Private: 188066b4d13c8096676ddd9efa15974238f6dca3 - DDBasicControlsKit_Private: d3aebc505eaac273a8f6b85238662ad6e64a1a08 + DDBasicControlsKit_Private: 4fb51a0ccefc9e62791352a0d55e86c4f679a5c9 DDCategoryKit_Private: 19d515c43d5e9c4ee80b8ccf3fb8ab40368b8668 DDColorKit_Private: 77fddb62410a2d5e6fb003083d233c0d7ea0a08f DDControlsKit_Private: c3ac79b391cec6ecb26262a0d3b02718f696ab19 diff --git a/Pods/DDBasicControlsKit_Private/DDBasicControlsKit_Private/Classes/DDBaseAnimation/DDTransitionAnimation/DDViewControllerAnimatedTransition.m b/Pods/DDBasicControlsKit_Private/DDBasicControlsKit_Private/Classes/DDBaseAnimation/DDTransitionAnimation/DDViewControllerAnimatedTransition.m index e9ba639..586835b 100644 --- a/Pods/DDBasicControlsKit_Private/DDBasicControlsKit_Private/Classes/DDBaseAnimation/DDTransitionAnimation/DDViewControllerAnimatedTransition.m +++ b/Pods/DDBasicControlsKit_Private/DDBasicControlsKit_Private/Classes/DDBaseAnimation/DDTransitionAnimation/DDViewControllerAnimatedTransition.m @@ -84,8 +84,8 @@ fromVC.tabBarController.tabBar.hidden = YES; } - [fromVC.navigationController.view addSubview:fromVC.view]; - [fromVC.navigationController.view addSubview:toVC.view]; + [fromVC.navigationController.view insertSubview:fromVC.view atIndex:0]; + [fromVC.navigationController.view insertSubview:toVC.view aboveSubview:fromVC.view]; [UIView animateWithDuration:[self transitionDuration:transitionContext] animations:^{ fromVC.view.frame = fromVCToRect; diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 4b027c1..13af90a 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -25,40 +25,40 @@ PODS: - Bugly (2.5.93) - DDAudioPlayerKit_Private (0.1.5) - DDAutoUIKit_Private (0.1.3) - - DDBasicControlsKit_Private/DDBaseAnimation/DDTransitionAnimation (0.3.2) - - DDBasicControlsKit_Private/DDBaseAttributedString (0.3.2): + - DDBasicControlsKit_Private/DDBaseAnimation/DDTransitionAnimation (0.3.3) + - DDBasicControlsKit_Private/DDBaseAttributedString (0.3.3): - "DDCategoryKit_Private/NSAttributedString+DDCategory" - - DDBasicControlsKit_Private/DDBaseButton (0.3.2): + - DDBasicControlsKit_Private/DDBaseButton (0.3.3): - "DDCategoryKit_Private/UIButton+DDCategory" - - DDBasicControlsKit_Private/DDBaseCollectionView (0.3.2): + - DDBasicControlsKit_Private/DDBaseCollectionView (0.3.3): - "DDCategoryKit_Private/UICollectionView+DDCategory" - - DDBasicControlsKit_Private/DDBaseCollectionViewCell (0.3.2): + - DDBasicControlsKit_Private/DDBaseCollectionViewCell (0.3.3): - "DDCategoryKit_Private/UICollectionViewCell+DDCategory" - - DDBasicControlsKit_Private/DDBaseImage (0.3.2): + - DDBasicControlsKit_Private/DDBaseImage (0.3.3): - "DDCategoryKit_Private/UIImage+DDCategory" - - DDBasicControlsKit_Private/DDBaseImageView (0.3.2): + - DDBasicControlsKit_Private/DDBaseImageView (0.3.3): - "DDCategoryKit_Private/UIImageView+DDCategory" - - DDBasicControlsKit_Private/DDBaseLabel (0.3.2): + - DDBasicControlsKit_Private/DDBaseLabel (0.3.3): - "DDCategoryKit_Private/UILabel+DDCategory" - - DDBasicControlsKit_Private/DDBaseNavigationController (0.3.2): + - DDBasicControlsKit_Private/DDBaseNavigationController (0.3.3): - DDBasicControlsKit_Private/DDBaseAnimation/DDTransitionAnimation - "DDCategoryKit_Private/UINavigationController+DDCategory" - DDLogKit_Private - - DDBasicControlsKit_Private/DDBaseScrollView (0.3.2): + - DDBasicControlsKit_Private/DDBaseScrollView (0.3.3): - "DDCategoryKit_Private/UIScrollView+DDCategory" - - DDBasicControlsKit_Private/DDBaseSwitch (0.3.2): + - DDBasicControlsKit_Private/DDBaseSwitch (0.3.3): - "DDCategoryKit_Private/UISwitch+DDCategory" - - DDBasicControlsKit_Private/DDBaseTableView (0.3.2): + - DDBasicControlsKit_Private/DDBaseTableView (0.3.3): - "DDCategoryKit_Private/UITableView+DDCategory" - - DDBasicControlsKit_Private/DDBaseTableViewCell (0.3.2): + - DDBasicControlsKit_Private/DDBaseTableViewCell (0.3.3): - "DDCategoryKit_Private/UITableViewCell+DDCategory" - - DDBasicControlsKit_Private/DDBaseTextField (0.3.2): + - DDBasicControlsKit_Private/DDBaseTextField (0.3.3): - "DDCategoryKit_Private/UITextField+DDCategory" - - DDBasicControlsKit_Private/DDBaseTextView (0.3.2): + - DDBasicControlsKit_Private/DDBaseTextView (0.3.3): - "DDCategoryKit_Private/UITextView+DDCategory" - - DDBasicControlsKit_Private/DDBaseView (0.3.2): + - DDBasicControlsKit_Private/DDBaseView (0.3.3): - "DDCategoryKit_Private/UIView+DDCategory" - - DDBasicControlsKit_Private/DDBaseViewController (0.3.2): + - DDBasicControlsKit_Private/DDBaseViewController (0.3.3): - "DDCategoryKit_Private/UIImage+DDCategory" - "DDCategoryKit_Private/UIViewController+DDCategory" - DDLogKit_Private @@ -387,7 +387,7 @@ SPEC CHECKSUMS: Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da DDAudioPlayerKit_Private: c2bab407c6c6bb92b005315a72c8ee3768ffc6b3 DDAutoUIKit_Private: 188066b4d13c8096676ddd9efa15974238f6dca3 - DDBasicControlsKit_Private: d3aebc505eaac273a8f6b85238662ad6e64a1a08 + DDBasicControlsKit_Private: 4fb51a0ccefc9e62791352a0d55e86c4f679a5c9 DDCategoryKit_Private: 19d515c43d5e9c4ee80b8ccf3fb8ab40368b8668 DDColorKit_Private: 77fddb62410a2d5e6fb003083d233c0d7ea0a08f DDControlsKit_Private: c3ac79b391cec6ecb26262a0d3b02718f696ab19 diff --git a/Pods/Target Support Files/DDBasicControlsKit_Private/ResourceBundle-DDBaseViewController-DDBasicControlsKit_Private-Info.plist b/Pods/Target Support Files/DDBasicControlsKit_Private/ResourceBundle-DDBaseViewController-DDBasicControlsKit_Private-Info.plist index be5fa07..a40c0b9 100644 --- a/Pods/Target Support Files/DDBasicControlsKit_Private/ResourceBundle-DDBaseViewController-DDBasicControlsKit_Private-Info.plist +++ b/Pods/Target Support Files/DDBasicControlsKit_Private/ResourceBundle-DDBaseViewController-DDBasicControlsKit_Private-Info.plist @@ -13,7 +13,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 0.3.2 + 0.3.3 CFBundleSignature ???? CFBundleVersion