diff --git a/OrderScheduling.xcodeproj/project.pbxproj b/OrderScheduling.xcodeproj/project.pbxproj index 7ae6f5b..8d6aa4a 100644 --- a/OrderScheduling.xcodeproj/project.pbxproj +++ b/OrderScheduling.xcodeproj/project.pbxproj @@ -52,6 +52,7 @@ 79DD0DAD2A94A0EE00768FE7 /* LaunchImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 79DD0DAC2A94A0EE00768FE7 /* LaunchImage.png */; }; 79DD0DB12A94B3DB00768FE7 /* EmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DB02A94B3DB00768FE7 /* EmptyView.swift */; }; 79DD0DB42A95F00B00768FE7 /* Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DB32A95F00B00768FE7 /* Extension.swift */; }; + 79DD0DBB2A971EB300768FE7 /* ZDViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DD0DBA2A971EB300768FE7 /* ZDViewController.swift */; }; 79EAD8142A7B86610036E093 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 79EAD8132A7B86610036E093 /* Assets.xcassets */; }; 79EAD8172A7B86610036E093 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 79EAD8152A7B86610036E093 /* LaunchScreen.storyboard */; }; A64E95F00B82DC28C2B9306E /* libPods-OrderScheduling.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 98784A61C325B3D6C408016C /* libPods-OrderScheduling.a */; }; @@ -122,6 +123,7 @@ 79DD0DAC2A94A0EE00768FE7 /* LaunchImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = LaunchImage.png; sourceTree = ""; }; 79DD0DB02A94B3DB00768FE7 /* EmptyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyView.swift; sourceTree = ""; }; 79DD0DB32A95F00B00768FE7 /* Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extension.swift; sourceTree = ""; }; + 79DD0DBA2A971EB300768FE7 /* ZDViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZDViewController.swift; sourceTree = ""; }; 79EAD8072A7B86600036E093 /* OrderScheduling.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OrderScheduling.app; sourceTree = BUILT_PRODUCTS_DIR; }; 79EAD8132A7B86610036E093 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 79EAD8162A7B86610036E093 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; @@ -561,6 +563,7 @@ 79DD0DB72A97012400768FE7 /* Controller */ = { isa = PBXGroup; children = ( + 79DD0DBA2A971EB300768FE7 /* ZDViewController.swift */, ); path = Controller; sourceTree = ""; @@ -783,6 +786,7 @@ 791887C12A839784007EA0C1 /* RefuseOrderEntryView.swift in Sources */, 7918877E2A7CE5AD007EA0C1 /* NotificationStrings.swift in Sources */, 79CECC1B2A89F83800B95D8B /* AdditionalPhotoController.swift in Sources */, + 79DD0DBB2A971EB300768FE7 /* ZDViewController.swift in Sources */, 791887BF2A839716007EA0C1 /* EntryStrings.swift in Sources */, 794FBB192A8F4AF000D57BB8 /* MessageCount.swift in Sources */, 791887892A7CE79E007EA0C1 /* LoginController.swift in Sources */, diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index d207c12..b488a66 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 2d4e02c..8012383 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -253,8 +253,8 @@ filePath = "OrderScheduling/Main/Initial.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "96" - endingLineNumber = "96" + startingLineNumber = "97" + endingLineNumber = "97" landmarkName = "networkErrorHandler(response:)" landmarkType = "7"> @@ -269,8 +269,8 @@ filePath = "OrderScheduling/Main/Initial.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "97" - endingLineNumber = "97" + startingLineNumber = "98" + endingLineNumber = "98" landmarkName = "networkErrorHandler(response:)" landmarkType = "7"> @@ -746,8 +746,8 @@ filePath = "OrderScheduling/Main/Initial.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "113" - endingLineNumber = "113" + startingLineNumber = "114" + endingLineNumber = "114" landmarkName = "errorCodeHandler(response:)" landmarkType = "7"> @@ -762,8 +762,8 @@ filePath = "OrderScheduling/Main/Initial.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "116" - endingLineNumber = "116" + startingLineNumber = "117" + endingLineNumber = "117" landmarkName = "errorCodeHandler(response:)" landmarkType = "7"> @@ -778,8 +778,8 @@ filePath = "OrderScheduling/Main/Initial.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "124" - endingLineNumber = "124" + startingLineNumber = "125" + endingLineNumber = "125" landmarkName = "errorCodeHandler(response:)" landmarkType = "7"> @@ -1928,8 +1928,8 @@ filePath = "OrderScheduling/Main/Initial.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "77" - endingLineNumber = "77" + startingLineNumber = "78" + endingLineNumber = "78" landmarkName = "changeRootViewController(window:)" landmarkType = "7"> @@ -1944,8 +1944,8 @@ filePath = "OrderScheduling/Main/Initial.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "72" - endingLineNumber = "72" + startingLineNumber = "73" + endingLineNumber = "73" landmarkName = "changeRootViewController(window:)" landmarkType = "7"> diff --git a/OrderScheduling/Common/Controller/ZDViewController.swift b/OrderScheduling/Common/Controller/ZDViewController.swift new file mode 100644 index 0000000..93b5f37 --- /dev/null +++ b/OrderScheduling/Common/Controller/ZDViewController.swift @@ -0,0 +1,14 @@ +// +// ZDViewController.swift +// OrderScheduling +// +// Created by 中道 on 2023/8/24. +// + +import Foundation +import DDControlsKit_Private + +open class ZDViewController : DDViewController { + open func reloadData() { + } +} diff --git a/OrderScheduling/Entry/Entry.swift b/OrderScheduling/Entry/Entry.swift index a34f94e..f1007ec 100644 --- a/OrderScheduling/Entry/Entry.swift +++ b/OrderScheduling/Entry/Entry.swift @@ -16,7 +16,6 @@ open class Entry { public func showRefuseOrderEntry(view:UIView,name:String? = nil){ var attributes = EKAttributes() - attributes.positionConstraints.rotation.isEnabled = false attributes = .centerFloat attributes.name = name attributes.precedence = .override(priority: .normal, dropEnqueuedEntries: false) @@ -54,6 +53,7 @@ open class Entry { ) attributes.positionConstraints.verticalOffset = 0 attributes.positionConstraints.safeArea = .overridden + attributes.positionConstraints.rotation.isEnabled = false attributes.statusBar = .light SwiftEntryKit.display(entry: view, using: attributes) } @@ -98,6 +98,7 @@ open class Entry { ) attributes.positionConstraints.verticalOffset = 0 attributes.positionConstraints.safeArea = .overridden + attributes.positionConstraints.rotation.isEnabled = false attributes.statusBar = .light SwiftEntryKit.display(entry: view, using: attributes) } @@ -142,6 +143,7 @@ open class Entry { ) attributes.positionConstraints.verticalOffset = 0 attributes.positionConstraints.safeArea = .overridden + attributes.positionConstraints.rotation.isEnabled = false attributes.statusBar = .light SwiftEntryKit.display(entry: view, using: attributes) } diff --git a/OrderScheduling/History/ViewController/HistoryController.swift b/OrderScheduling/History/ViewController/HistoryController.swift index 33e7027..614025f 100644 --- a/OrderScheduling/History/ViewController/HistoryController.swift +++ b/OrderScheduling/History/ViewController/HistoryController.swift @@ -240,7 +240,7 @@ extension HistoryController : JXCategoryViewDelegate,JXCategoryListContainerView } } -open class HistoryController : DDViewController { +open class HistoryController : ZDViewController { private let categoryView = JXCategoryTitleView() private lazy var categoryContainerView = JXCategoryListContainerView(type: .scrollView, delegate: self) private let reloadToDoMessageCountRelay = ReplayRelay.create(bufferSize: 1) diff --git a/OrderScheduling/Main/Initial.swift b/OrderScheduling/Main/Initial.swift index 902a65d..094673b 100644 --- a/OrderScheduling/Main/Initial.swift +++ b/OrderScheduling/Main/Initial.swift @@ -14,6 +14,7 @@ import Alamofire import DDToastKit_Private import DDCategoryKit_Private import DDControlsKit_Private +import CocoaDebug class Initial : NSObject { static let shareInstance = Initial.init() @@ -33,7 +34,7 @@ class Initial : NSObject { initAF() // - + CocoaDebug.disable() } func initIQKeyboard(){ diff --git a/OrderScheduling/Main/MainTabBarController.swift b/OrderScheduling/Main/MainTabBarController.swift index d54c773..e40ab6b 100644 --- a/OrderScheduling/Main/MainTabBarController.swift +++ b/OrderScheduling/Main/MainTabBarController.swift @@ -47,7 +47,7 @@ open class MainTabBarController : ESTabBarController,UITabBarControllerDelegate public func tabBarController(_ tabBarController: UITabBarController, didSelect viewController: UIViewController) { let nav = viewController as? UINavigationController - (nav?.topViewController as? DDViewController)?.reloadData() + (nav?.topViewController as? ZDViewController)?.reloadData() } } diff --git a/OrderScheduling/Mine/ViewController/MineController.swift b/OrderScheduling/Mine/ViewController/MineController.swift index 96c490f..c4904cb 100644 --- a/OrderScheduling/Mine/ViewController/MineController.swift +++ b/OrderScheduling/Mine/ViewController/MineController.swift @@ -136,7 +136,7 @@ extension MineController { } } -open class MineController : DDViewController { +open class MineController : ZDViewController { private let mineView = MineView() private let disposeBag = DisposeBag() private let preRefreshRelay = ReplayRelay.create(bufferSize: 1) diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index b345050..0fd4b21 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -231,7 +231,7 @@ extension RescuePendingOrderController { var refuseReasonDesc : String? if view.timeView.selectButton.isSelected == true { refuseReasonItem = RefuseDispatchParameters.RefuseReasonItemEnum.time.rawValue - if view.timeTextFieldView.textFiled.text?.isEmpty != false { + if view.timeTextFieldView.textFiled.text?.isEmpty == false { refuseReasonDesc = (view.timeTextFieldView.textFiled.text)!+(view.timeTextFieldView.unitLabel.text)! }else{ refuseReasonDesc = nil @@ -239,7 +239,7 @@ extension RescuePendingOrderController { } if view.distanceView.selectButton.isSelected == true { refuseReasonItem = RefuseDispatchParameters.RefuseReasonItemEnum.disatance.rawValue - if view.distanceTextFieldView.textFiled.text?.isEmpty != false { + if view.distanceTextFieldView.textFiled.text?.isEmpty == false { refuseReasonDesc = (view.distanceTextFieldView.textFiled.text)!+(view.distanceTextFieldView.unitLabel.text)! }else{ refuseReasonDesc = nil @@ -790,7 +790,7 @@ extension RescuePendingDispatchController : UICollectionViewDelegate, UICollecti } // MARK: 救援中 -class RescueController : DDViewController { +class RescueController : ZDViewController { private let categoryView = JXCategoryTitleView() private lazy var categoryContainerView = JXCategoryListContainerView(type: .scrollView, delegate: self) private let messageTapGes = UITapGestureRecognizer() diff --git a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift index 79e6b23..1b7d639 100644 --- a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift +++ b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift @@ -151,7 +151,7 @@ extension ReviewFailedController : UITableViewDelegate,UITableViewDataSource { } } -open class ReviewFailedController : DDViewController { +open class ReviewFailedController : ZDViewController { private let reviewFailedView = ReviewFailedView() private var pageNum : Int = 1 private var preRefreshRelay = ReplayRelay.create(bufferSize: 1) diff --git a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift index 64a7ff5..28fe45b 100644 --- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift +++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift @@ -492,7 +492,7 @@ extension VehicleMonitoringController : JXCategoryViewDelegate { } } -open class VehicleMonitoringController : DDViewController { +open class VehicleMonitoringController : ZDViewController { private let vehicleMonitoringView = VehicleMonitoringView(titles:[""]) public var zIndex = 0 private let disposeBag = DisposeBag() diff --git a/Podfile b/Podfile index db5d289..d31ea60 100644 --- a/Podfile +++ b/Podfile @@ -26,7 +26,7 @@ target 'OrderScheduling' do pod 'DDNetworkingOfAlamofireKit_Private' pod 'DDProgressHUDKit_Private', :path=> '/Users/zd/Desktop/PodRepository/DDProgressHUDKit_Private' pod 'JXCategoryView' - pod 'DDControlsKit_Private', :path=> '/Users/zd/Desktop/PodRepository/DDControlsKit_Private' + pod 'DDControlsKit_Private' pod 'SwiftEntryKit' pod 'MJRefresh' pod 'DDWebImageKit_Private'