update

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

@@ -555,8 +555,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "779"
+            startingLineNumber = "780"
-            endingLineNumber = "779"
+            endingLineNumber = "780"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -571,8 +571,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "780"
+            startingLineNumber = "781"
-            endingLineNumber = "780"
+            endingLineNumber = "781"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -778,8 +778,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "326"
+            startingLineNumber = "309"
-            endingLineNumber = "326"
+            endingLineNumber = "309"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -794,8 +794,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "304"
+            startingLineNumber = "287"
-            endingLineNumber = "304"
+            endingLineNumber = "287"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -810,8 +810,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "306"
+            startingLineNumber = "289"
-            endingLineNumber = "306"
+            endingLineNumber = "289"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -826,8 +826,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "332"
+            startingLineNumber = "315"
-            endingLineNumber = "332"
+            endingLineNumber = "315"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -842,8 +842,8 @@
             filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "331"
+            startingLineNumber = "314"
-            endingLineNumber = "331"
+            endingLineNumber = "314"
             landmarkName = "dd_mapView(_:viewFor:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -1408,38 +1408,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "E7562F84-F178-4518-B7E4-03C58B0C7A91"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "194"
-            endingLineNumber = "194"
-            landmarkName = "addAction()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F8ECE186-F9F8-4A78-8C33-592365C104F0"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "195"
-            endingLineNumber = "195"
-            landmarkName = "addAction()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -2915,8 +2883,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "776"
+            startingLineNumber = "777"
-            endingLineNumber = "776"
+            endingLineNumber = "777"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2931,8 +2899,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "774"
+            startingLineNumber = "775"
-            endingLineNumber = "774"
+            endingLineNumber = "775"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2947,8 +2915,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "775"
+            startingLineNumber = "776"
-            endingLineNumber = "775"
+            endingLineNumber = "776"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
             <Locations>
@@ -3033,5 +3001,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "0B2ED57F-8001-40C7-A43D-547933336B3A"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../../PodRepository/DDCategoryKit_Private/DDCategoryKit_Private/Classes/UIImage+DDCategory/UIImage+DDCategory.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "51"
+            endingLineNumber = "51"
+            landmarkName = "-dd_compressWithQulitySize:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

OrderScheduling/Rescue/ViewController/RescueController.swift

@@ -769,9 +769,10 @@ extension RescuePendingDispatchController : UICollectionViewDelegate, UICollecti
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "cell", for: indexPath) as? RescuePendingDispatchPhotoCell
         let imageUrlStr = environmentPics[indexPath.item]
+        cell!.imageView.image = nil
         if imageUrlStr.contains(".mp4?") == true {
             DispatchQueue.global().async {
-                let image = DDImage.dd_thumbnailImage(forVideo: URL(string: imageUrlStr)!)
+                let image = DDImage.dd_thumbnailImage(forVideo: URL(string: imageUrlStr)!).dd_compress(withQulitySize: 5 * 1024)
                 DispatchQueue.main.async {
                     cell!.imageView.image = image
                 }

OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift

@@ -59,9 +59,7 @@ extension VehicleMonitoringController {
                 }
             })
             .disposed(by: disposeBag)
-        
+
-        NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
-        
         reloadRelay
             .observe(on: MainScheduler.instance)
             .do(onNext: {[weak self] _ in
@@ -183,23 +181,8 @@ extension VehicleMonitoringController {
             })
             .disposed(by: disposeBag)
                 
-//        vehicleMonitoringView.refreshButton.sendActions(for: .touchUpInside)
-//        var duration = 0
-//        DDTimerManager.dd_share().dd_addTimer(withName: refresh_vehicle_monitoring_key, timeInterval: 1, repeatCount: 0, delay: 0) {[weak self] (manager, obj, index) in
-//            if duration == 0 {
-//                duration = 60
-//                self?.reloadRelay.accept(nil)
-//            }
-//            duration-=1
-//            DispatchQueue.main.async {[weak self] in
-//                self?.vehicleMonitoringView.refreshButton.setTitle("自动刷新倒计时:"+"\(duration)s", for: .normal)
-//            }
-//        }
-    }
-    
-    public override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
         NotificationCenter.default.post(name: NSNotification.Name(rawValue: Notification_reloadRescusControolerToDoMessageCount), object: nil)
