update

2023-08-29 11:04:54 +08:00
parent a57bbc0070
commit b6ef0cfb06
5 changed files with 66 additions and 90 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate
--- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/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"
-            endingLineNumber = "779"
+            startingLineNumber = "780"
+            endingLineNumber = "780"
            landmarkName = "collectionView(_:cellForItemAt:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -571,8 +571,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "780"
-            endingLineNumber = "780"
+            startingLineNumber = "781"
+            endingLineNumber = "781"
            landmarkName = "collectionView(_:cellForItemAt:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -778,8 +778,8 @@
            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "326"
-            endingLineNumber = "326"
+            startingLineNumber = "309"
+            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"
-            endingLineNumber = "304"
+            startingLineNumber = "287"
+            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"
-            endingLineNumber = "306"
+            startingLineNumber = "289"
+            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"
-            endingLineNumber = "332"
+            startingLineNumber = "315"
+            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"
-            endingLineNumber = "331"
+            startingLineNumber = "314"
+            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"
-            endingLineNumber = "776"
+            startingLineNumber = "777"
+            endingLineNumber = "777"
            landmarkName = "collectionView(_:cellForItemAt:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -2931,8 +2899,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "774"
-            endingLineNumber = "774"
+            startingLineNumber = "775"
+            endingLineNumber = "775"
            landmarkName = "collectionView(_:cellForItemAt:)"
            landmarkType = "7">
         </BreakpointContent>
@@ -2947,8 +2915,8 @@
            filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "775"
-            endingLineNumber = "775"
+            startingLineNumber = "776"
+            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>
--- a/OrderScheduling/Rescue/ViewController/RescueController.swift
+++ b/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
                }
--- a/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
+++ b/OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift
@@ -60,8 +60,6 @@ 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,8 +467,10 @@ extension VehicleMonitoringController : JXCategoryViewDelegate {
        }
        
        vehicleMonitoringView.maMapView.maMapView.removeAnnotations(mapAnnotaions)
+        var hasSetCenter = false
        for index in 0..<(mapModel?.count ?? 0) {
            let model = mapModel?[index]
+            if model?.lat != nil && model?.lon != nil {
                let coordinate = CLLocationCoordinate2D(latitude: Double(model?.lat ?? "") ?? 0, longitude: Double(model?.lon ?? "") ?? 0)
                let pointAnnotation = MAPointAnnotation.init()
                pointAnnotation.annotationClass = VehicleMonitoringPointAnnotation.self
@@ -494,11 +479,13 @@ extension VehicleMonitoringController : JXCategoryViewDelegate {
                vehicleMonitoringView.maMapView.maMapView.addAnnotation(pointAnnotation)
                mapAnnotaions.append(pointAnnotation)
                
-            if index == 0{
+                if hasSetCenter == false {
+                    hasSetCenter = true
                    vehicleMonitoringView.maMapView.maMapView.setCenter(coordinate, animated: true)
                }
            }
        }
+    }
 }

 open class VehicleMonitoringController : ZDViewController {
@@ -539,13 +526,7 @@ open class VehicleMonitoringController : ZDViewController {

        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)
@@ -567,6 +548,17 @@ open class VehicleMonitoringController : ZDViewController {
        }
    }

+    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()
        preRefreshRelay.accept(nil)
@@ -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]