提交修改

liushiyu
1 parent 20b901f6
Showing 6 changed files with 102 additions and 77 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/CNUpSlideViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderExpressDetailViewController.swift
metaCode/Classes/Main/ShopPage/Model/CNLiveShopBaseModel.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyExpressView.swift
@@ -1443,7 +1443,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.1.23.11.10.10;
+				CURRENT_PROJECT_VERSION = 1.0.1.23.11.10.17;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1488,7 +1488,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.1.23.11.10.10;
+				CURRENT_PROJECT_VERSION = 1.0.1.23.11.10.17;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				EXCLUDED_ARCHS = "";
 				GENERATE_INFOPLIST_FILE = YES;
@@ -99,9 +99,9 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
         if slideModel.type == SlideModelTypeRecommend4{
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideRecommendCellIdentifier) as? CNLiveDownSlideRecommendCell 
             else {
-                let cell = CNLiveDownSlideRecommendCell()
-                cell.slideModel = slideModel
-                return cell
+//                let cell = CNLiveDownSlideRecommendCell()
+//                cell.slideModel = slideModel
+                return CNLiveDownSlideRecommendCell()
             }
             cell.slideModel = slideModel
             return cell
@@ -76,11 +76,13 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
         NotificationCenter.default.addObserver(self, selector: #selector(StandAuthNotificationSuccessAction), name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(StandAuthNotificationSuccessAction), name: Notification.Name.StandAuth.StandAuthSortNotificationResult, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(loadDataWithPoint), name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationReachableViaWiFi, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(loadDataWithPoint), name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationReachableViaWWAN, object: nil)
         StandAuthNotificationSuccessAction()
     }
