提交修改

liushiyu
1 parent f5483280
Showing 10 changed files with 261 additions and 32 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderDetailViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderExpressDetailViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderListViewController.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyExpressView.swift
metaCode/Classes/Main/ShopPage/ViewModel/CNLiveShopViewModel.swift
metaCode/Supporting Files/Assets.xcassets/Shop/DS_express_current.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shop/DS_express_current.imageset/DS_express_current@2x.png
metaCode/Supporting Files/Assets.xcassets/Shop/DS_express_current.imageset/DS_express_current@3x.png
@@ -1439,7 +1439,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.1.23.11.09.17;
+				CURRENT_PROJECT_VERSION = 1.0.1.23.11.10.10;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1484,7 +1484,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.1.23.11.09.17;
+				CURRENT_PROJECT_VERSION = 1.0.1.23.11.10.10;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -46,7 +46,7 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
         dataArray.add(array03)
-//        dataArray.add([["name":"订单列表","icon":"mine_list_icon_help_feedback"]])
+        dataArray.add([["name":"订单列表","icon":"mine_list_icon_help_feedback"]])
         return dataArray
@@ -197,7 +197,7 @@ extension CNLiveShopOrderDetailViewController {
         if detailModel.send_num > 1 || detailModel.is_send == "0" {
             self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: detailModel.id! as NSString), animated: true)
         } else {
-            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(), animated: true)
+
         }
     }
@@ -12,6 +12,10 @@ enum CNLiveShopOrderExpressDetailShowType {
     case byYourself //自提
     case refundExpress //退款详情快递
 }
+enum CNLiveShopOrderExpressDetailYBYProgress {
+    case Zero    //备货完毕
+    case Complete//自取完毕
+}
 class CNLiveShopOrderExpressDetailViewController: CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate {
@@ -33,7 +37,26 @@ class CNLiveShopOrderExpressDetailViewController: CNLiveBaseViewController, UITa
         return dataArray
     }()
+    var _expId: NSString!
+    var _orderId: NSString!
+    var _refundId: NSString!
+    var _express_num: NSString!
+    var expressModel: ShopOrderExpressDetailModel!
+    var _show_type: CNLiveShopOrderExpressDetailShowType!
+    var _progress: CNLiveShopOrderExpressDetailYBYProgress!
     var network_type: CNLiveMineResponseType!
+    init(orderId: NSString, expId: NSString, show_type: CNLiveShopOrderExpressDetailShowType, progress: CNLiveShopOrderExpressDetailYBYProgress) {
+        _orderId = orderId
+        _expId = expId
+        _show_type = show_type
+        _progress = progress
+        super.init(nibName:nil, bundle:nil)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         navigationBarHidden = false
@@ -50,7 +73,19 @@ class CNLiveShopOrderExpressDetailViewController: CNLiveBaseViewController, UITa
     }
     func loadDataSourceAction() {
-        
+        CNLiveShopViewModel.requestExpressDetail(orderId: _orderId, expId: _expId, networkType: _show_type) { [weak self] result, respStatue in
+            if respStatue == .success {
+                let expressModel = result as! ShopOrderExpressDetailModel
+                self!.dataArray.addObjects(from: expressModel.data)
+                self!.tableView.reloadData()
+            }else if (respStatue == .noNetwork) {
+                self!.network_type = .noNetwork
+                self!.tableView.reloadEmptyDataSet()
+            } else {
+                self!.network_type = .failed
+                self!.tableView.reloadEmptyDataSet()
+            }
+        }
     }
 }
@@ -280,10 +280,10 @@ extension CNLiveShopOrderListViewController {
     /// - Parameter detailModel: 数据源
     private func pushExpressVC(listModel: ShopOrderListModel) {
         if listModel.send_num > 1 || listModel.is_send == "0" {
-            self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: listModel.id! as NSString), animated: true)
-//            self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: "1000073435"), animated: true)
+//            self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: listModel.id! as NSString), animated: true)
+            self.navigationController?.pushViewController(CNLiveShopOrderExpressListViewController.init(orderId: "1000073435"), animated: true)
         } else {
-            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(), animated: true)
+//            self.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(), animated: true)
         }
     }
