update

OrderScheduling.xcodeproj/project.pbxproj

@@ -256,6 +256,7 @@
 		791887922A80C351007EA0C1 /* Common */ = {
 			isa = PBXGroup;
 			children = (
+				79DD0DB72A97012400768FE7 /* Controller */,
 				794FBB1A2A8F4DDD00D57BB8 /* View */,
 				791887932A80C351007EA0C1 /* WebView */,
 			);
@@ -557,6 +558,13 @@
 			path = Extension;
 			sourceTree = "<group>";
 		};
+		79DD0DB72A97012400768FE7 /* Controller */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Controller;
+			sourceTree = "<group>";
+		};
 		79EAD7FE2A7B86600036E093 = {
 			isa = PBXGroup;
 			children = (

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

@@ -317,8 +317,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "534"
+            startingLineNumber = "550"
-            endingLineNumber = "534"
+            endingLineNumber = "550"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -333,8 +333,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "535"
+            startingLineNumber = "551"
-            endingLineNumber = "535"
+            endingLineNumber = "551"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -349,8 +349,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "303"
+            startingLineNumber = "311"
-            endingLineNumber = "303"
+            endingLineNumber = "311"
             landmarkName = "dd_mapView(_:didAnnotationViewTapped:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -444,8 +444,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/DispatchOrderController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "147"
+            startingLineNumber = "155"
-            endingLineNumber = "147"
+            endingLineNumber = "155"
             landmarkName = "addActions()"
             landmarkType = "7">
             <Locations>
@@ -507,8 +507,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "616"
+            startingLineNumber = "632"
-            endingLineNumber = "616"
+            endingLineNumber = "632"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -523,8 +523,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "617"
+            startingLineNumber = "633"
-            endingLineNumber = "617"
+            endingLineNumber = "633"
             landmarkName = "tableView(_:cellForRowAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -555,8 +555,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "761"
+            startingLineNumber = "777"
-            endingLineNumber = "761"
+            endingLineNumber = "777"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -571,8 +571,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "762"
+            startingLineNumber = "778"
-            endingLineNumber = "762"
+            endingLineNumber = "778"
             landmarkName = "collectionView(_:cellForItemAt:)"
             landmarkType = "7">
          </BreakpointContent>
@@ -2040,8 +2040,8 @@
             filePath = "OrderScheduling/Rescue/ViewController/RescueController.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "214"
+            startingLineNumber = "222"
-            endingLineNumber = "214"
+            endingLineNumber = "222"
             landmarkName = "entry(model:remarkId:)"
             landmarkType = "7">
          </BreakpointContent>

OrderScheduling/Entry/Entry.swift

@@ -16,6 +16,7 @@ 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)
@@ -59,6 +60,7 @@ open class Entry {
     
     func showAppUpdateEntry(view:UIView,name:String? = nil) {
         var attributes = EKAttributes()
+        attributes.positionConstraints.rotation.isEnabled = false
         attributes = .centerFloat
         attributes.name = name
         attributes.precedence = .override(priority: .high, dropEnqueuedEntries: false)
@@ -102,6 +104,7 @@ open class Entry {
     
     func showNotificationAuthEntry(view:UIView,name:String? = nil) {
         var attributes = EKAttributes()
+        attributes.positionConstraints.rotation.isEnabled = false
         attributes = .centerFloat
         attributes.name = name
         attributes.precedence = .override(priority: .low, dropEnqueuedEntries: false)

OrderScheduling/Mine/ViewController/MineController.swift

@@ -56,7 +56,7 @@ extension MineController {
                         self?.mineView.carInfoView.descLabel.text = String(response?.data?.vehicleCount ?? 0)+"台"
                         self?.mineView.driverInfoView.descLabel.text = String(response?.data?.driverCount ?? 0)+"台"
                         if let icon = response?.data?.icon {
-                            self?.mineView.avatar.sd_setImage(with: URL(string: icon))
+                            self?.mineView.avatar.sd_setImage(with: URL(string: icon),placeholderImage: UIImage(named: "placeholder_gender_man"))
                         }
                         if let phone = response?.data?.phone{
                             self?.mineView.accountLabel.text = "账号:\(phone)"

OrderScheduling/Rescue/ViewController/DispatchOrderController.swift

@@ -139,10 +139,18 @@ extension DispatchOrderController {
             .disposed(by: disposeBag)
         
         dispatchOrderRelay
+            .observe(on: MainScheduler.instance)
+            .do(onNext: {[weak self] _ in
+                self?.view.dd_showHUD()
+            })
             .flatMapLatest {[weak self] model in
                 return RQ.dispatchVehicle(parameters: DispatchVehicleParameters(type: .online, userOrderId: (self?.userOrderId)!, taskOrderId: (self?.taskOrderId)!,driverId: model.driverId,vehicleId: model.vehicleId))
             }
             .observe(on: MainScheduler.instance)
+            .do(onNext: {[weak self] _ in
+                self?.view.dd_hideHUD()
+            })
+            .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] response in
                 self?.dispatchOrderResponse(response: response)
             })
@@ -183,13 +191,13 @@ extension DispatchOrderController {
     
     func dispatchOrderResponse(response:ResponseModel<String>?) {
         view.dd_makeToast(response?.msg ?? dispatchOrderSuccess,completion: {[weak self] _ in
-            DispatchQueue.main.async {
-                self?.navigationController?.popViewController(animated: true)
-            }
-            
             if self?.dispatchCompletionHandler != nil {
                 self?.dispatchCompletionHandler?((self?.userOrderId)!)
             }
+            
+            DispatchQueue.main.async {
+                self?.navigationController?.popViewController(animated: true)
+            }
         })
     }
 }
@@ -226,7 +234,7 @@ extension DispatchOrderController : UITableViewDelegate,UITableViewDataSource {
         
         var status = model.vehicleStatus.label
         if model.onlineStatus.code == .lostConnection {
-            status = status + ",掉"
+            status = status + "," + model.onlineStatus.label
         }
         cell?.stateLabel.text = (model.vehicleName ?? "")+"/"+status
         cell?.name.text = model.driverName
@@ -386,7 +394,7 @@ open class DispatchOrderPannelCell : DDTableViewCell {
         name.numberOfLines = 0
         contentView.addSubview(name)
         contentView.addSubview(phone)
-        distance.lineBreakMode = .byTruncatingMiddle
+        distance.numberOfLines = 0
         contentView.addSubview(distance)
         dispatchButton.layer.cornerRadius = auto(4)
         dispatchButton.layer.masksToBounds = true

OrderScheduling/Rescue/ViewController/RescueController.swift

@@ -144,10 +144,18 @@ extension RescuePendingOrderController {
         pendingOrderView.tableView.mj_header?.beginRefreshing()
         
         refuseRemarkIdRelay
+            .observe(on: MainScheduler.instance)
+            .do(onNext: {[weak self] _ in
+                self?.view.dd_showHUD()
+            })
             .flatMapLatest { model in
                 return Observable.zip(RQ.refuseDispatch(parameters: RefuseDispatchParameters(userOrderId: model.userOrderId, taskOrderId: model.taskOrderId)).asObservable(), Observable.just(model))
             }
             .observe(on: MainScheduler.instance)
+            .do(onNext: {[weak self] _ in
+                self?.view.dd_hideHUD()
+            })
+            .observe(on: MainScheduler.instance)
             .subscribe(onNext: {[weak self] (response,model) in
                 if response?.success == true {
                     self?.entry(model: model,remarkId: response?.data)
@@ -223,11 +231,19 @@ extension RescuePendingOrderController {
             var refuseReasonDesc : String?
             if view.timeView.selectButton.isSelected == true {
                 refuseReasonItem = RefuseDispatchParameters.RefuseReasonItemEnum.time.rawValue
-                refuseReasonDesc = view.timeTextFieldView.textFiled.text
+                if view.timeTextFieldView.textFiled.text?.isEmpty != false {
+                    refuseReasonDesc = (view.timeTextFieldView.textFiled.text)!+(view.timeTextFieldView.unitLabel.text)!
+                }else{
+                    refuseReasonDesc = nil
+                }
             }
             if view.distanceView.selectButton.isSelected == true {
                 refuseReasonItem = RefuseDispatchParameters.RefuseReasonItemEnum.disatance.rawValue
-                refuseReasonDesc = view.distanceTextFieldView.textFiled.text
+                if view.distanceTextFieldView.textFiled.text?.isEmpty != false {
+                    refuseReasonDesc = (view.distanceTextFieldView.textFiled.text)!+(view.distanceTextFieldView.unitLabel.text)!
+                }else{
+                    refuseReasonDesc = nil
+                }
             }
             if view.cannotDispatchView.selectButton.isSelected == true {
                 refuseReasonItem = RefuseDispatchParameters.RefuseReasonItemEnum.cannotDispatch.rawValue
@@ -563,17 +579,17 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
                 make.top.equalTo(cell!.serviceNoticeView.snp.bottom).offset(0)
             })
         }
-        if model.destinationRemark?.isEmpty == false {
+//        if model.destinationRemark?.isEmpty == false {
-            cell?.destinationNoticeView.isHidden = false
+//            cell?.destinationNoticeView.isHidden = false
-            cell?.destinationNoticeLabel.text = "备注:"+(model.destinationRemark ?? "")
+//            cell?.destinationNoticeLabel.text = "备注:"+(model.destinationRemark ?? "")
-            cell?.destinationNoticeView.snp.updateConstraints({ make in
+//            cell?.destinationNoticeView.snp.updateConstraints({ make in
-                make.top.equalTo(cell!.destinationLabel.snp.bottom).offset(auto(2.5))
+//                make.top.equalTo(cell!.destinationLabel.snp.bottom).offset(auto(2.5))
-            })
+//            })
-            cell?.destinationNoticeLabel.snp.updateConstraints({ make in
+//            cell?.destinationNoticeLabel.snp.updateConstraints({ make in
-                make.top.equalTo(auto(5))
+//                make.top.equalTo(auto(5))
-                make.bottom.equalTo(-auto(5))
+//                make.bottom.equalTo(-auto(5))
-            })
+//            })
-        }else{
+//        }else{
             cell?.destinationNoticeView.isHidden = true
             cell?.destinationNoticeLabel.text = nil
             cell?.destinationNoticeView.snp.updateConstraints({ make in
@@ -583,7 +599,7 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
                 make.top.equalTo(0)
                 make.bottom.equalTo(0)
             })
-        }
+//        }
         if model.appointTime?.isEmpty == false {
             cell?.reserveTitleLabel.text = "预约时间:"
             cell?.reserveLabel.text = model.appointTime
@@ -1077,7 +1093,7 @@ class RescuePendingOrderCell : DDTableViewCell {
         merchantTitleLabel.snp.makeConstraints { make in
             make.top.equalTo(line.snp.bottom).offset(auto(8))
             make.left.equalTo(typeLabel)
-            make.width.equalTo(auto(80))
+            make.width.equalTo(auto(60))
         }
         
         merchantLabel.snp.makeConstraints { make in
@@ -1314,7 +1330,7 @@ class RescuePendingDispatchCell : DDTableViewCell {
         merchantTitleLabel.snp.makeConstraints { make in
             make.top.equalTo(line.snp.bottom).offset(auto(8))
             make.left.equalTo(typeLabel)
-            make.width.equalTo(auto(70))
+            make.width.equalTo(auto(60))
         }
         
         merchantLabel.snp.makeConstraints { make in