um lines-num-old">
278
|
292
|
func selectIndex(indexpath: IndexPath) {
|
|
279
|
293
|
let ctl = UIStoryboard.photoDetail.instantiateController(ShowFullPicController.self)
|
|
280
|
294
|
ctl.datas = datas
|
|
|
|
@@ -295,7 +309,7 @@ extension DetailPageController: CellDelegate {
|
|
295
|
309
|
}
|
|
296
|
310
|
|
|
297
|
311
|
//MARK textField delegate
|
|
298
|
|
-extension DetailPageController: UIGestureRecognizerDelegate {
|
|
|
312
|
+extension PhotoDetailViewController: UIGestureRecognizerDelegate {
|
|
299
|
313
|
// MARK: textField
|
|
300
|
314
|
|
|
301
|
315
|
func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
|
|
|
|
@@ -312,33 +326,33 @@ extension DetailPageController: UIGestureRecognizerDelegate {
|
|
312
|
326
|
}
|
|
313
|
327
|
|
|
314
|
328
|
// MARK: UITableView delegate
|
|
315
|
|
-extension DetailPageController: UITableViewDataSource, UITableViewDelegate {
|
|
|
329
|
+extension PhotoDetailViewController: UITableViewDataSource, UITableViewDelegate {
|
|
316
|
330
|
|
|
317
|
331
|
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
|
|
318
|
332
|
if section == 3 {
|
|
319
|
333
|
let cell = tableView.dequeueReusableCell(withIdentifier: "thumbupHeadCell")
|
|
320
|
334
|
if let label = cell?.viewWithTag(1001) as? UILabel {
|
|
321
|
|
- label.text = "(\(detailPageViewModel.thumbups.count))"
|
|
|
335
|
+// label.text = "(\(detailPageViewModel.thumbups.count))"
|
|
322
|
336
|
}
|
|
323
|
337
|
if let button = cell?.viewWithTag(1011) as? UIButton {
|
|
324
|
338
|
button.addTarget(self, action: #selector(showThumps), for: .touchUpInside)
|
|
325
|
339
|
}
|
|
326
|
340
|
if let imageView = cell?.viewWithTag(1008) as? UIImageView {
|
|
327
|
|
- let imageName = detailPageViewModel.thumbupsCount <= 0 ? "收起" : "列表箭头"
|
|
328
|
|
- imageView.image = UIImage(named : imageName)
|
|
|
341
|
+// let imageName = detailPageViewModel.thumbupsCount <= 0 ? "收起" : "list-arrow"
|
|
|
342
|
+// imageView.image = UIImage(named : imageName)
|
|
329
|
343
|
}
|
|
330
|
344
|
return cell?.contentView
|
|
331
|
345
|
} else if section == 4 {
|
|
332
|
346
|
let cell = tableView.dequeueReusableCell(withIdentifier: "comentHeadCell")
|
|
333
|
347
|
if let label = cell?.viewWithTag(1002) as? UILabel {
|
|
334
|
|
- label.text = "(\(detailPageViewModel.comments.count))"
|
|
|
348
|
+// label.text = "(\(detailPageViewModel.comments.count))"
|
|
335
|
349
|
}
|
|
336
|
350
|
if let button = cell?.viewWithTag(1012) as? UIButton {
|
|
337
|
351
|
button.addTarget(self, action: #selector(showComments), for: .touchUpInside)
|
|
338
|
352
|
}
|
|
339
|
353
|
if let imageView = cell?.viewWithTag(1009) as? UIImageView {
|
|
340
|
|
- let imageName = detailPageViewModel.commentsCount <= 0 ? "收起" : "列表箭头"
|
|
341
|
|
- imageView.image = UIImage(named : imageName)
|
|
|
354
|
+// let imageName = detailPageViewModel.commentsCount <= 0 ? "收起" : "list-arrow"
|
|
|
355
|
+// imageView.image = UIImage(named : imageName)
|
|
342
|
356
|
}
|
|
343
|
357
|
return cell?.contentView
|
|
344
|
358
|
}
|
|
|
|
@@ -357,11 +371,11 @@ extension DetailPageController: UITableViewDataSource, UITableViewDelegate {
|
|
357
|
371
|
}
|
|
358
|
372
|
|
|
359
|
373
|
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
|
|
360
|
|
- if section == 3 {
|
|
361
|
|
- return detailPageViewModel.thumbupsCount > 0 ? 1 : 0
|
|
362
|
|
- } else if section == 4 {
|
|
363
|
|
- return detailPageViewModel.commentsCount
|
|
364
|
|
- }
|
|
|
374
|
+// if section == 3 {
|
|
|
375
|
+// return detailPageViewModel.thumbupsCount > 0 ? 1 : 0
|
|
|
376
|
+// } else if section == 4 {
|
|
|
377
|
+// return detailPageViewModel.commentsCount
|
|
|
378
|
+// }
|
|
365
|
379
|
return 0
|
|
366
|
380
|
}
|
|
367
|
381
|
|
|
|
|
@@ -391,14 +405,14 @@ extension DetailPageController: UITableViewDataSource, UITableViewDelegate {
|
|
391
|
405
|
return cell
|
|
392
|
406
|
} else if indexPath.section == 3 {
|
|
393
|
407
|
let cell = tableView.dequeueReusableCell(withIdentifier: "thumbupCell", for: indexPath) as! DetailthumbupImagesCell
|
|
394
|
|
- if detailPageViewModel.thumbups.count > 0 {
|
|
395
|
|
- let headers = detailPageViewModel.thumbups.map {$0.avatar}
|
|
396
|
|
- cell.setInfo(content: headers)
|
|
397
|
|
- }
|
|
|
408
|
+// if detailPageViewModel.thumbups.count > 0 {
|
|
|
409
|
+// let headers = detailPageViewModel.thumbups.map {$0.avatar}
|
|
|
410
|
+// cell.setInfo(content: headers)
|
|
|
411
|
+// }
|
|
398
|
412
|
return cell
|
|
399
|
413
|
} else {
|
|
400
|
414
|
let cell = tableView.dequeueReusableCell(withIdentifier: "comentCell", for: indexPath) as! DetailCommentCell
|
|
401
|
|
- cell.setInfo(detailPageViewModel.comments[indexPath.row])
|
|
|
415
|
+// cell.setInfo(detailPageViewModel.comments[indexPath.row])
|
|
402
|
416
|
return cell
|
|
403
|
417
|
}
|
|
404
|
418
|
}
|
|
|
|
@@ -418,3 +432,7 @@ extension DetailPageController: UITableViewDataSource, UITableViewDelegate {
|
|
418
|
432
|
}
|
|
419
|
433
|
}
|
|
420
|
434
|
}
|
|
|
435
|
+
|
|
|
436
|
+extension PhotoDetailViewController {
|
|
|
437
|
+
|
|
|
438
|
+}
|
|
|
|
@@ -13,7 +13,7 @@ import PaiaiUIKit
|
|
13
|
13
|
final class ShowFullPicController: UIViewController {
|
|
14
|
14
|
|
|
15
|
15
|
// MARK: Storyboard property
|
|
16
|
|
- @IBOutlet var collectionView: UICollectionView!
|
|
|
16
|
+ @IBOutlet weak var collectionView: UICollectionView!
|
|
17
|
17
|
// @IBOutlet weak var progressView: FFProgress!
|
|
18
|
18
|
// MARK: parameter property
|
|
19
|
19
|
lazy var datas = [PhotoItem]()
|
|
|
|
@@ -44,11 +44,11 @@ final class ShowFullPicController: UIViewController {
|
|
44
|
44
|
// MARK: Storyboard button function
|
|
45
|
45
|
@IBAction func back() {
|
|
46
|
46
|
_ = navigationController?.popViewController(animated: true)
|
|
47
|
|
- guard let ctl = navigationController?.viewControllers.last as? DetailPageController else {
|
|
|
47
|
+ guard let ctl = navigationController?.viewControllers.last as? PhotoDetailViewController else {
|
|
48
|
48
|
return
|
|
49
|
49
|
}
|
|
50
|
|
- ctl.currentPhotoIndex = currentPageIndex
|
|
51
|
|
- ctl.tableView.reloadData()
|
|
|
50
|
+// ctl.currentPhotoIndex = currentPageIndex
|
|
|
51
|
+// ctl.tableView.reloadData()
|
|
52
|
52
|
}
|
|
53
|
53
|
@IBAction func rotateTheImage(_ sender: UIButton) {
|
|
54
|
54
|
guard let cell = collectionView.cellForItem(at: IndexPath(item: currentPageIndex, section: 0)) as? ImageCell else {
|
|
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+//
|
|
|
2
|
+// ShareView.swift
|
|
|
3
|
+// Paiai_iOS
|
|
|
4
|
+//
|
|
|
5
|
+// Created by ffib on 2019/3/21.
|
|
|
6
|
+// Copyright © 2019 yb. All rights reserved.
|
|
|
7
|
+//
|
|
|
8
|
+
|
|
|
9
|
+import UIKit
|
|
|
10
|
+
|
|
|
11
|
+class ShareView: UIView {
|
|
|
12
|
+
|
|
|
13
|
+ /*
|
|
|
14
|
+ // Only override draw() if you perform custom drawing.
|
|
|
15
|
+ // An empty implementation adversely affects performance during animation.
|
|
|
16
|
+ override func draw(_ rect: CGRect) {
|
|
|
17
|
+ // Drawing code
|
|
|
18
|
+ }
|
|
|
19
|
+ */
|
|
|
20
|
+
|
|
|
21
|
+}
|