时间选择

GeliBusinessPlatform/Model/LalamoveInterface.swift

@@ -135,7 +135,7 @@ func getSearchLogList(_ params:[String:Any],success:@escaping (_ res:Any)->(),fa
 //MARK:--获取货拉拉预约时间
 //params-key(user_token  )
 func getHllTime(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
-    NetworkRequest.sharedInstance.postRequest("获取货拉拉预约时间", params, { (rep:DataResponse<orderCancelReasonModel>) in
+    NetworkRequest.sharedInstance.postRequest("获取货拉拉预约时间", params, { (rep:DataResponse<getHllTimeModel>) in
     }, success: { (data) in
         success(data)
     }) { (error) in

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

@@ -550,8 +550,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         navbar.title = "运单列表"
         self.view.addSubview(navbar)
         
-        getDay()
-        
         SetTopFrame(view: topBtnView, height: 44)
         
         listView.separatorStyle = .none
@@ -908,10 +906,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                     vc.idx = 10086
                     vc.adrDatas = self.adrDatas
                     vc.delegate = self
-//                    if self.loc != nil{
-//                        vc.loc = self.loc
+                    //                    if self.loc != nil{
+                    //                        vc.loc = self.loc
                     self.navigationController?.pushViewController(vc, animated: true)
-//                    }
+                    //                    }
                 }) { (err) in
                     
                 }
@@ -921,7 +919,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 vc.adrDatas = adrDatas
                 vc.delegate = self
                 if adrDatas.count > 0 {
-//                    vc.loc = loc
+                    //                    vc.loc = loc
                     self.navigationController?.pushViewController(vc, animated: true)
                 }
             }
@@ -1043,7 +1041,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             }
         }else{//MARK: - 货拉拉did select
             
-            print(indexPath.section,indexPath.row)
+            
             if indexPath.section == 1 {
                 if locationIsOpen == false {
                     checkLocation()
@@ -1135,30 +1133,42 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 }
                 //时间
                 if indexPath.row == 0 {
-                    if bgBtn == nil {
+                    getHllTime(["user_token":UserToken as Any], success: { (data) in
+                        let model = data as! getHllTimeModel
+                        if self.bgBtn == nil {
                             let btn = UIButton()
                             self.view.addSubview(btn)
                             btn.backgroundColor = UIColor.black
                             btn.alpha = 0.4
-                        btn.addTarget(self, action: #selector(closeAc), for: .touchUpInside)
+                            btn.addTarget(self, action: #selector(self.closeAc), for: .touchUpInside)
                             btn.snp.makeConstraints { (make) in
                                 make.top.right.bottom.left.equalTo(0)
                             }
-                        bgBtn = btn
+                            self.bgBtn = btn
                         }
-                    if btmView == nil {
+                      
+                        if self.btmView == nil {
                             let view = UIView()
                             view.backgroundColor = UIColor.white
-                        btmView = view
-                        self.view.addSubview(btmView!)
-                        btmView!.snp.makeConstraints { (make) in
+                            self.view.addSubview(view)
+                            self.btmView = view
+                            view.snp.makeConstraints { (make) in
                                 make.left.bottom.right.equalTo(0)
                                 make.height.equalTo(360)
                             }
-                        btmView!.layer.cornerRadius = 5
-                        btmView!.layer.maskedCorners = [CACornerMask.layerMinXMinYCorner,CACornerMask.layerMaxXMinYCorner]
+                            view.layer.cornerRadius = 5
+                            view.layer.maskedCorners = [CACornerMask.layerMinXMinYCorner,CACornerMask.layerMaxXMinYCorner]
+                        }
+                        
+                        self.dayArr.removeAll()
+                        for item in model.data! {
+                            self.dayArr.append(item)
+                        }
+                        print(model.data?.count)
+                        self.showTimeSelect(view: self.btmView!)
+                    }) { (err) in
+                        
                     }
-                    showTimeSelect(view: btmView!)
                 }
             }
         }
@@ -1557,7 +1567,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             carListView!.addSubview(lbl)
             
             let closeBtn = UIButton(frame: CGRect(x: fullScreenWidth-44, y: 0, width: 44, height: 44))
-//            closeBtn.backgroundColor = UIColor.red
+            //            closeBtn.backgroundColor = UIColor.red
             closeBtn.setImage(UIImage(named: "xx"), for: .normal)
             closeBtn.addTarget(self, action: #selector(closeCarList), for: .touchUpInside)
             carListView!.addSubview(closeBtn)
@@ -1746,7 +1756,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     //选择器
     var pickerView:UIPickerView!
     //所以地址数据集合
-    var dayArr:Array<Any> = []
+    var dayArr:Array<getHllTimeDataModel> = []
     
     var dayIdx = 0
     var hourIdx = 0
@@ -1803,8 +1813,21 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             make.left.right.bottom.equalTo(0)
         }
     }
+    var stime:Double = 0
     @objc func submitAc(){
-        print("submitAc")
+        let day = dayArr[dayIdx]
+        let mins = day.h![hourIdx]
+        if dayIdx == 0 && hourIdx == 0 {
+            stime = mins.stime!
+        }else{
+            let min = mins.i![minIdx]
+            stime = min.stime!
+        }
+        bgBtn?.removeFromSuperview()
+        bgBtn = nil
+        btmView?.removeFromSuperview()
+        btmView = nil
+        print("时间戳 -- ",stime)
     }
     
     //设置选择框的列数为3列,继承于UIPickerViewDataSource协议
@@ -1815,42 +1838,39 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     //设置选择框的行数，继承于UIPickerViewDataSource协议
     func pickerView(_ pickerView: UIPickerView,
                     numberOfRowsInComponent component: Int) -> Int {
-        let dict = self.dayArr[dayIdx] as! NSDictionary
+        let model = self.dayArr[dayIdx]
         if component == 0 {
             return self.dayArr.count
         } else if component == 1 {
-            let hours = dict["list"] as! NSArray
-            return hours.count
+            let hours = model.h
+            return hours!.count
         } else {
-            let hours = dict["list"] as! NSArray
-            let min = hours[hourIdx] as! NSDictionary
-            let arr = min["list"] as! NSArray
-            return arr.count
+            if dayIdx == 0 && hourIdx == 0{
+                return 0
+            }else{
+                let hours = model.h
+                let mins = hours![hourIdx]
+                let arr = mins.i
+                return arr!.count
+            }
         }
     }
     //设置选择框各选项的内容，继承于UIPickerViewDelegate协议
     func pickerView(_ pickerView: UIPickerView, titleForRow row: Int,
                     forComponent component: Int) -> String? {
         if component == 0 {
-            let rowDic = self.dayArr[row] as! NSDictionary
-            return rowDic["day"] as? String
+            let model = self.dayArr[row]
+            return model.date
         }else if component == 1 {
-            let day = self.dayArr[dayIdx] as! NSDictionary
-            let hour = (day["list"] as! NSArray)[row]
-                as! [String: AnyObject]
-            if hour["hour"] as! String == "立即用车" {
-                return "立即用车"
-            }
-            return "\(String(describing: hour["hour"]))"
+            let day = self.dayArr[dayIdx]
+            let hour = day.h![row]
+            return hour.val
         }else {
-            let day = self.dayArr[dayIdx] as! NSDictionary
-            let hours = day["list"] as! NSArray
-            let hour = hours[hourIdx] as! NSDictionary
-            let mins = hour["list"] as! NSArray
-            for item in mins {
-                print(item)
-            }
-            return mins[row] as! String
+            let day = self.dayArr[dayIdx]
+            let hours = day.h!
+            let hour = hours[hourIdx]
+            let mins = hour.i!
+            return mins[row].val
         }
     }
     
@@ -1883,90 +1903,25 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         genderLbl.textColor = UIColor.init(named: "标题字颜色")
         
         if component == 0 {
-            let rowDic = self.dayArr[row] as! NSDictionary
-            genderLbl.text = rowDic["day"] as? String
+            let rowDic = self.dayArr[row]
+            genderLbl.text = rowDic.date
             
         }else if component == 1 {
             
-            let day = self.dayArr[dayIdx] as! NSDictionary
-            let hour = (day["list"] as! NSArray)[row]
-                as! [String: AnyObject]
-            genderLbl.text = hour["hour"] as? String
+            let day = self.dayArr[dayIdx]
+            let hour = day.h![row]
+            genderLbl.text = hour.val
         }else {
-            let day = self.dayArr[dayIdx] as! NSDictionary
-            let hours = day["list"] as! NSArray
-            let hour = hours[hourIdx] as! NSDictionary
-            let mins = hour["list"] as! NSArray
-            genderLbl.text = mins[row] as! String
+            let day = self.dayArr[dayIdx]
+            let hours = day.h
+            let hour = hours![hourIdx]
+            let mins = hour.i!
+            genderLbl.text = mins[row].val
         }
         
         return genderLbl
     }
     
-    
-    func getDay(){
-        let date0 = Date()
-        var tempArr:Array<NSString> = []
-        for i in 0 ..< 24 {
-            tempArr.append("\(i)" as NSString)
-        }
-        var hourArr:Array<NSString> = []
-        let minArr:Array<String> = ["0分","10分","20分","30分","40分","50分"]
-        
-        for i in 0 ..< 10 {//日
-            let dD:NSMutableDictionary = NSMutableDictionary()
-            let item = date0 + i.days + 8.hours
-            
-            var dList:Array<NSMutableDictionary> = []
-            if i == 0 {//首日
-                
-                for j in 0 ..< tempArr.count {
-                    if tempArr[j].integerValue > item.hour{
-                        hourArr.append(tempArr[j])
-                    }
-                }
-                hourArr.insert("立即用车", at: 0)
-                for k in 0 ..< hourArr.count {
-                    let hD:NSMutableDictionary = NSMutableDictionary()
-                    hD["hour"] = hourArr[k]
-                    if k == 0 {//首小时
-                        hD["list"] = []
-                    }else{
-                        hD["hour"] = "\(hourArr[k])点"
-                        hD["list"] = minArr
-                    }
-                    dList.append(hD)
-                    
-                }
-                dD["day"] = "今天"
-                dD["list"] = dList
-                dayArr.append(dD)
-                
-            }else if i == 1{
-                for k in 0 ..< tempArr.count {
-                    let hD:NSMutableDictionary = NSMutableDictionary()
-                    hD["hour"] = "\(tempArr[k])点"
-                    hD["list"] = minArr
-                    dList.append(hD)
-                }
-                dD["day"] = "明天"
-                dD["list"] = dList
-                dayArr.append(dD)
-            }else{
-                for k in 0 ..< tempArr.count {
-                    let hD:NSMutableDictionary = NSMutableDictionary()
-                    hD["hour"] = "\(tempArr[k])点"
-                    hD["list"] = minArr
-                    dList.append(hD)
-                }
-                dD["day"] = "\(item.month)月\(item.day)日"
-                dD["list"] = dList
-                dayArr.append(dD)
-            }
-        }
-    }
-    
-    
     func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
         bzIdx = selectnum
         view.removeFromSuperview()