+        
     }
 }
 
@@ -484,18 +467,22 @@ extension VehicleMonitoringController : JXCategoryViewDelegate {
         }
         
         vehicleMonitoringView.maMapView.maMapView.removeAnnotations(mapAnnotaions)
+        var hasSetCenter = false
         for index in 0..<(mapModel?.count ?? 0) {
             let model = mapModel?[index]
-            let coordinate = CLLocationCoordinate2D(latitude: Double(model?.lat ?? "") ?? 0, longitude: Double(model?.lon ?? "") ?? 0)
+            if model?.lat != nil && model?.lon != nil {
-            let pointAnnotation = MAPointAnnotation.init()
+                let coordinate = CLLocationCoordinate2D(latitude: Double(model?.lat ?? "") ?? 0, longitude: Double(model?.lon ?? "") ?? 0)
-            pointAnnotation.annotationClass = VehicleMonitoringPointAnnotation.self
+                let pointAnnotation = MAPointAnnotation.init()
-            pointAnnotation.coordinate = coordinate
+                pointAnnotation.annotationClass = VehicleMonitoringPointAnnotation.self
-            pointAnnotation.tag = index
+                pointAnnotation.coordinate = coordinate
-            vehicleMonitoringView.maMapView.maMapView.addAnnotation(pointAnnotation)
+                pointAnnotation.tag = index
-            mapAnnotaions.append(pointAnnotation)
+                vehicleMonitoringView.maMapView.maMapView.addAnnotation(pointAnnotation)
-            
+                mapAnnotaions.append(pointAnnotation)
-            if index == 0{
+                
-                vehicleMonitoringView.maMapView.maMapView.setCenter(coordinate, animated: true)
+                if hasSetCenter == false {
+                    hasSetCenter = true
+                    vehicleMonitoringView.maMapView.maMapView.setCenter(coordinate, animated: true)
+                }
             }
         }
     }
@@ -536,16 +523,10 @@ open class VehicleMonitoringController : ZDViewController {
             make.left.right.bottom.equalToSuperview()
             make.top.equalToSuperview().offset(CGRectGetHeight(UIApplication.shared.dd_statusBarFrame)+CGRectGetHeight(navigationController?.navigationBar.frame ?? .zero))
         }
-        
+
         vehicleMonitoringView.maMapView.delegate = self
         vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.delegate = self
-        vehicleMonitoringView.vehicleMonitoringPannelView.radiusView.addSubview(categoryContainerView!)
         vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.listContainer = categoryContainerView
-        categoryContainerView?.snp.makeConstraints({ make in
-            make.top.equalTo(vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.snp.bottom)
-            make.left.right.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-CGRectGetHeight(tabBarController?.tabBar.frame ?? .zero))
-        })
         
         messageView.titleLabel.text = "消息"
         messageView.addGestureRecognizer(messageTapGes)
@@ -566,6 +547,17 @@ open class VehicleMonitoringController : ZDViewController {
             make.width.greaterThanOrEqualTo(40)
         }
     }
+
+    open override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        vehicleMonitoringView.vehicleMonitoringPannelView.radiusView.addSubview(categoryContainerView!)
+        categoryContainerView?.snp.makeConstraints({ make in
+            make.top.equalTo(vehicleMonitoringView.vehicleMonitoringPannelView.categoryView.snp.bottom)
+            make.left.right.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-CGRectGetHeight(tabBarController?.tabBar.frame ?? .zero))
+        })
+
+    }
     
     open override func reloadData() {
         super.reloadData()
@@ -643,7 +635,6 @@ open class VehicleMonitoringPannelView : DDView {
         categoryView.backgroundColor = .hex("FBFBFB")
         let indicator = JXCategoryIndicatorLineView()
         indicator.indicatorColor = .hex("3678FF")
-        indicator.indicatorWidth = JXCategoryViewAutomaticDimension
         indicator.verticalMargin = 0
         indicator.indicatorWidth = auto(18)
         categoryView.indicators = [indicator]