地址选择（待完善详细出口）

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift

@@ -12,7 +12,56 @@ import MAMapKit
 import SwiftyJSON
 import SwiftDate
 
-class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate,AdressSelectCellDelegate,DZGLViewControllerDelegate,XinZengDiZhiViewControllerDelegate,TitleAndTFBtnCellDelegate,WenDuCellDelegate,LogisticalSelectViewDelegate, UIPickerViewDataSource, UIPickerViewDelegate, GLAlertSelectViewDelegate,CLLocationManagerDelegate, CityListViewControllerDelegate{
+class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate,AdressSelectCellDelegate,DZGLViewControllerDelegate,XinZengDiZhiViewControllerDelegate,TitleAndTFBtnCellDelegate,WenDuCellDelegate,LogisticalSelectViewDelegate, UIPickerViewDataSource, UIPickerViewDelegate, GLAlertSelectViewDelegate,CLLocationManagerDelegate, CityListViewControllerDelegate,ToAndFormSelectViewControllerDelegate,WayBillAddressCanDelItemCellDelegate{
+    func WayBillAddressCanDelItemCellDelAc(idx: Int) {
+        adrArr.remove(at: idx)
+        let view = hListView.footerView(forSection: 1)
+        view?.layoutIfNeeded()
+        hListView.reloadData()
+    }
+    
+    func ToAndFormSelectViewControllerSelectAdr(dict: Dictionary<String, Any>, idx: Int) {
+        print(idx)
+        if idx != 10086 {
+            if idx != 0  {
+                if idx == 1 && adrArr.count == 0{
+                    let dic = NSMutableDictionary()
+                    dic["locName"] = "空"
+                    adrArr.append(dic)
+                    adrArr.append(dict as NSDictionary)
+                }else{
+                    if adrArr.count < 2 {
+                        adrArr.append(dict as NSDictionary)
+                    }else{
+                        if adrArr.count > idx {
+                            adrArr.insert(dict as NSDictionary, at: idx)
+                            adrArr.remove(at: idx+1)
+                        }
+                    }
+                }
+            }else{
+                if idx == 0 && adrArr.count > 1 {
+                    adrArr.insert(dict as NSDictionary, at: 0)
+                    adrArr.remove(at:1)
+                }else{
+                    adrArr.append(dict as NSDictionary)
+                }
+            }
+        }else{
+            adrArr.append(dict as NSDictionary)
+        }
+        print(adrArr)
+        let view = hListView.footerView(forSection: 1)
+        view?.layoutIfNeeded()
+        
+        
+        hListView.reloadData()
+    }
+    
+    
+    
+    
+    
     func CityListViewControllerLocSelect(loc: cityListDataModel) {
         selectLoc = loc.name!
         locBtn.setTitle("  " + loc.name!, for: .normal)
@@ -33,7 +82,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     
     @IBOutlet weak var topCarBtnSelectView: UIView!
     
-    var adrArr:Array<String> = []
+    var adrArr:Array<NSDictionary> = []
+    var tempadrArr:Array<NSDictionary> = []
     //MARK:--地址信息
     var sender:String?
     var sendPhone:String?
@@ -563,7 +613,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 let lineC = UIView(frame: CGRect(x: fullScreenWidth*0.5-0.5, y: 7, width: 1, height: 35))
                 lineC.backgroundColor = UIColor(named: "灰色分界线")
                 view.addSubview(lineC)
-                
+                if adrArr.count > 2 {
                     let leftBtn = UIButton(frame: CGRect(x: 0, y: 0, width: fullScreenWidth*0.5, height: 44))
                     leftBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
                     leftBtn.setTitle("调整收货地顺序", for: .normal)
@@ -578,6 +628,16 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                     rightBtn.addTarget(self, action: #selector(huoLLAdrAction(sender:)), for: .touchUpInside)
                     rightBtn.setTitleColor(UIColor(named: "蓝色字体颜色"), for: .normal)
                     view.addSubview(rightBtn)
+                }else{
+                    let addBtn = UIButton(frame:view.bounds)
+                    addBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
+                    addBtn.backgroundColor = UIColor.white
+                    addBtn.setTitle("添加收货地址", for: .normal)
+                    addBtn.tag = 1
+                    addBtn.addTarget(self, action: #selector(huoLLAdrAction(sender:)), for: .touchUpInside)
+                    addBtn.setTitleColor(UIColor(named: "蓝色字体颜色"), for: .normal)
+                    view.addSubview(addBtn)
+                }
                 return view
             }
             let view = UIView()
@@ -591,6 +651,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     @objc func huoLLAdrAction(sender:UIButton){
         if sender.tag == 0 {
             print("调位置")
+          
+                tempadrArr = adrArr
                 var h = CGFloat(adrArr.count + 2)*49
                 if h > CGFloat(fullScreenHeight) * 0.65 {
                     h = CGFloat(fullScreenHeight) * 0.65
@@ -605,11 +667,13 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                     closeBtn?.addTarget(self, action: #selector(closeCarList), for: .touchUpInside)
                     self.view.addSubview(closeBtn!)
                     
-                changeCellSortView = UIView(frame: CGRect(x: 0, y: fullScreenHeight - CGFloat(h), width: fullScreenWidth, height: CGFloat(h)))
+                    changeCellSortView = UIView()
                     changeCellSortView?.backgroundColor = UIColor.white
                     changeCellSortView?.layer.cornerRadius = 5
                     changeCellSortView?.layer.maskedCorners = [CACornerMask.layerMinXMinYCorner,CACornerMask.layerMaxXMinYCorner]
                     self.view.addSubview(changeCellSortView!)
+                }
+                changeCellSortView?.frame = CGRect(x: 0, y: fullScreenHeight - CGFloat(h), width: fullScreenWidth, height: CGFloat(h))
                 
                 let leftBtn = UIButton()
                 leftBtn.addTarget(self, action: #selector(changeCellSortAc(sender:)), for: .touchUpInside)
@@ -672,7 +736,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 }
                 
                 let adrFisrtLbl = UILabel()
-                adrFisrtLbl.text = adrArr.first
+                if adrArr.count > 0 {
+                    let dict = adrArr.first! as! NSDictionary
+                    adrFisrtLbl.text = dict["locName"] as! String
+                }
                 adrFisrtLbl.textColor = UIColor(named: "标题字颜色")
                 adrFisrtLbl.font = UIFont.systemFont(ofSize: 13)
                 changeCellSortView?.addSubview(adrFisrtLbl)
@@ -707,10 +774,16 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                     make.bottom.equalTo(leftBtn.snp.top)
                 }
             
-            }
             
         }else{
             print("添加")
+            let vc = ToAndFormSelectViewController()
+            vc.idx = 10086
+            vc.adrDatas = adrDatas
+            vc.delegate = self
+            if adrDatas.count > 0 {
+                self.navigationController?.pushViewController(vc, animated: true)
+            }
         }
     }
     @objc func changeCellSortAc(sender:UIButton){
@@ -718,9 +791,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         closeBtn?.isHidden = true
         if sender.tag == 0 {
             print("左边")
-        }else{
-            print("右边")
+            adrArr = tempadrArr
         }
+        print("abc =",adrArr)
+        hListView.reloadData()
     }
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
         if tableView == listView {
@@ -763,7 +837,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         }else{//货拉拉
             switch section {
             case 1:
-                if adrArr.count == 0 {
+                if adrArr.count < 2 {
                     return 2
                 }
                 return adrArr.count
@@ -828,8 +902,20 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             if indexPath.section == 1 {
                 let vc = ToAndFormSelectViewController()
                 vc.idx = indexPath.row
+                vc.adrDatas = adrDatas
+                vc.delegate = self
+                if adrArr.count > indexPath.row {
+                    let dict = adrArr[indexPath.row] as! NSDictionary
+                    if dict["locName"] as! String != "空" && dict["locName"] != nil{
+                        vc.nameStr = (dict["shouHuoRen"] as! String)
+                        vc.phoneNum = (dict["phoneNum"] as! String)
+                        vc.adrStr = (dict["menPai"] as! String)
+                    }
+                }
+                if adrDatas.count > 0 {
                     self.navigationController?.pushViewController(vc, animated: true)
                 }
+            }
             
             
             if indexPath.section == 2 {
@@ -940,7 +1026,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         if tableView.tag == 999 {
             let cell = tableView.dequeueReusableCell(withIdentifier: "ToFormChangeTableViewCell") as! ToFormChangeTableViewCell
             cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
-            cell.titleLbl.text = self.adrArr[indexPath.row+1]
+            let dict = adrArr[indexPath.row+1] as! NSDictionary
+            cell.titleLbl.text = dict["locName"] as! String
             return cell
         }
         
@@ -1028,18 +1115,37 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             }
             if indexPath.section == 1 {
                 let cell = tableView.dequeueReusableCell(withIdentifier: "WayBillAddressCanDelItemCell") as! WayBillAddressCanDelItemCell
+                cell.tag = indexPath.row
+                cell.delegate = self
                 cell.iconW.constant = 22
                 cell.iconH.constant = 22
                 cell.iconLbl.layer.cornerRadius = 11
                 cell.lineTopView.isHidden = false
                 cell.delBtn.isHidden = true
-                if adrArr.count > 1 {
+                
+                if adrArr.count > 1 && indexPath.row != 0 {
                     cell.delBtn.isHidden = false
-                    cell.nodataLbl.isHidden = true
-                    cell.addressLbl.text = adrArr[indexPath.row]
-                    cell.addressDetailLbl.text = adrArr[indexPath.row]
-                    cell.namePhoneLbl.text = adrArr[indexPath.row]
+                    let dict = adrArr[indexPath.row] as! NSDictionary
+                    
+                    cell.addressLbl.text = dict["locName"] as! String
+                    let menPai = (dict["menPai"]! as! String)
+                    let shouHuoRen = (dict["shouHuoRen"]! as! String)
+                    let phoneNum = (dict["phoneNum"]! as! String)
+                    
+              
+                    cell.addressDetailLbl.text = menPai
+                    cell.namePhoneLbl.text = shouHuoRen + " " + phoneNum
+                    
+                    cell.delBtnTop.constant = -25
+                    if menPai.count > 0 || (phoneNum.count > 0 || shouHuoRen.count > 0) {
+                        cell.topH.constant = 5
+                        cell.delBtnTop.constant = -13
+                    }
+                    
+                    if menPai.count > 0 && (phoneNum.count > 0 || shouHuoRen.count > 0) {
                         cell.topH.constant = 5
+                        cell.delBtnTop.constant = 0
+                    }
                 }else{
                     cell.topH.constant = 25
                 }
@@ -1050,12 +1156,34 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                     cell.iconLbl.text = "发"
                     cell.iconLbl.backgroundColor = UIColor.init(named: "蓝色字体颜色")
                     cell.lineTopView.isHidden = true
+                    
                     if adrArr.count > 0 {
+                        let dict = adrArr[indexPath.row] as! NSDictionary
+                        if (dict["locName"] as! String) != "空" {
+                            cell.addressDetailLbl.isHidden = false
+                            cell.namePhoneLbl.isHidden = false
+                            cell.nodataLbl.isHidden = true
+                            cell.addressLbl.isHidden = false
+                            cell.addressLbl.text = dict["locName"] as! String
+                            let menPai = (dict["menPai"]! as! String)
+                            let shouHuoRen = (dict["shouHuoRen"]! as! String)
+                            let phoneNum = (dict["phoneNum"]! as! String)
+                            
+                            cell.addressDetailLbl.text = menPai
+                            cell.namePhoneLbl.text = shouHuoRen + " " + phoneNum
+                            
+                            if menPai.count > 0 || (phoneNum.count > 0 || shouHuoRen.count > 0) {
                                 cell.topH.constant = 5
                             }
+                        }else{
+                            cell.addressDetailLbl.isHidden = true
+                            cell.namePhoneLbl.isHidden = true
+                            cell.addressLbl.isHidden = true
+                        }
+                    }
                 }
                 
-                if indexPath.row != adrArr.count - 1 && indexPath.row != 0 && adrArr.count != 0{
+                if indexPath.row != adrArr.count - 1 && indexPath.row != 0 && adrArr.count > 2 {
                     cell.iconLbl.text = ""
                     cell.iconLbl.backgroundColor = UIColor.init(named: "虚线分界线颜色")
                     cell.iconW.constant = 12
@@ -1063,17 +1191,29 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                     cell.iconLbl.layer.cornerRadius = 6
                 }
                 
-                
-                if indexPath.row == adrArr.count - 1 || adrArr.count == 0 && indexPath.row != 0{
+                if (indexPath.row == adrArr.count - 1 || adrArr.count <= 1) && indexPath.row != 0  {
                     //最后的不显示lineview
                     cell.lineView.isHidden = true
                     cell.iconLbl.text = "收"
                     cell.nodataLbl.text = "请选择或填写收货信息"
+                    if adrArr.count > 1 {
+                        cell.nodataLbl.isHidden = true
+                        cell.addressDetailLbl.isHidden = false
+                        cell.namePhoneLbl.isHidden = false
+                        cell.addressLbl.isHidden = false
+                    }else{
+                        cell.addressDetailLbl.isHidden = true
+                        cell.namePhoneLbl.isHidden = true
+                        cell.addressLbl.isHidden = true
+                        cell.nodataLbl.isHidden = false
+                    }
                     cell.iconLbl.backgroundColor = UIColor.init(named: "企业、预售字体")
                 }else{
                     cell.lineView.isHidden = false
                 }
                 
+                
+                
                 return cell
             }
             if indexPath.section == 2 {
@@ -1579,8 +1719,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             var dList:Array<NSMutableDictionary> = []
             if i == 0 {//首日
                 
-                
-                
                 for j in 0 ..< tempArr.count {
                     if tempArr[j].integerValue > item.hour{
                         hourArr.append(tempArr[j])
@@ -1665,9 +1803,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     //移动cell事件
     func tableView(_ tableView: UITableView, moveRowAt sourceIndexPath: IndexPath,
                    to destinationIndexPath: IndexPath) {
+        
         if sourceIndexPath != destinationIndexPath{
             //获取移动行对应的值
-            let itemValue:String = adrArr[sourceIndexPath.row+1]
+            let itemValue:NSDictionary = adrArr[sourceIndexPath.row+1] as! NSDictionary
             //删除移动的值
             adrArr.remove(at: sourceIndexPath.row+1)
             //如果移动区域大于现有行数，直接在最后添加移动的值

GeliBusinessPlatform/ViewController/货拉拉/收发货地址/ToAndFormSelectViewController.swift

@@ -13,7 +13,9 @@ import AMapFoundationKit
 import MAMapKit
 import AMapSearchKit
 import IQKeyboardManagerSwift
-
+protocol ToAndFormSelectViewControllerDelegate {
+    func ToAndFormSelectViewControllerSelectAdr(dict:Dictionary<String,Any>,idx:Int)
+}
 class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLocationManagerDelegate, AMapSearchDelegate, UISearchBarDelegate, SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource{
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if tableView == searchList {
@@ -21,6 +23,14 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         }
         return 5
     }
+    var delegate:ToAndFormSelectViewControllerDelegate?
+    var dict:Dictionary<String,Any> = Dictionary()
+    
+    
+    var nameStr = ""
+    var phoneNum = ""
+    var adrStr = ""
+    
     var idx:Int?
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return UITableView.automaticDimension
@@ -69,15 +79,15 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
     
     @IBOutlet weak var leftBtn: UIButton!
     @IBAction func listViewRefresh(_ sender: UIButton) {
-//        if sender == leftBtn {
-//            leftBtn.isSelected = true
-//            rightBtn.isSelected = false
-//            lineX.constant = 0
-//        }else{
-//            leftBtn.isSelected = false
-//            rightBtn.isSelected = true
-//            lineX.constant = fullScreenWidth * 0.5
-//        }
+        //        if sender == leftBtn {
+        //            leftBtn.isSelected = true
+        //            rightBtn.isSelected = false
+        //            lineX.constant = 0
+        //        }else{
+        //            leftBtn.isSelected = false
+        //            rightBtn.isSelected = true
+        //            lineX.constant = fullScreenWidth * 0.5
+        //        }
     }
     @IBOutlet weak var listViewBG: UIView!
     
@@ -126,6 +136,10 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         
         
         searchList.register(UINib(nibName: "HuoLaLaDiZhiCell", bundle: nil), forCellReuseIdentifier: "HuoLaLaDiZhiCell")
+        
+        nameTF.text = nameStr
+        phoneTF.text = phoneNum
+        addressDetailTF.text = adrStr
     }
     
     func initMapView(){
@@ -153,7 +167,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
     @objc func cancelKeyboard(){
         IQKeyboardManager.shared.resignFirstResponder()
     }
-    
+    var adrDatas:Array<cityListDataModel>?
     func initSearch() {
         search = AMapSearchAPI()
         search.delegate = self
@@ -163,9 +177,28 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         request.requireExtension = true
         search.aMapPOIAroundSearch(request)
     }
-    
+    var adrData:cityListDataModel?
+    var cityName:NSString = ""
     @IBAction func sureSelectAddressAction(_ sender: LGButton) {
         print("sureSelectAddressAction")
+        print(cityName)
+        if adrDatas!.count > 0 {
+            for item in adrDatas! {
+                if cityName.contains(item.name!) {
+                    adrData = item
+                }
+            }
+            
+            dict["menPai"] = addressDetailTF.text
+            dict["shouHuoRen"] = nameTF.text
+            dict["phoneNum"] = phoneTF.text
+            dict["adr"] = adrData
+            if locName.count > 0  {
+                dict["locName"] = titleLbl!.text
+                delegate?.ToAndFormSelectViewControllerSelectAdr(dict: dict,idx:idx!)
+                self.navigationController?.popViewController(animated: true)
+            }
+        }
     }
     //MARK: - 高德地图delegate
     var introView:UIView?
@@ -173,6 +206,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
     var contentLbl:UILabel?
     var adrArr:Array<AMapPOI> = []
     var keyword = ""
+    var locName = ""
     func onPOISearchDone(_ request: AMapPOISearchBaseRequest!, response: AMapPOISearchResponse!) {
         
         if response.count == 0 {
@@ -208,8 +242,8 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
             introView?.addSubview(contentLbl!)
         }
         titleLbl!.text = response.pois.first?.name
-        
-        
+        cityName = response.pois.first?.city as! NSString
+        locName = response.pois.first?.name as! String
         
         //通过富文本来设置行间距
         let paraph = NSMutableParagraphStyle()

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillAddressCanDelItemCell.swift

@@ -7,9 +7,12 @@
 //
 
 import UIKit
-
+protocol WayBillAddressCanDelItemCellDelegate {
+    func WayBillAddressCanDelItemCellDelAc(idx:Int)
+}
 class WayBillAddressCanDelItemCell: UITableViewCell {
-
+    @IBOutlet weak var delBtnTop: NSLayoutConstraint!
+    var delegate:WayBillAddressCanDelItemCellDelegate?
     @IBOutlet weak var topH: NSLayoutConstraint!
     @IBOutlet weak var nodataLbl: UILabel!
     @IBOutlet weak var delBtn: UIButton!
@@ -26,6 +29,9 @@ class WayBillAddressCanDelItemCell: UITableViewCell {
         self.selectionStyle = .none
         
     }
+    @IBAction func delAction(_ sender: Any) {
+        delegate?.WayBillAddressCanDelItemCellDelAc(idx: self.tag)
+    }
     open override func layoutSubviews() {
         super.layoutSubviews()
         self.contentView.setNeedsLayout()

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillAddressCanDelItemCell.xib

@@ -96,6 +96,9 @@
                                 <real key="value" value="3"/>
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
+                        <connections>
+                            <action selector="delAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="0Z7-GB-Z7c"/>
+                        </connections>
                     </button>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择或填写发货信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xQh-lb-yiJ">
                         <rect key="frame" x="46" y="6.5" width="133" height="16"/>
@@ -135,6 +138,7 @@
                 <outlet property="addressDetailLbl" destination="JfY-Q9-10Q" id="Xi4-mV-0hL"/>
                 <outlet property="addressLbl" destination="wxD-2W-Kct" id="OPZ-UV-8Wi"/>
                 <outlet property="delBtn" destination="gIq-zy-KC4" id="2h5-bf-ftd"/>
+                <outlet property="delBtnTop" destination="WFS-QX-fNC" id="qLd-qa-ekh"/>
                 <outlet property="iconH" destination="PTZ-fe-NB0" id="UMp-8r-8hy"/>
                 <outlet property="iconLbl" destination="JJG-L3-lyj" id="ZQ1-MD-9C6"/>
                 <outlet property="iconW" destination="Bp5-x3-dmY" id="blT-9t-em8"/>