iOS Team / CNLiveMateCode · Commits

Commit 050f9a68f177efcce32937bb701e729e8118505c

Authored by liushiyu
1 parent 20b901f6

提交修改

Inline Side-by-side
Showing 6 changed files with 102 additions and 77 deletions
metaCode.xcodeproj/project.pbxproj
  View file @050f9a6
... ... @@ -1443,7 +1443,7 @@
1443 1443 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1444 1444 CLANG_ENABLE_MODULES = YES;
1445 1445 CODE_SIGN_STYLE = Automatic;
1446   - CURRENT_PROJECT_VERSION = 1.0.1.23.11.10.10;
  1446 + CURRENT_PROJECT_VERSION = 1.0.1.23.11.10.17;
1447 1447 DEVELOPMENT_TEAM = 94X49GG3ZW;
1448 1448 EXCLUDED_ARCHS = "";
1449 1449 GENERATE_INFOPLIST_FILE = YES;
... ... @@ -1488,7 +1488,7 @@
1488 1488 ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
1489 1489 CLANG_ENABLE_MODULES = YES;
1490 1490 CODE_SIGN_STYLE = Automatic;
1491   - CURRENT_PROJECT_VERSION = 1.0.1.23.11.10.10;
  1491 + CURRENT_PROJECT_VERSION = 1.0.1.23.11.10.17;
1492 1492 DEVELOPMENT_TEAM = 94X49GG3ZW;
1493 1493 EXCLUDED_ARCHS = "";
1494 1494 GENERATE_INFOPLIST_FILE = YES;
... ...
metaCode/Classes/Main/HomePage/Controller/CNUpSlideViewController.swift
  View file @050f9a6
... ... @@ -99,9 +99,9 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
99 99 if slideModel.type == SlideModelTypeRecommend4{
100 100 guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideRecommendCellIdentifier) as? CNLiveDownSlideRecommendCell
101 101 else {
102   - let cell = CNLiveDownSlideRecommendCell()
103   - cell.slideModel = slideModel
104   - return cell
  102 +// let cell = CNLiveDownSlideRecommendCell()
  103 +// cell.slideModel = slideModel
  104 + return CNLiveDownSlideRecommendCell()
105 105 }
106 106 cell.slideModel = slideModel
107 107 return cell
... ...
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
  View file @050f9a6