@@ -8,7 +8,7 @@
 import Foundation
 import EmptyDataSet_Swift
-class ShopBodyOrderExpressListTableViewCell: UITableViewCell, UICollectionViewDataSource, UICollectionViewDelegate{
+class ShopBodyOrderExpressListTableViewCell: UITableViewCell, UICollectionViewDataSource {
     lazy var logoImageView: UIImageView = {
         let logoImageView = UIImageView.init()
@@ -69,7 +69,6 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell, UICollectionViewDa
         layout.scrollDirection = .horizontal
         let collectionView = UICollectionView.init(frame: CGRect.zero, collectionViewLayout: layout)
         collectionView.dataSource = self
-        collectionView.delegate = self
         collectionView.backgroundColor = .white
         collectionView.register(ShopBodyOrderExpressListCollectionViewCell.self, forCellWithReuseIdentifier: kShopBodyOrderExpressListCollectionViewCellIdentifier)
         let tap = UITapGestureRecognizer.init(target: self, action: #selector(pushExpressDetail))
@@ -169,7 +168,7 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell, UICollectionViewDa
     }
     @objc func pushExpressDetail() {
-        currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(), animated: true)
+        currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderExpressDetailViewController.init(orderId: _listModel.id! as NSString, expId: _listModel.express_num! as NSString, show_type: .orderExpress, progress: .Zero), animated: true)
     }
     @objc func actionClick(sender: UIButton) {
@@ -197,11 +196,6 @@ class ShopBodyOrderExpressListTableViewCell: UITableViewCell, UICollectionViewDa
         cell.expressNum.text = "\(goodsModel.num ?? 0)件"
         return cell
     }
-    
-    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        
-    }
-    
 }
 class ShopBodyOrderExpressListCollectionViewCell: UICollectionViewCell {
@@ -244,3 +238,179 @@ class ShopBodyOrderExpressListCollectionViewCell: UICollectionViewCell {
         fatalError("init(coder:) has not been implemented")
     }
 }