-    public func loadDataWithPoint() {
+    @objc public func loadDataWithPoint() {
         CNLiveMineViewModel.requestWithCheckIn { [weak self] result, respStatue in
             if respStatue == .success {
                 self?.checkModel = result as? MinePointCheckInModel
@@ -68,7 +68,7 @@ class CNLiveShopOrderExpressDetailViewController: CNLiveBaseViewController, UITa
         navigationBarHidden = false
         titleName = "物流详情"
-        loadDataSourceAction()
+//        loadDataSourceAction()
         view.addSubview(tableView)
         tableView.snp.makeConstraints { make in
@@ -79,20 +79,20 @@ class CNLiveShopOrderExpressDetailViewController: CNLiveBaseViewController, UITa
     }
     func loadDataSourceAction() {
-//        showLoading(message: "")
-//        CNLiveShopViewModel.requestExpressDetail(orderId: _orderId, expId: _expId, networkType: _show_type) { [weak self] result, respStatue in
-//            if respStatue == .success {
-//                self!.expressModel = (result as! ShopOrderExpressDetailModel).express
-//                self!.dataArray.addObjects(from: (result as! ShopOrderExpressDetailModel).data)
-//                self!.tableView.reloadData()
-//            }else if (respStatue == .noNetwork) {
-//                self!.network_type = .noNetwork
-//                self!.tableView.reloadEmptyDataSet()
-//            } else {
-//                self!.network_type = .failed
-//                self!.tableView.reloadEmptyDataSet()
-//            }
-//        }
+        showLoading(message: "")
+        CNLiveShopViewModel.requestExpressDetail(orderId: _orderId, expId: _expId, networkType: _show_type) { [weak self] result, respStatue in
+            if respStatue == .success {
+                self!.expressModel = (result as! ShopOrderExpressDetailModel).express
+                self!.dataArray.addObjects(from: (result as! ShopOrderExpressDetailModel).data)
+                self!.tableView.reloadData()
+            }else if (respStatue == .noNetwork) {
+                self!.network_type = .noNetwork
+                self!.tableView.reloadEmptyDataSet()
+            } else {
+                self!.network_type = .failed
+                self!.tableView.reloadEmptyDataSet()
+            }
+        }
     }
 }
@@ -101,18 +101,38 @@ extension CNLiveShopOrderExpressDetailViewController {
         return 1
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-//        if _show_type == .orderExpress || _show_type == .refundExpress {
-//            return dataArray.count == 0 ? 0 : dataArray.count + 1
-//        } else {
+        if _show_type == .orderExpress || _show_type == .refundExpress {
+            return dataArray.count == 0 ? 0 : dataArray.count + 1
+        } else {
             return self.dataArray.count
-//        }
+        }
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         return UITableViewCell.init()
-//        guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyOrderExpressDetailTableViewCellIdentifier) as? ShopBodyOrderExpressDetailTableViewCell else {
-//            return ShopBodyOrderExpressDetailTableViewCell()
-//        }
-//        var isLastRow: Bool = false
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyOrderExpressDetailTableViewCellIdentifier) as? ShopBodyOrderExpressDetailTableViewCell else {
+            return ShopBodyOrderExpressDetailTableViewCell()
+        }
+        var isLastRow: Bool = false
+        var detailModel: ShopOrderExpressDetailDateModel!
+        if _show_type == .orderExpress || _show_type == .refundExpress {
+            if indexPath.row == 0 {
+                detailModel = ShopOrderExpressDetailDateModel()
+            } else {
+                detailModel = (dataArray[indexPath.row - 1] as! ShopOrderExpressDetailDateModel)
+            }
+            if indexPath.row == dataArray.count {
+                isLastRow = true
+            }
+        } else {
+            detailModel = (dataArray[indexPath.row] as! ShopOrderExpressDetailDateModel)
+            if indexPath.row == dataArray.count - 1 {
+                isLastRow = true
+            }
+        }
+        cell.setupDataSource(dataModel: detailModel, row: indexPath.row, isLastRow: isLastRow, type: _show_type, address: expressModel.address! as NSString, express_state: expressModel.state! as NSString, temp_array: temp_array)
+        return cell
+    }
+//    func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
 //        var detailModel: ShopOrderExpressDetailDateModel!
 //        if _show_type == .orderExpress || _show_type == .refundExpress {
 //            if indexPath.row == 0 {
@@ -120,20 +140,10 @@ extension CNLiveShopOrderExpressDetailViewController {
 //            } else {
 //                detailModel = (dataArray[indexPath.row - 1] as! ShopOrderExpressDetailDateModel)
 //            }
-//            if indexPath.row == dataArray.count {
-//                isLastRow = true
-//            }
 //        } else {
 //            detailModel = (dataArray[indexPath.row] as! ShopOrderExpressDetailDateModel)
-//            if indexPath.row == dataArray.count - 1 {
-//                isLastRow = true
-//            }
 //        }
-//        cell.setupDataSource(dataModel: detailModel, row: indexPath.row, isLastRow: isLastRow, type: _show_type, address: expressModel.address! as NSString, express_state: expressModel.state! as NSString, temp_array: temp_array)
-//        return cell
-    }
-//    func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
-//        return adapt_length(length: 80)
+//        return adapt_length(length: detailModel.cellH+70)
 //    }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 0.01
@@ -236,6 +236,18 @@ class ShopOrderExpressDetailDateModel: BaseModel {
     var AcceptTime: String? = ""//  时间
     var AcceptStation: String? = ""// 内容
     var accept_time: String? = ""//   时间戳
+    var cellH: CGFloat = 0.0 // 高度
+    
+    override func mapping(mapper: HelpingMapper) {
+        mapper <<<
+            self.AcceptStation <-- TransformOf(fromJSON: { (raw) -> String in
+                let cellH = raw?.calculateHeightWith(width: KSreenWidth - adapt_length(length: 70), font: medium_adapt_font(pointSize: 12))
+                self.cellH = cellH ?? 0.00
+                return raw!
+            }, toJSON: { (tuple) -> String? in
+                return tuple
+            })
+    }
 }
@@ -303,7 +303,7 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
         addSubview(timeLabel)
         addSubview(bottomLine)
-        initLayout()
+//        initLayout()
     }
     func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
@@ -402,12 +402,8 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
             titleTextView.text = dataModel.AcceptStation
             timeLabel.text = dataModel.AcceptTime
         }