... ... @@ -76,11 +76,13 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate,
76 76  
77 77 NotificationCenter.default.addObserver(self, selector: #selector(StandAuthNotificationSuccessAction), name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
78 78 NotificationCenter.default.addObserver(self, selector: #selector(StandAuthNotificationSuccessAction), name: Notification.Name.StandAuth.StandAuthSortNotificationResult, object: nil)
  79 + NotificationCenter.default.addObserver(self, selector: #selector(loadDataWithPoint), name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationReachableViaWiFi, object: nil)
  80 + NotificationCenter.default.addObserver(self, selector: #selector(loadDataWithPoint), name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationReachableViaWWAN, object: nil)
79 81 StandAuthNotificationSuccessAction()
80 82 }
81 83  
82 84  
83   - public func loadDataWithPoint() {
  85 + @objc public func loadDataWithPoint() {
84 86 CNLiveMineViewModel.requestWithCheckIn { [weak self] result, respStatue in
85 87 if respStatue == .success {
86 88 self?.checkModel = result as? MinePointCheckInModel
... ...
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopOrderExpressDetailViewController.swift
  View file @050f9a6
... ... @@ -68,7 +68,7 @@ class CNLiveShopOrderExpressDetailViewController: CNLiveBaseViewController, UITa
68 68 navigationBarHidden = false
69 69 titleName = "物流详情"
70 70  
71   - loadDataSourceAction()
  71 +// loadDataSourceAction()
72 72  
73 73 view.addSubview(tableView)
74 74 tableView.snp.makeConstraints { make in
... ... @@ -79,20 +79,20 @@ class CNLiveShopOrderExpressDetailViewController: CNLiveBaseViewController, UITa
79 79 }
80 80  
81 81 func loadDataSourceAction() {
82   -// showLoading(message: "")
83   -// CNLiveShopViewModel.requestExpressDetail(orderId: _orderId, expId: _expId, networkType: _show_type) { [weak self] result, respStatue in
84   -// if respStatue == .success {
85   -// self!.expressModel = (result as! ShopOrderExpressDetailModel).express
86   -// self!.dataArray.addObjects(from: (result as! ShopOrderExpressDetailModel).data)
87   -// self!.tableView.reloadData()
88   -// }else if (respStatue == .noNetwork) {
89   -// self!.network_type = .noNetwork
90   -// self!.tableView.reloadEmptyDataSet()
91   -// } else {
92   -// self!.network_type = .failed
93   -// self!.tableView.reloadEmptyDataSet()
94   -// }
95   -// }
  82 + showLoading(message: "")
  83 + CNLiveShopViewModel.requestExpressDetail(orderId: _orderId, expId: _expId, networkType: _show_type) { [weak self] result, respStatue in
  84 + if respStatue == .success {
  85 + self!.expressModel = (result as! ShopOrderExpressDetailModel).express
  86 + self!.dataArray.addObjects(from: (result as! ShopOrderExpressDetailModel).data)
  87 + self!.tableView.reloadData()
  88 + }else if (respStatue == .noNetwork) {
  89 + self!.network_type = .noNetwork
  90 + self!.tableView.reloadEmptyDataSet()
  91 + } else {
  92 + self!.network_type = .failed
  93 + self!.tableView.reloadEmptyDataSet()
  94 + }
  95 + }
96 96 }
97 97 }
98 98  
... ... @@ -101,18 +101,38 @@ extension CNLiveShopOrderExpressDetailViewController {
101 101 return 1
102 102 }
103 103 func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
104   -// if _show_type == .orderExpress || _show_type == .refundExpress {
105   -// return dataArray.count == 0 ? 0 : dataArray.count + 1
106   -// } else {
  104 + if _show_type == .orderExpress || _show_type == .refundExpress {
  105 + return dataArray.count == 0 ? 0 : dataArray.count + 1
  106 + } else {
107 107 return self.dataArray.count
108   -// }
  108 + }
109 109 }
110 110 func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
111 111 return UITableViewCell.init()
112   -// guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyOrderExpressDetailTableViewCellIdentifier) as? ShopBodyOrderExpressDetailTableViewCell else {
113   -// return ShopBodyOrderExpressDetailTableViewCell()
114   -// }
115   -// var isLastRow: Bool = false
  112 + guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyOrderExpressDetailTableViewCellIdentifier) as? ShopBodyOrderExpressDetailTableViewCell else {
  113 + return ShopBodyOrderExpressDetailTableViewCell()
  114 + }
  115 + var isLastRow: Bool = false
  116 + var detailModel: ShopOrderExpressDetailDateModel!
  117 + if _show_type == .orderExpress || _show_type == .refundExpress {
  118 + if indexPath.row == 0 {
  119 + detailModel = ShopOrderExpressDetailDateModel()
  120 + } else {
  121 + detailModel = (dataArray[indexPath.row - 1] as! ShopOrderExpressDetailDateModel)
  122 + }
  123 + if indexPath.row == dataArray.count {
  124 + isLastRow = true
  125 + }
  126 + } else {
  127 + detailModel = (dataArray[indexPath.row] as! ShopOrderExpressDetailDateModel)
  128 + if indexPath.row == dataArray.count - 1 {
  129 + isLastRow = true
  130 + }
  131 + }
  132 + 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)
  133 + return cell
  134 + }
  135 +// func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
116 136 // var detailModel: ShopOrderExpressDetailDateModel!
117 137 // if _show_type == .orderExpress || _show_type == .refundExpress {
118 138 // if indexPath.row == 0 {
... ... @@ -120,20 +140,10 @@ extension CNLiveShopOrderExpressDetailViewController {
120 140 // } else {
121 141 // detailModel = (dataArray[indexPath.row - 1] as! ShopOrderExpressDetailDateModel)
122 142 // }
123   -// if indexPath.row == dataArray.count {
124   -// isLastRow = true
125   -// }
126 143 // } else {
127 144 // detailModel = (dataArray[indexPath.row] as! ShopOrderExpressDetailDateModel)
128   -// if indexPath.row == dataArray.count - 1 {
129   -// isLastRow = true
130   -// }
131 145 // }
132   -// 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)
133   -// return cell
134   - }
135   -// func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
136   -// return adapt_length(length: 80)
  146 +// return adapt_length(length: detailModel.cellH+70)
137 147 // }
138 148 func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
139 149 return 0.01
... ...
metaCode/Classes/Main/ShopPage/Model/CNLiveShopBaseModel.swift
  View file @050f9a6
... ... @@ -236,6 +236,18 @@ class ShopOrderExpressDetailDateModel: BaseModel {
236 236 var AcceptTime: String? = ""// 时间
237 237 var AcceptStation: String? = ""// 内容
238 238 var accept_time: String? = ""// 时间戳
  239 + var cellH: CGFloat = 0.0 // 高度
  240 +
  241 + override func mapping(mapper: HelpingMapper) {
  242 + mapper <<<
  243 + self.AcceptStation <-- TransformOf(fromJSON: { (raw) -> String in
  244 + let cellH = raw?.calculateHeightWith(width: KSreenWidth - adapt_length(length: 70), font: medium_adapt_font(pointSize: 12))
  245 + self.cellH = cellH ?? 0.00
  246 + return raw!
  247 + }, toJSON: { (tuple) -> String? in
  248 + return tuple
  249 + })
  250 + }
239 251 }
240 252  
241 253  
... ...
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyExpressView.swift
  View file @050f9a6
... ... @@ -303,7 +303,7 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
303 303 addSubview(timeLabel)
304 304 addSubview(bottomLine)
305 305  
306   - initLayout()
  306 +// initLayout()
307 307 }
308 308  
309 309 func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
... ... @@ -402,12 +402,8 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
402 402 titleTextView.text = dataModel.AcceptStation
403 403 timeLabel.text = dataModel.AcceptTime
404 404 }
405   - titleTextView.sizeToFit()
406   -
407   -// if !temp_array.contains(dataModel.AcceptTime!) {
408   -
409   -// temp_array.add(dataModel.AcceptTime!)
410   -// }
  405 +// titleTextView.sizeToFit()
  406 + setupLayout()