+
+class ShopBodyOrderExpressDetailHeaderView: UIView {
+    
+    var _showType: CNLiveShopOrderExpressDetailShowType!
+    init(frame: CGRect, showType: CNLiveShopOrderExpressDetailShowType) {
+        super.init(frame: frame)
+        _showType = showType
+    }
+    
+    
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+}
+
+
+class ShopBodyOrderExpressDetailTableView: UITableViewCell, UITextViewDelegate {
+    
+    lazy var lineLabel: UILabel = {
+        let lineLabel = UILabel.init()
+        lineLabel.backgroundColor = HexColor("#EAEAEA")
+        return lineLabel
+    }()
+    
+    lazy var pointImageView: UIImageView = {
+        let pointImageView = UIImageView.init()
+        return pointImageView
+    }()
+    
+    lazy var titleTextView: UITextView = {
+        let titleTextView = UITextView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth - adapt_length(length: 48) - adapt_length(length: 20), height: 0))
+        titleTextView.isEditable = false
+        titleTextView.isScrollEnabled = false
+        titleTextView.delegate = self
+        titleTextView.linkTextAttributes = [.foregroundColor:HexColor("#28c1c6")!]
+        return titleTextView
+    }()
+    
+    lazy var timeLabel: UILabel = {
+        let timeLabel = UILabel.init()
+        timeLabel.textColor = HexColor("#b4b4b4")
+        timeLabel.font = regular_adapt_font(pointSize: 12)
+        return timeLabel
+    }()
+    
+    lazy var bottomLine: UIImageView = {
+        let bottomLine = UIImageView.init()
+        bottomLine.backgroundColor = HexColor("#e4e4e4")
+        return bottomLine
+    }()
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        contentView.backgroundColor = .white
+        selectionStyle = .none
+        
+        addSubview(lineLabel)
+        addSubview(pointImageView)
+        addSubview(titleTextView)
+        addSubview(timeLabel)
+        addSubview(bottomLine)
+    }
+    
+    func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
+        if URL.absoluteString == "tel://" {
+            let phone = URL.absoluteString.components(separatedBy: "tel://").last
+            ConfigAlertManager.shared.presentAlert(title: phone!, message: "", actionTitles: ["取消","呼叫"]) { index in
+                if index == 1 {
+                    UIApplication.shared.open(NSURL(string: phone!)! as URL)
+                }
+            }
+        } else {
+            let webVC = CNWebViewController.init()
+            webVC.url = URL
+            currentViewController()?.navigationController?.pushViewController(webVC, animated: true)
+        }
+        return false
+    }
+    
+     
+    var _dataModel: ShopOrderExpressDetailDateModel!
+    var _row: NSInteger!
+    var _isLastRow: Bool!
+    var _type: CNLiveShopOrderExpressDetailShowType!
+    var _address: NSString!
+    var _express_state: NSString!
+    func setupDataSource(dataModel: ShopOrderExpressDetailDateModel, row: NSInteger, isLastRow: Bool, type: CNLiveShopOrderExpressDetailShowType, address: NSString, express_state: NSString) {
+        _dataModel = dataModel
+        _row = row
+        _isLastRow = isLastRow
+        _type = type
+        _address = address
+        _express_state = express_state
+        
+        if _type == .orderExpress || _type == .refundExpress {
+            
+            let para = NSMutableParagraphStyle()
+            para.lineSpacing = adapt_length(length: 3)
+            
+            if row == 0 {
+                let title = NSMutableAttributedString.init(string: "[收货地址]\(address)", attributes: [.font:medium_adapt_font(pointSize: 14),.foregroundColor:HexColor("#999999")!,.paragraphStyle:para.copy()])
+                titleTextView.attributedText = setHyperlinksAttrStr(attrStr: title)
+                timeLabel.text = ""
+                
+                pointImageView.image = nil
+                pointImageView.backgroundColor = HexColor("#d2d2d2")
+                pointImageView.size = CGSizeMake(adapt_length(length: 5), adapt_length(length: 5))
+                pointImageView.layer.cornerRadius = pointImageView.height/2
+                pointImageView.layer.masksToBounds = true
+            } else if (_row == 1) {
+                let state = _express_state == "3" ? "已签收" : "运输中"
+                let title = NSMutableAttributedString.init(string: "\(state)\n\(dataModel.AcceptStation!)", attributes: [.font:medium_adapt_font(pointSize: 12),.foregroundColor:HexColor("#b4b4b4")!,.paragraphStyle:para.copy()])
+                para.lineSpacing = adapt_length(length: 5)
+                title.addAttributes([.font:medium_adapt_font(pointSize: 14),.foregroundColor:HexColor("#28c1c6")!,.paragraphStyle:para.copy()], range: NSMakeRange(0, state.count+1))
+                titleTextView.attributedText = setHyperlinksAttrStr(attrStr: title)
+                timeLabel.text = dataModel.AcceptTime
+                
+                pointImageView.image = UIImage(named: "DS_express_current")
+                pointImageView.backgroundColor = .clear
+                pointImageView.size = CGSizeMake(adapt_length(length: 15), adapt_length(length: 15))
+                pointImageView.layer.cornerRadius = 0
+                pointImageView.layer.masksToBounds = false
+            }
+        } else {
+            titleTextView.font = medium_adapt_font(pointSize: 14)
+            if _row == 0 {
+                titleTextView.textColor = HexColor("#28c1c6")
+                
+                pointImageView.image = UIImage(named: "DS_express_current")
+                pointImageView.backgroundColor = .clear
+                pointImageView.size = CGSizeMake(adapt_length(length: 15), adapt_length(length: 15))
+                pointImageView.layer.cornerRadius = 0
+                pointImageView.layer.masksToBounds = false
+            } else {
+                titleTextView.textColor = HexColor("#999999")
+                
+                pointImageView.image = UIImage(named: "DS_express_current")
+                pointImageView.backgroundColor = .clear
+                pointImageView.size = CGSizeMake(adapt_length(length: 15), adapt_length(length: 15))
+                pointImageView.layer.cornerRadius = pointImageView.height/2
+                pointImageView.layer.masksToBounds = true
+                pointImageView.layer.borderColor = HexColor("#d2d2d2")?.cgColor
+                pointImageView.layer.borderWidth = adapt_length(length: 1)
+            }
+            titleTextView.text = dataModel.AcceptStation
+            timeLabel.text = dataModel.AcceptTime
+        }
+        titleTextView.sizeToFit()
+        
+        
+    }
+    
+    func setHyperlinksAttrStr(attrStr: NSMutableAttributedString) -> NSAttributedString {
+        do {
+            let dataDetector = try NSDataDetector(types: NSTextCheckingTypes(NSTextCheckingResult.CheckingType.link.rawValue) | NSTextCheckingTypes(NSTextCheckingResult.CheckingType.phoneNumber.rawValue))
+            let res = dataDetector.matches(in: attrStr.string, options: NSRegularExpression.MatchingOptions(rawValue: 0), range: NSMakeRange(0, attrStr.string.count))
+            for checkingRes in res {
+                if (checkingRes.phoneNumber != nil) {
+                    attrStr.addAttribute(.link, value: "tel://\(checkingRes.phoneNumber!)", range: checkingRes.range)
+                } else {
+                    attrStr.addAttribute(.link, value: checkingRes.url!, range: checkingRes.range)
+                }
+            }
+            return attrStr.copy() as! NSAttributedString
+        } catch {
+            print(error)
+        }
+        return attrStr.copy() as! NSAttributedString
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
@@ -8,12 +8,6 @@
 import Foundation
 import CNLiveRequestBastKit
-enum CNLiveShopOrderExpressDetailNetworkType {
-    case express // 订单详情查快递
-    case step    // 订单详情查进度
-    case refundId// 查询快递(退款详情)
-}
-
 typealias resultShopBlock = (_ result: Any,_ respStatue :CNLiveMineResponseType) -> Void
 class CNLiveShopViewModel: NSObject {
@@ -525,15 +519,26 @@ class CNLiveShopViewModel: NSObject {
         }
     }
-    ///  订单详情查快递
+    ///  订单详情查快递 && 订单详情查进度 && 查询快递(退款详情)
     /// - Parameters:
     ///   - orderId: 订单id
     ///   - expId: 物流id
     ///   - resultBlock: 返回
-    static func requestExpressDetail(orderId: NSString, expId: NSString, resultBlock: @escaping resultShopBlock) {
+    static func requestExpressDetail(orderId: NSString, expId: NSString, networkType:CNLiveShopOrderExpressDetailShowType, resultBlock: @escaping resultShopBlock) {
         let param = NSMutableDictionary()
         param.setValue(orderId, forKey: "id")
-        param.setValue(expId, forKey: "exp_id")
+        var url: NSString = ""
+        if networkType == .orderExpress {
+            url = "/api/v1/express"
+            param.setValue(expId, forKey: "exp_id")
+        }
+        if networkType == .byYourself {
+            url = "/api/v1/step"
+        }
+        if networkType == .refundExpress {
+            url = "/api/v1/getRefundExpress"
+        }
+
         let custom_param = NSMutableDictionary()
         custom_param.setValue(APPId_wjj, forKey: "appId")
         custom_param.setValue(APPKey_wjj, forKey: "appKey")
@@ -541,7 +546,7 @@ class CNLiveShopViewModel: NSObject {
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupDSRequest(true)
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
-        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/express", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+(url as String), param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
@@ -550,12 +555,9 @@ class CNLiveShopViewModel: NSObject {
                     if resp["data"] is NSNull {
                         resultBlock(NSNull(),.failed)
                     } else {
-                        let array = resp["data"] as! NSArray
-                        let tempArray = NSMutableArray()
-                        for item in array {
-                            let listModel = dictionaryToModel(item as! [String : Any], ShopOrderExpressDetailModel.self,"") as! ShopOrderExpressDetailModel
-                        }
-                        resultBlock(tempArray, .success)
+                        let item = resp["data"] as! NSDictionary
+                        let listModel = dictionaryToModel(item as! [String : Any], ShopOrderExpressDetailModel.self,"") as! ShopOrderExpressDetailModel
+                        resultBlock(listModel, .success)
                     }
                 } else {
                     showMessage(message: resp["message"] as! String)
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_express_current@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "DS_express_current@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}