push

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

@@ -832,22 +832,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "4FC1F670-5D47-4382-AACE-B67D246E9C12"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "446"
-            endingLineNumber = "446"
-            landmarkName = "categoryView(_:didScrollSelectedItemAt:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -1756,6 +1740,38 @@
             endingLineNumber = "120"
             landmarkName = "jpushNotificationCenter(_:didReceive:withCompletionHandler:)"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "CFCD4B6D-6F9B-4A1C-97F9-7EADFA549A6F - c4594238c72aeac5"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, didReceive: __C.UNNotificationResponse, withCompletionHandler: () -&gt; ()) -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/AppDelegate.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "120"
+                  endingLineNumber = "120"
+                  offsetFromSymbolStart = "382">
+               </Location>
+               <Location
+                  uuid = "CFCD4B6D-6F9B-4A1C-97F9-7EADFA549A6F - c4594238c72aeac5"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "OrderScheduling.AppDelegate.jpushNotificationCenter(_: __C.UNUserNotificationCenter, didReceive: __C.UNNotificationResponse, withCompletionHandler: () -&gt; ()) -&gt; ()"
+                  moduleName = "OrderScheduling"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/zd/Desktop/%E4%B8%AD%E9%81%93%E6%95%91%E6%8F%B4/OrderScheduling/OrderScheduling/Main/AppDelegate.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "120"
+                  endingLineNumber = "120"
+                  offsetFromSymbolStart = "296">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy

OrderScheduling/History/ViewController/HistoryController.swift

@@ -384,7 +384,7 @@ class HistoryItemCell : DDTableViewCell {
         orderStatusLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("E69B0B"))
         line = DDView.init()
         orderDateTitleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("000000").alpha(0.5))
-        orderDateLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("252525"))
+        orderDateLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(12)), textColor: .hex("000000"))
         serviceTitleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("000000").alpha(0.5))
         serviceLabel = DDLabel.dd_init(withText: "", font: .regularFont(auto(12)), textColor: .hex("000000"))
         destinationTitleLabel = DDLabel.dd_init(withText: "", font: .mediumFont(auto(12)), textColor: .hex("000000").alpha(0.5))
@@ -413,6 +413,7 @@ class HistoryItemCell : DDTableViewCell {
         radiusView.addSubview(typeLabel)
         radiusView.addSubview(orderNumLabel)
         orderStatusLabel.numberOfLines = 0
+        orderStatusLabel.textAlignment = .right
         radiusView.addSubview(orderStatusLabel)
         radiusView.addSubview(line)
         radiusView.addSubview(orderDateTitleLabel)
@@ -455,9 +456,9 @@ class HistoryItemCell : DDTableViewCell {
         
         orderStatusLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         orderStatusLabel.snp.makeConstraints { make in
-            make.right.equalTo(-auto(20))
+            make.right.equalTo(-auto(15))
             make.centerY.equalTo(orderNumLabel)
-            make.left.equalTo(orderNumLabel.snp.right).offset(auto(5))
+            make.left.equalTo(orderNumLabel.snp.right).offset(0)
         }
         
         line.snp.makeConstraints { make in

OrderScheduling/VehicleMonitoring/ViewController/VehicleMonitoringController.swift

@@ -17,7 +17,7 @@ import SnapKit
 import DDTimerKit_Private
 
 fileprivate let vehicleMonitoringPannelViewHeight = auto(300)
-fileprivate let vehicleMonitoringPannelViewTopInset = auto(72)
+fileprivate let vehicleMonitoringPannelViewTopInset = auto(70)
 
 fileprivate let vehicleMonitoringPointAnnotationW = auto(120)
 fileprivate let vehicleMonitoringPointAnnotationNameLeftInset = auto(35)
@@ -440,10 +440,9 @@ extension VehicleMonitoringController : JXCategoryListContainerViewDelegate {
 extension VehicleMonitoringController : JXCategoryViewDelegate {
     public func categoryView(_ categoryView: JXCategoryBaseView!, didSelectedItemAt index: Int) {
         reloadData(index: index)
-    }
+        if vehicleMonitoringView.vehicleMonitoringPannelView.tapButton.isSelected == true {
-    
+            vehicleMonitoringView.vehicleMonitoringPannelView.tapButton.sendActions(for: .touchUpInside)
-    public func categoryView(_ categoryView: JXCategoryBaseView!, didScrollSelectedItemAt index: Int) {
+        }
-        reloadData(index: index)
     }
 
     func reloadData(index:Int) {
@@ -636,7 +635,7 @@ open class VehicleMonitoringPannelView : DDView {
         let indicator = JXCategoryIndicatorLineView()
         indicator.indicatorColor = .hex("3678FF")
         indicator.indicatorWidth = JXCategoryViewAutomaticDimension
-        indicator.verticalMargin = 7
+        indicator.verticalMargin = 0
         categoryView.indicators = [indicator]
         radiusView.addSubview(categoryView)
         
@@ -647,7 +646,7 @@ open class VehicleMonitoringPannelView : DDView {
         }
         
         tapButton.snp.makeConstraints { make in
-            make.top.equalTo(auto(6))
+            make.top.equalTo(auto(9))
             make.height.equalTo(auto(9))
             make.width.equalTo(auto(19))
             make.centerX.equalToSuperview()
@@ -655,8 +654,8 @@ open class VehicleMonitoringPannelView : DDView {
         
         categoryView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalTo(tapButton.snp.bottom)
+            make.top.equalTo(tapButton.snp.bottom).offset(auto(10))
-            make.height.equalTo(auto(60))
+            make.height.equalTo(auto(40))
         }
        
     }