From ab6ef7166ee51721fec3e3537414f6d6ed08b49d Mon Sep 17 00:00:00 2001
From: younger_times <841720330@qq.com>
Date: 星期二, 30 五月 2023 18:07:58 +0800
Subject: [PATCH] 新增功能
---
OKProject/Class/Home/View/TripAddressCell.swift | 67 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/OKProject/Class/Home/View/TripAddressCell.swift b/OKProject/Class/Home/View/TripAddressCell.swift
index abdb55e..6b4e14c 100644
--- a/OKProject/Class/Home/View/TripAddressCell.swift
+++ b/OKProject/Class/Home/View/TripAddressCell.swift
@@ -276,7 +276,11 @@
view_carType.button_error.rx.tap
.subscribe(onNext: {[unowned self] (_) in
- self.queryServerCarModel()
+ if YYMapViewManager.share.orderType.value == .offical{
+ self.queryServerCarOfficalModel()
+ }else{
+ self.queryServerCarModel()
+ }
})
.disposed(by: rx.disposeBag)
@@ -364,8 +368,11 @@
case .appointment:
self.updateUIButton(sender: self.button_appointment)
self.button_more.isHidden = YYMapViewManager.share.callState.value == .normal ? false : true
- self.button_date.isHidden = false
- self.button_date.isHidden = false
+ if YYMapViewManager.share.orderType.value == .offical{
+ self.button_more.isHidden = true
+ }
+
+// self.button_date.isHidden = true
self.button_passenger.isHidden = false
self.button_tip.isHidden = false
if YYMapViewManager.share.orderType.value == .taxi{
@@ -382,6 +389,11 @@
case .call:
self.updateUIButton(sender: self.button_call)
self.button_more.isHidden = YYMapViewManager.share.callState.value == .normal ? false : true
+
+ if YYMapViewManager.share.orderType.value == .offical{
+ self.button_more.isHidden = true
+ }
+
self.label_more.text = "选乘车人"
if YYMapViewManager.share.orderType.value == .taxi{
self.button_date.isHidden = true
@@ -392,6 +404,8 @@
self.button_tip.isHidden = false
if YYMapViewManager.share.orderType.value == .taxi{
self.button_passenger.setTitle(YYMapViewManager.share.passenger.value == nil ? "更换乘车人" : "\(YYMapViewManager.share.passenger.value?.name ?? "更换乘车人")", for: .normal)
+ }else if YYMapViewManager.share.orderType.value == .offical{
+ self.button_passenger.setTitle("事由出行", for: .normal)
}else{
self.button_passenger.setTitle(YYMapViewManager.share.passenger.value == nil ? "选乘车人" : "\(YYMapViewManager.share.passenger.value?.name ?? "选乘车人")", for: .normal)
}
@@ -399,6 +413,15 @@
break
}
}).disposed(by: rx.disposeBag)
+
+ YYMapViewManager.share.calType.subscribe { (state) in
+ if state == 1{
+ self.button_tip.setTitle("单程计费", for: .normal)
+ }else if state == 2{
+ self.button_tip.setTitle("包车计费", for: .normal)
+ }
+ }.disposed(by: rx.disposeBag)
+
YYMapViewManager.share.callState.subscribe(onNext: { (state) in
switch state{
@@ -447,7 +470,14 @@
self.view_carType.isHidden = false
self.button_emergencyContact.isHidden = false
self.button_tip.isHidden = true
- self.queryServerCarModel()
+
+ if YYMapViewManager.share.orderType.value == .offical{
+ self.button_emergencyContact.isHidden = true
+ self.button_tip.isHidden = false
+ self.queryServerCarOfficalModel()
+ }else{
+ self.queryServerCarModel()
+ }
}
var title = ""
@@ -476,6 +506,11 @@
.subscribe(onNext: {[unowned self] (string) in
if YYMapViewManager.share.orderType.value == .offical{
self.button_tip.setTitle(string == nil ? "计费方式" : string, for: .normal)
+ if YYMapViewManager.share.calType.value == 1{
+ self.button_tip.setTitle("单程计费", for: .normal)
+ }else if YYMapViewManager.share.calType.value == 2{
+ self.button_tip.setTitle("包车计费", for: .normal)
+ }
}else{
self.button_tip.setTitle(string == nil ? "小费" : string, for: .normal)
}
@@ -553,6 +588,30 @@
}
.disposed(by: rx.disposeBag)
}
+
+ func queryServerCarOfficalModel(){
+ view_carType.style = .refreshing
+ APIManager.shared.provider.rx.request(.queryOfficalCarModel(calType: 1, startLonLat: "\(YYMapViewManager.share.originInfo.value?.lon ?? 0),\(YYMapViewManager.share.originInfo.value?.lat ?? 0)", endLonLat: "\(YYMapViewManager.share.destination.value?.lon ?? 0),\(YYMapViewManager.share.destination.value?.lat ?? 0)",startTime: "", endTime: "")).map(YYModel<[YYCarTypeModel]>.self)
+ .validate()
+ .subscribe(onSuccess: { [unowned self] (model) in
+ self.view_carType.style = .none
+ guard let data = model.data else {return}
+ switch data.count{
+ case 0:
+ self.view_carType.style = .nothing
+ self.button_submit.alpha = 0.5
+ self.button_submit.isUserInteractionEnabled = false
+ default:
+ self.view_carType.dataSource = data
+ self.button_submit.alpha = 1
+ self.button_submit.isUserInteractionEnabled = true
+ }
+ }) { (error) in
+ self.view_carType.style = .error
+ }
+ .disposed(by: rx.disposeBag)
+
+ }
@IBAction func valuationRuleAction(_ sender: UIButton) {
self.valuationRule.call(sender.tag)
--
Gitblit v1.7.1