optimise

OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -794,8 +794,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "272"
+            startingLineNumber = "271"
-            endingLineNumber = "272"
+            endingLineNumber = "271"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -842,8 +842,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "398"
+            startingLineNumber = "397"
-            endingLineNumber = "398"
+            endingLineNumber = "397"
             landmarkName = "categoryView(_:didScrollSelectedItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -858,8 +858,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "278"
+            startingLineNumber = "277"
-            endingLineNumber = "278"
+            endingLineNumber = "277"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -874,8 +874,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "277"
+            startingLineNumber = "276"
-            endingLineNumber = "277"
+            endingLineNumber = "276"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>

OrderScheduling/ReviewFailed/ViewController/AdditionalPhotoController.swift

@@ -107,7 +107,7 @@ extension AdditionalPhotoController : UICollectionViewDelegate, UICollectionView
         }
         cell?.takePhotoButton.rx.tap
             .observe(on: MainScheduler.instance)
-            .subscribe(onNext: { _ in
+            .subscribe(onNext: {[weak self] _ in
                 ZLPhotoConfiguration.default().allowSelectVideo = false
                 ZLPhotoConfiguration.default().maxSelectCount = 1
                 ZLPhotoConfiguration.default().allowTakePhotoInLibrary = true
@@ -120,7 +120,9 @@ extension AdditionalPhotoController : UICollectionViewDelegate, UICollectionView
                     itemModel.uploadImage = image?.dd_compressedToData(withQulitySize: 1048576)
                     self?.uploadImageRelay.accept(itemModel)
                 }
+                if let self {
                     photoPreviewSheet.showPhotoLibrary(sender: self)
+                }
             })
             .disposed(by: cell!.disposeBag)
         return cell!

OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitorVideoController.swift

@@ -27,7 +27,7 @@ extension VehicleMonitorVideoController {
                 self?.view.dd_showHUD()
             })
             .flatMapLatest {[weak self] _ in
-                return RQ.getRtspChannel(prameters: RtspChannelParameters(vehicleId: 203656))
+                return RQ.getRtspChannel(prameters: RtspChannelParameters(vehicleId: (self?.vehicleId)!))
             }
             .observe(on: MainScheduler.instance)
             .do(onNext: {[weak self] _ in

OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift

@@ -251,19 +251,18 @@ extension VehicleMonitoringController : DDMAMapViewDelegate {
                 }
                 
                 var vehicleMonitoringPointAnnotationNameInset = vehicleMonitoringPointAnnotationNameLeftInset + vehicleMonitoringPointAnnotationNameRightInset
-//                if model?.terminalType == .GPS {
+                if model?.terminalType == .GPS {
-//                    annotationView?.cameraBackgroundImageView.isHidden = false
+                    annotationView?.cameraBackgroundImageView.isHidden = false
-//                    annotationView?.nameLabel.snp.updateConstraints({ make in
+                    annotationView?.nameLabel.snp.updateConstraints({ make in
-//                        make.right.equalToSuperview().offset(-auto(35))
+                        make.right.equalToSuperview().offset(-auto(35))
-//                    })
+                    })
-//                }else{
+                }else{
-//                    annotationView?.cameraBackgroundImageView.isHidden = true
+                    annotationView?.cameraBackgroundImageView.isHidden = true
-//                    annotationView?.nameLabel.snp.updateConstraints({ make in
+                    annotationView?.nameLabel.snp.updateConstraints({ make in
-//                        make.right.equalToSuperview().offset(-auto(5))
+                        make.right.equalToSuperview().offset(-auto(5))
-//                    })
+                    })
-//                    vehicleMonitoringPointAnnotationNameInset = vehicleMonitoringPointAnnotationNameInset - auto(30)
+                    vehicleMonitoringPointAnnotationNameInset = vehicleMonitoringPointAnnotationNameInset - auto(30)
-//                }
+                }
-                
                 let contentSizeH = annotationView?.contentLabel.sizeThatFits(CGSize(width: vehicleMonitoringPointAnnotationW, height: 1000)).height ?? 0
                 var nameSizeH = annotationView?.nameLabel.sizeThatFits(CGSize(width: vehicleMonitoringPointAnnotationW - vehicleMonitoringPointAnnotationNameInset, height: 1000)).height ?? 0
                 if nameSizeH < vehicleMonitoringPointAnnotationNameAtLeastH {

Podfile

@@ -23,7 +23,7 @@ target 'OrderScheduling' do
   pod 'RxCocoa'
   pod 'DDTimerKit_Private'
   pod 'DDToastKit_Private'
-  pod 'DDNetworkingOfAlamofireKit_Private',:path => "/Users/zd/Desktop/PodRepository/DDNetworkingOfAlamofireKit_Private"
+  pod 'DDNetworkingOfAlamofireKit_Private'
   pod 'DDProgressHUDKit_Private'
   pod 'JXCategoryView'
   pod 'DDControlsKit_Private'

Podfile.lock

@@ -250,7 +250,7 @@ PODS:
     - DDLogKit_Private
   - DDMAMapKit_Private/DDMAUtil (0.1.3):
     - DDMAMapKit_Private/DDMAMap
-  - DDNetworkingOfAlamofireKit_Private (0.1.7):
+  - DDNetworkingOfAlamofireKit_Private (0.1.8):
     - Alamofire
     - DDLogKit_Private
     - RxSwift
@@ -301,7 +301,7 @@ DEPENDENCIES:
   - DDControlsKit_Private
   - DDFontKit_Private
   - DDMAMapKit_Private
-  - DDNetworkingOfAlamofireKit_Private (from `/Users/zd/Desktop/PodRepository/DDNetworkingOfAlamofireKit_Private`)
+  - DDNetworkingOfAlamofireKit_Private
   - DDProgressHUDKit_Private
   - DDTimerKit_Private
   - DDToastKit_Private
@@ -330,6 +330,7 @@ SPEC REPOS:
     - DDFontKit_Private
     - DDLogKit_Private
     - DDMAMapKit_Private
+    - DDNetworkingOfAlamofireKit_Private
     - DDProgressHUDKit_Private
     - DDTimerKit_Private
     - DDToastKit_Private
@@ -353,8 +354,6 @@ SPEC REPOS:
     - ZLPhotoBrowser
 
 EXTERNAL SOURCES:
-  DDNetworkingOfAlamofireKit_Private:
-    :path: "/Users/zd/Desktop/PodRepository/DDNetworkingOfAlamofireKit_Private"
   ZFPlayer:
     :path: "/Users/zd/Downloads/iOS相关/ZFPlayer-master"
 
@@ -373,7 +372,7 @@ SPEC CHECKSUMS:
   DDFontKit_Private: 7b8f4ebf0f60622874036202734d8460dc7b3806
   DDLogKit_Private: 1ed442cc7be004bd05f27bfda9b525e113df54e0
   DDMAMapKit_Private: 8e70d3f58cb70ce30705a2f10d696e42878ce52d
-  DDNetworkingOfAlamofireKit_Private: 3cfdd9f5498cac07092667c18dd30bb6df42be99
+  DDNetworkingOfAlamofireKit_Private: d65c96f99bc59311d374e7b7a7e8a9e042d9b5ea
   DDProgressHUDKit_Private: 2046b3cc10a6fe4c7bd454b7431fe80efdd58923
   DDTimerKit_Private: 3713d029a72710f42a5dd5a32083d6aad8f51eb0
   DDToastKit_Private: b6ae3709d110cadca503a037419f3709d1755256
@@ -390,6 +389,6 @@ SPEC CHECKSUMS:
   ZFPlayer: ba6410f1043fc8a3b7769749f860cf237016df09
   ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b
 
-PODFILE CHECKSUM: 73391f27087fbdd1ea2c05bf543e9f5f3227e4d1
+PODFILE CHECKSUM: 35f200a29520ee2712b22639b1f230ab047e1457
 
 COCOAPODS: 1.11.3

Pods/DDNetworkingOfAlamofireKit_Private/DDNetworkingOfAlamofireKit_Private/Classes/DDAF.swift

@@ -58,6 +58,16 @@ extension DDAlamofire {
         }
     }
     
+    public func upload<T:Decodable>(urlString:String,headers:HTTPHeaders? = nil,responseType:T.Type = T.self,multipartFormData: @escaping (MultipartFormData) -> Void,uploadProgress: @escaping (Progress) -> Void) -> Single<T?> {
+        return Single<T?>.create {[weak self] single in
+            self?.upload(urlString: urlString,method: .post,headers: headers,responseType: responseType,multipartFormData: multipartFormData,uploadProgress: uploadProgress,completionHandler: { response in
+                self?.logInfo(parameters: nil, response: response)
+                single(.success(response.value))
+            })
+            return Disposables.create()
+        }
+    }
+    
     private func logInfo<T:Decodable,P:Encodable>(parameters:P?,response:AFDataResponse<T>) {
         DDLog(message: (parameters.debugDescription+"\n"+response.debugDescription))
     }

Pods/DDNetworkingOfAlamofireKit_Private/DDNetworkingOfAlamofireKit_Private/Classes/DDAlamofire.swift

@@ -42,7 +42,7 @@ open class DDAlamofire : NSObject {
         }
     }
     
-    public func upload<T: Decodable,P: Encodable>(urlString:String,method:HTTPMethod,parameters:P? = nil,encoding:ParameterEncoder = URLEncodedFormParameterEncoder.default,headers:HTTPHeaders? = nil,responseType:T.Type = T.self,multipartFormData: @escaping (MultipartFormData) -> Void,uploadProgress: @escaping (Progress) -> Void,completionHandler: @escaping ((AFDataResponse<T>) -> Void)) {
+    public func upload<T: Decodable>(urlString:String,method:HTTPMethod,headers:HTTPHeaders? = nil,responseType:T.Type = T.self,multipartFormData: @escaping (MultipartFormData) -> Void,uploadProgress: @escaping (Progress) -> Void,completionHandler: @escaping ((AFDataResponse<T>) -> Void)) {
         let _ = AF.upload(multipartFormData: { muiltipart in
             multipartFormData(muiltipart)
         }, urlString: urlString,method: method,headers: headers,requestModifier: {$0.timeoutInterval = 15},uploadProgress: { progress in

Pods/Local Podspecs/DDNetworkingOfAlamofireKit_Private.podspec.json

@@ -1,38 +0,0 @@
-{
-  "name": "DDNetworkingOfAlamofireKit_Private",
-  "version": "0.1.7",
-  "summary": "A short description of DDNetworkingOfAlamofireKit_Private.",
-  "description": "TODO: Add long description of the pod here.",
-  "homepage": "https://github.com/DDIsFriend/DDNetworkingOfAlamofireKit_Private",
-  "license": {
-    "type": "MIT",
-    "file": "LICENSE"
-  },
-  "authors": {
-    "DDIsFriend": "DDIsFriend@163.com"
-  },
-  "source": {
-    "git": "git@github.com:DDIsFriend/DDNetworkingOfAlamofireKit_Private.git",
-    "tag": "0.1.7"
-  },
-  "platforms": {
-    "ios": "11.0"
-  },
-  "source_files": "DDNetworkingOfAlamofireKit_Private/Classes/**/*",
-  "dependencies": {
-    "Alamofire": [
-
-    ],
-    "RxSwift": [
-
-    ],
-    "DDLogKit_Private": [
-
-    ]
-  },
-  "pod_target_xcconfig": {
-    "VALID_ARCHS": "x86_64 armv7 arm64",
-    "EXCLUDED_ARCHS[sdk=iphonesimulator*]": "arm64",
-    "OTHER_LINKER_FLAGS": "$(inherited)"
-  }
-}

Pods/Manifest.lock

@@ -250,7 +250,7 @@ PODS:
     - DDLogKit_Private
   - DDMAMapKit_Private/DDMAUtil (0.1.3):
     - DDMAMapKit_Private/DDMAMap
-  - DDNetworkingOfAlamofireKit_Private (0.1.7):
+  - DDNetworkingOfAlamofireKit_Private (0.1.8):
     - Alamofire
     - DDLogKit_Private
     - RxSwift
@@ -301,7 +301,7 @@ DEPENDENCIES:
   - DDControlsKit_Private
   - DDFontKit_Private
   - DDMAMapKit_Private
-  - DDNetworkingOfAlamofireKit_Private (from `/Users/zd/Desktop/PodRepository/DDNetworkingOfAlamofireKit_Private`)
+  - DDNetworkingOfAlamofireKit_Private
   - DDProgressHUDKit_Private
   - DDTimerKit_Private
   - DDToastKit_Private
@@ -330,6 +330,7 @@ SPEC REPOS:
     - DDFontKit_Private
     - DDLogKit_Private
     - DDMAMapKit_Private
+    - DDNetworkingOfAlamofireKit_Private
     - DDProgressHUDKit_Private
     - DDTimerKit_Private
     - DDToastKit_Private
@@ -353,8 +354,6 @@ SPEC REPOS:
     - ZLPhotoBrowser
 
 EXTERNAL SOURCES:
-  DDNetworkingOfAlamofireKit_Private:
-    :path: "/Users/zd/Desktop/PodRepository/DDNetworkingOfAlamofireKit_Private"
   ZFPlayer:
     :path: "/Users/zd/Downloads/iOS相关/ZFPlayer-master"
 
@@ -373,7 +372,7 @@ SPEC CHECKSUMS:
   DDFontKit_Private: 7b8f4ebf0f60622874036202734d8460dc7b3806
   DDLogKit_Private: 1ed442cc7be004bd05f27bfda9b525e113df54e0
   DDMAMapKit_Private: 8e70d3f58cb70ce30705a2f10d696e42878ce52d
-  DDNetworkingOfAlamofireKit_Private: 3cfdd9f5498cac07092667c18dd30bb6df42be99
+  DDNetworkingOfAlamofireKit_Private: d65c96f99bc59311d374e7b7a7e8a9e042d9b5ea
   DDProgressHUDKit_Private: 2046b3cc10a6fe4c7bd454b7431fe80efdd58923
   DDTimerKit_Private: 3713d029a72710f42a5dd5a32083d6aad8f51eb0
   DDToastKit_Private: b6ae3709d110cadca503a037419f3709d1755256
@@ -390,6 +389,6 @@ SPEC CHECKSUMS:
   ZFPlayer: ba6410f1043fc8a3b7769749f860cf237016df09
   ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b
 
-PODFILE CHECKSUM: 73391f27087fbdd1ea2c05bf543e9f5f3227e4d1
+PODFILE CHECKSUM: 35f200a29520ee2712b22639b1f230ab047e1457
 
 COCOAPODS: 1.11.3

Pods/Target Support Files/DDNetworkingOfAlamofireKit_Private/DDNetworkingOfAlamofireKit_Private.debug.xcconfig

@@ -8,7 +8,7 @@ OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -Xcc -fmodule-map-file="${PODS_CON
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/../../../PodRepository/DDNetworkingOfAlamofireKit_Private
+PODS_TARGET_SRCROOT = ${PODS_ROOT}/DDNetworkingOfAlamofireKit_Private
 PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES

Pods/Target Support Files/DDNetworkingOfAlamofireKit_Private/DDNetworkingOfAlamofireKit_Private.release.xcconfig

@@ -8,7 +8,7 @@ OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS -Xcc -fmodule-map-file="${PODS_CON
 PODS_BUILD_DIR = ${BUILD_DIR}
 PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
 PODS_ROOT = ${SRCROOT}
-PODS_TARGET_SRCROOT = ${PODS_ROOT}/../../../PodRepository/DDNetworkingOfAlamofireKit_Private
+PODS_TARGET_SRCROOT = ${PODS_ROOT}/DDNetworkingOfAlamofireKit_Private
 PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates
 PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
 SKIP_INSTALL = YES