| BrokerDriver/Enums.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Home/TCell/HomeDetailContentTCell.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Home/VC/HomeDetailContentVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Home/VC/HomeDetailVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Home/VC/HomePageVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Models/UserModel.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Network/NetworkRequest.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Network/Services.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Profile/VC/PersonalCenterVC.xib | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Profile/VC/PersonalDataVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Tools/AttachTypeView.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| BrokerDriver/Tools/AttachTypeView.xib | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
BrokerDriver/Enums.swift
@@ -15,6 +15,10 @@ case Pending = 0 /// 已完成 case Complete = 1 //========= /// 待取货（未出发） case PendingPickupNotDeparture = 2 /// 待取货（已出发） @@ -24,11 +28,15 @@ /// 送至检查站 case SendTOCheckPoint = 12 /// 检查中 case Checking = 13 case Checking = 13 //【检查操作，不允许下一步】 /// 检查完成（待取货） case PendingPickupInCheckPoint = 14 /// 运输中（去往车场） case InTransitInYard = 5 //以上type == 1 /// 已到达车场 case InYard = 6 /// 运输中（前往目的地） @@ -37,16 +45,24 @@ case InWarehouse = 15 /// 待卸货 case PendingUnload = 8 //以上type == 2 /// 已卸货 case Unloaded = 9 /// 运回至车场（进行时） case TransitingToYard = 10 //以上 type == 3 /// 到达车场（空柜状态） case InYardByEmpty = 11 /// 运回码头 case BackYard = 18 //【最后状态，无按钮，等待用户操作】 //以上 type == 4 /// 取消订单 case Cancel = 16 /// 运回码头 case BackYard = 18 /// 转换 var transStr:String{ @@ -78,6 +94,9 @@ //码头到车场：L // 车场到码头：E //码头到终点：L //终点到码头（返程）：E switch self { case .PendingPickupNotDeparture: @@ -146,3 +165,32 @@ case note = 1 case troble = 2 } enum DriverType:Int,HandyJSONEnum{ case none = 0 case portDriver = 1 case longHulDriver = 2 case localDriver = 3 var str:String{ switch self { case .portDriver:return "Port driver" case .longHulDriver:return "Long-haul driver" case .localDriver:return "Local driver" case .none :return "none" } } } enum DriverInfoStatus:Int,HandyJSONEnum{ case none = 0 case active = 1 case inactive = 2 var str:String{ switch self { case .active: return "Active" case .inactive: return "Inactive" case .none:return "none" } } } BrokerDriver/Home/TCell/HomeDetailContentTCell.swift
@@ -37,23 +37,31 @@ } view_VStack.layoutIfNeeded() btn_1.isHidden = dicts["7_danger"] == nil btn_2.isHidden = dicts["8_weight"] == nil view_btns.isHidden = (dicts["7_danger"] == nil && dicts["8_weight"] == nil) if dicts["7_danger"] != nil{ btn_1.setTitle("\(dicts["7_danger"] ?? "")", for: .normal) var isDanger = false var isWeight = false if let danger = dicts["7_danger"] as? Int{ btn_1.isHidden = danger == 0 btn_1.setTitle("Danger", for: .normal) isDanger = (danger == 1) } if dicts["8_weight"] != nil{ btn_2.setTitle("\(dicts["8_weight"] ?? "")", for: .normal) if let weight = dicts["8_weight"] as? Int{ btn_2.isHidden = weight == 0 btn_2.setTitle("Weight", for: .normal) isWeight = (weight == 1) } view_btns.isHidden = (isDanger && isWeight) } } override func awakeFromNib() { super.awakeFromNib() btn_1.isHidden = true btn_2.isHidden = true } }
@@ -25,7 +25,7 @@ var adapterViewController:FFAdapterViewController! private(set) var orderId:String! private(set) var style:HomePageVC.PageStyle! private(set) var type:Int! private var model:OrderDetailModel?{ didSet{ if let m = model{ @@ -36,7 +36,7 @@ label_status.text = m.nextStatus.transStr contentTableView.reloadData() cargoTableview.reloadData() view_btn.isHidden = m.status == .Complete view_btn.isHidden = true var startCoordinate:CLLocationCoordinate2D? @@ -52,6 +52,35 @@ let tuple = (startCoordinate,endCoordinate) NotificationCenter.default.post(name: UpdateMap_Noti, object: tuple) switch type{ case 1: switch m.status.rawValue{ case 2,3,4,5,12,14:view_btn.isHidden = false default:view_btn.isHidden = true } case 2: switch m.status.rawValue{ case 6,7,8,15: view_btn.isHidden = false default:view_btn.isHidden = true } case 3: switch m.status.rawValue{ case 9,10: view_btn.isHidden = false if m.orderType != "Live Unload" && m.status.rawValue == 9{ view_btn.isHidden = true } default:view_btn.isHidden = true } case 4: switch m.status.rawValue{ case 11:view_btn.isHidden = false default:view_btn.isHidden = true } default:view_btn.isHidden = true } } } } @@ -84,10 +113,10 @@ getData() } required init(orderId:String,style:HomePageVC.PageStyle) { required init(orderId:String,type:Int) { super.init(nibName: nil, bundle: nil) self.orderId = orderId self.style = style self.type = type } override func setRx() { @@ -95,7 +124,7 @@ } private func getData(){ Services.orderInfo(id: orderId, type:style).subscribe(onNext: { [weak self] data in Services.orderInfo(id: orderId, type:type).subscribe(onNext: { [weak self] data in if let model = data.data{ self?.model = model } @@ -119,19 +148,19 @@ guard let m = model else { return } if m.nextStatus == .ArrivedPort{ CommonAlertView.show(title: "Prompt!", content: "You need to upload gate out ticket", bt1: "Not upload yet", bt2: "To upload") { [weak self] in AttachTypeView.show(orderId: m.orderId) { AttachTypeView.show(orderId: m.orderId,recordEnum: .GetOutTicket) { self?.changeStatus(orderId: m.orderId) } } } else if m.nextStatus == .Transiting{ CommonAlertView.show(title: "Prompt!", content: "You need to upload POD", bt1: "Not upload yet", bt2: "To upload") { [weak self] in AttachTypeView.show(orderId: m.orderId) { AttachTypeView.show(orderId: m.orderId,recordEnum: .Pod) { self?.changeStatus(orderId: m.orderId) } } }else if m.nextStatus == .BackYard{ CommonAlertView.show(title: "Prompt!", content: "You need to upload gate in ticket", bt1: "Not upload yet", bt2: "To upload") { [weak self] in AttachTypeView.show(orderId: m.orderId) { AttachTypeView.show(orderId: m.orderId,recordEnum: .GetInTicket) { self?.changeStatus(orderId: m.orderId) } } BrokerDriver/Home/VC/HomeDetailVC.swift
@@ -12,7 +12,7 @@ class HomeDetailVC: BaseViewController { private(set) var orderId:String! private(set) var style:HomePageVC.PageStyle! private(set) var type:Int! lazy var adapterViewController:FFAdapterViewController = { let adapterViewController = FFAdapterViewController() @@ -43,10 +43,10 @@ }() required init(orderId:String,style:HomePageVC.PageStyle) { required init(orderId:String,type:Int) { super.init(nibName: nil, bundle: nil) self.orderId = orderId self.style = style self.type = type } required init?(coder: NSCoder) { @@ -87,7 +87,7 @@ func pageViewController(_ pageViewConteoller: FFPageViewController, controllerForPage page: Int) -> UIViewController { if page == 0{ let vc = HomeDetailContentVC(orderId: orderId,style: style) let vc = HomeDetailContentVC(orderId: orderId,type: type) vc.adapterViewController = adapterViewController return vc }else if page == 1{ BrokerDriver/Home/VC/HomePageVC.swift
@@ -135,7 +135,7 @@ extension HomePageVC:UITableViewDelegate{ func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { let data = datas[indexPath.row] let vc = HomeDetailVC(orderId: data.orderId, style: style) let vc = HomeDetailVC(orderId: data.orderId, type: data.type) push(vc: vc) } } BrokerDriver/Models/UserModel.swift
@@ -92,8 +92,8 @@ var dateOfBrith: String = "" var driverEmployeeNumber: String = "" var driverName: String = "" var driverType: String = "" var driverType: DriverType = .none var id: Int = 0 var notes: String = "" var status: String = "" var status: DriverInfoStatus = .none } BrokerDriver/Network/NetworkRequest.swift
@@ -180,11 +180,11 @@ hud?.hide(animated: true) if response.error != nil { LogError("\(response.error!)") // alert(msg: "请求失败") alert(msg: response.error!.localizedDescription) ob.onError(response.error!) }else if let data = response.data,let jsonString = String(data: data, encoding: String.Encoding.utf8){ if let next = BaseResponse<T>.deserialize(from: jsonString){ LogInfo("返回数据:\(next.data?.toJSON() ?? [:])") LogInfo("返回数据:\(next.toJSON())") if next.code == 200{ ob.onNext(next) }else if next.code == 700{ @@ -197,11 +197,11 @@ ob.onError(NetRequestError.Other) } }else{ // alert(msg: "请求失败") alert(msg: "数据解析失败") ob.onError(NetRequestError.Other) } }else{ // alert(msg: "请求失败") alert(msg: "解析失败") ob.onError(NetRequestError.Other) } ob.onCompleted() BrokerDriver/Network/Services.swift
@@ -67,10 +67,10 @@ return NetworkRequest.request(params: params, method: .get, progress: false) } class func orderInfo(id:String,type:HomePageVC.PageStyle)->Observable<BaseResponse<OrderDetailModel>>{ class func orderInfo(id:String,type:Int)->Observable<BaseResponse<OrderDetailModel>>{ let params = ParamsAppender.build(url: All_Url) .interface(url: "/api/index/orderInfo") .append(key: "type", value:type.rawValue) .append(key: "type", value:type) .append(key: "id", value: id) return NetworkRequest.request(params: params, method: .get, progress: true) } BrokerDriver/Profile/VC/PersonalCenterVC.xib
@@ -32,6 +32,12 @@ <constraint firstAttribute="width" constant="50" id="jle-UV-3ul"/> <constraint firstAttribute="height" constant="50" id="tJf-7X-8f3"/> </constraints> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="number" keyPath="ld_cornerRadiusXIB"> <real key="value" value="25"/> </userDefinedRuntimeAttribute> <userDefinedRuntimeAttribute type="boolean" keyPath="ld_maskToBoundsXIB" value="YES"/> </userDefinedRuntimeAttributes> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="r6A-Md-BJ9"> <rect key="frame" x="77" y="18" width="37.666666666666657" height="17"/> BrokerDriver/Profile/VC/PersonalDataVC.swift
@@ -26,9 +26,9 @@ Services.getMeInfo().subscribe(onNext: {[weak self] data in if let model = data.data{ self?.label_drivername.text = model.driverName self?.label_driverType.text = model.driverType self?.label_driverType.text = model.driverType.str self?.label_contactNumber.text = model.contactNumber self?.label_status.text = model.status self?.label_status.text = model.status.str self?.label_number.text = model.contactNumber self?.label_dateOfBirth.text = model.dateOfBrith self?.label_address.text = model.address BrokerDriver/Tools/AttachTypeView.swift
@@ -13,6 +13,8 @@ @IBOutlet weak var VStack: UIStackView! @IBOutlet weak var label_content: UILabel! @IBOutlet weak var imgV: UIImageView! @IBOutlet weak var btn_type: TapButton! private var orderId:String! private var disposeBag:DisposeBag! private var recordEnum:RecordEnum! @@ -30,9 +32,14 @@ label_content.text = recordEnum.str } static func show(orderId:String,successClouse:@escaping ()->Void){ static func show(orderId:String,recordEnum:RecordEnum? = nil,successClouse:@escaping ()->Void){ let pickerView = AttachTypeView.jq_loadNibView() pickerView.orderId = orderId pickerView.recordEnum = recordEnum if let recordEnum{ pickerView.label_content.text = recordEnum.str pickerView.btn_type.isEnabled = false } pickerView.successClouse = successClouse pickerView.frame = screnDelegate?.window?.frame ?? .zero screnDelegate?.window?.addSubview(pickerView) BrokerDriver/Tools/AttachTypeView.xib
@@ -258,6 +258,7 @@ </constraints> <connections> <outlet property="VStack" destination="h8e-DE-GAc" id="l3e-Hj-3vf"/> <outlet property="btn_type" destination="LNl-RO-RsL" id="JeK-cQ-93v"/> <outlet property="imgV" destination="P3A-2g-ndw" id="XbA-CZ-A7z"/> <outlet property="label_content" destination="vLN-zs-Br1" id="Ym5-Ii-g2B"/> <outlet property="view_container" destination="5Ac-fj-q74" id="ank-hb-pN8"/>