-        titleTextView.sizeToFit()
-        
-//        if !temp_array.contains(dataModel.AcceptTime!) {
-            
-//            temp_array.add(dataModel.AcceptTime!)
-//        }
+//        titleTextView.sizeToFit()
+        setupLayout()
     }
     func initLayout() {
@@ -419,33 +415,38 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
         pointImageView.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(adapt_length(length: 16))
             make.left.equalTo(adapt_length(length: 20))
-            make.size.equalTo(pointImageView.size)
+            make.size.equalTo(adapt_length(length: 5))
+        }
+        titleTextView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(adapt_length(length: 15))
+            make.left.equalToSuperview().offset(adapt_length(length: 48))
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
         }
     }
     func setupLayout() {
         if _row == 0 {
-            lineLabel.snp.updateConstraints { make in
-//                make.centerX.equalTo(pointImageView)
+            lineLabel.snp.makeConstraints { make in
+                make.centerX.equalTo(pointImageView)
                 make.top.equalTo(pointImageView.snp.bottom)
-//                make.bottom.equalToSuperview()
-//                make.width.equalTo(adapt_length(length: 1))
+                make.bottom.equalToSuperview()
+                make.width.equalTo(adapt_length(length: 1))
             }
         } else if _isLastRow {
-            lineLabel.snp.updateConstraints { make in
-//                make.centerX.equalTo(pointImageView)
-//                make.top.equalToSuperview()
+            lineLabel.snp.makeConstraints { make in
+                make.centerX.equalTo(pointImageView)
+                make.top.equalToSuperview()
                 make.bottom.equalTo(pointImageView.snp.top)
-//                make.width.equalTo(adapt_length(length: 1))
+                make.width.equalTo(adapt_length(length: 1))
+            }
+        }
+        else {
+            lineLabel.snp.makeConstraints { make in
+                make.centerX.equalTo(pointImageView)
+                make.top.bottom.equalToSuperview()
+                make.width.equalTo(adapt_length(length: 1))
             }
         }
-//        else {
-//            lineLabel.snp.makeConstraints { make in
-//                make.centerX.equalTo(pointImageView)
-//                make.top.bottom.equalToSuperview()
-//                make.width.equalTo(adapt_length(length: 1))
-//            }
-//        }
         if ((_type == .orderExpress || _type == .refundExpress) && _row == 1) || (_type == .byYourself && _row == 0) {
             pointImageView.snp.makeConstraints { make in
                 make.top.equalToSuperview().offset(adapt_length(length: 16))
@@ -463,21 +464,21 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
             make.top.equalToSuperview().offset(adapt_length(length: 15))
             make.left.equalToSuperview().offset(adapt_length(length: 48))
             make.right.equalToSuperview().offset(-adapt_length(length: 20))
-            make.height.equalTo(titleTextView.height)
-        }
-        let top = timeLabel.text!.isNotBlank() ? adapt_length(length: 15) : 0
-        timeLabel.snp.makeConstraints { make in
-            make.top.equalTo(titleTextView.snp.bottom).offset(adapt_length(length: top))
-            make.left.equalTo(titleTextView.snp.left)
-            make.right.equalToSuperview().offset(-adapt_length(length: 20))
-            make.bottom.equalToSuperview().offset(-adapt_length(length: 15))
-        }
-        bottomLine.snp.makeConstraints { make in
-            make.left.equalTo(titleTextView.snp.left)
-            make.right.equalToSuperview().offset(-adapt_length(length: 20))
-            make.bottom.equalToSuperview()
-            make.height.equalTo(adapt_length(length: 1))
+            make.height.equalTo(_dataModel.cellH)
         }
+//        let top = timeLabel.text!.isNotBlank() ? adapt_length(length: 15) : 0
+//        timeLabel.snp.makeConstraints { make in
+//            make.top.equalTo(titleTextView.snp.bottom).offset(adapt_length(length: top))
+//            make.left.equalTo(titleTextView.snp.left)
+//            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+//            make.bottom.equalToSuperview().offset(-adapt_length(length: 15))
+//        }
+//        bottomLine.snp.makeConstraints { make in
+//            make.left.equalTo(titleTextView.snp.left)
+//            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+//            make.bottom.equalToSuperview()
+//            make.height.equalTo(adapt_length(length: 1))
+//        }
     }
     func setHyperlinksAttrStr(attrStr: NSMutableAttributedString) -> NSAttributedString {