411 407 }
412 408  
413 409 func initLayout() {
... ... @@ -419,33 +415,38 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
419 415 pointImageView.snp.makeConstraints { make in
420 416 make.top.equalToSuperview().offset(adapt_length(length: 16))
421 417 make.left.equalTo(adapt_length(length: 20))
422   - make.size.equalTo(pointImageView.size)
  418 + make.size.equalTo(adapt_length(length: 5))
  419 + }
  420 + titleTextView.snp.makeConstraints { make in
  421 + make.top.equalToSuperview().offset(adapt_length(length: 15))
  422 + make.left.equalToSuperview().offset(adapt_length(length: 48))
  423 + make.right.equalToSuperview().offset(-adapt_length(length: 20))
423 424 }
424 425 }
425 426  
426 427 func setupLayout() {
427 428 if _row == 0 {
428   - lineLabel.snp.updateConstraints { make in
429   -// make.centerX.equalTo(pointImageView)
  429 + lineLabel.snp.makeConstraints { make in
  430 + make.centerX.equalTo(pointImageView)
430 431 make.top.equalTo(pointImageView.snp.bottom)
431   -// make.bottom.equalToSuperview()
432   -// make.width.equalTo(adapt_length(length: 1))
  432 + make.bottom.equalToSuperview()
  433 + make.width.equalTo(adapt_length(length: 1))
433 434 }
434 435 } else if _isLastRow {
435   - lineLabel.snp.updateConstraints { make in
436   -// make.centerX.equalTo(pointImageView)
437   -// make.top.equalToSuperview()
  436 + lineLabel.snp.makeConstraints { make in
  437 + make.centerX.equalTo(pointImageView)
  438 + make.top.equalToSuperview()
438 439 make.bottom.equalTo(pointImageView.snp.top)
439   -// make.width.equalTo(adapt_length(length: 1))
  440 + make.width.equalTo(adapt_length(length: 1))
  441 + }
  442 + }
  443 + else {
  444 + lineLabel.snp.makeConstraints { make in
  445 + make.centerX.equalTo(pointImageView)
  446 + make.top.bottom.equalToSuperview()
  447 + make.width.equalTo(adapt_length(length: 1))
440 448 }
441 449 }
442   -// else {
443   -// lineLabel.snp.makeConstraints { make in
444   -// make.centerX.equalTo(pointImageView)
445   -// make.top.bottom.equalToSuperview()
446   -// make.width.equalTo(adapt_length(length: 1))
447   -// }
448   -// }
449 450 if ((_type == .orderExpress || _type == .refundExpress) && _row == 1) || (_type == .byYourself && _row == 0) {
450 451 pointImageView.snp.makeConstraints { make in
451 452 make.top.equalToSuperview().offset(adapt_length(length: 16))
... ... @@ -463,21 +464,21 @@ class ShopBodyOrderExpressDetailTableViewCell: UITableViewCell, UITextViewDelega
463 464 make.top.equalToSuperview().offset(adapt_length(length: 15))
464 465 make.left.equalToSuperview().offset(adapt_length(length: 48))
465 466 make.right.equalToSuperview().offset(-adapt_length(length: 20))
466   - make.height.equalTo(titleTextView.height)
467   - }
468   - let top = timeLabel.text!.isNotBlank() ? adapt_length(length: 15) : 0
469   - timeLabel.snp.makeConstraints { make in
470   - make.top.equalTo(titleTextView.snp.bottom).offset(adapt_length(length: top))
471   - make.left.equalTo(titleTextView.snp.left)
472   - make.right.equalToSuperview().offset(-adapt_length(length: 20))
473   - make.bottom.equalToSuperview().offset(-adapt_length(length: 15))
474   - }
475   - bottomLine.snp.makeConstraints { make in
476   - make.left.equalTo(titleTextView.snp.left)
477   - make.right.equalToSuperview().offset(-adapt_length(length: 20))
478   - make.bottom.equalToSuperview()
479   - make.height.equalTo(adapt_length(length: 1))
  467 + make.height.equalTo(_dataModel.cellH)
480 468 }
  469 +// let top = timeLabel.text!.isNotBlank() ? adapt_length(length: 15) : 0
  470 +// timeLabel.snp.makeConstraints { make in
  471 +// make.top.equalTo(titleTextView.snp.bottom).offset(adapt_length(length: top))
  472 +// make.left.equalTo(titleTextView.snp.left)
  473 +// make.right.equalToSuperview().offset(-adapt_length(length: 20))
  474 +// make.bottom.equalToSuperview().offset(-adapt_length(length: 15))
  475 +// }
  476 +// bottomLine.snp.makeConstraints { make in
  477 +// make.left.equalTo(titleTextView.snp.left)
  478 +// make.right.equalToSuperview().offset(-adapt_length(length: 20))
  479 +// make.bottom.equalToSuperview()
  480 +// make.height.equalTo(adapt_length(length: 1))
  481 +// }
481 482 }
482 483  
483 484 func setHyperlinksAttrStr(attrStr: NSMutableAttributedString) -> NSAttributedString {
... ...