--- a/PaiAi/Paiai_iOS/App/PhotoDetail/PhotoDetailCommentCell.swift
+++ b/PaiAi/Paiai_iOS/App/PhotoDetail/PhotoDetailCommentCell.swift
@@ -1,5 +1,5 @@
 
                 //
              
 
                -//  DetailCommentCell.swift
              
 
                +//  PhotoDetailCommentCell.swift
              
 
                 //  PaiAi
              
 
                 //
              
 
                 //  Created by zhengjianfei on 16/4/8.
              
@@ -10,7 +10,7 @@ import UIKit
 
                 import PaiaiDataKit
              
 
                 import PaiaiUIKit
              
 
                 
              
 
                -class DetailCommentCell: UITableViewCell {
              
 
                +class PhotoDetailCommentCell: UITableViewCell {
              
 
                 
              
 
                     // MARK: Storyboard property
              
 
                     @IBOutlet weak var headImage: UIImageView!
              
--- a/PaiAi/Paiai_iOS/App/PhotoDetail/PhotoDetailCoordinator.swift
+++ b/PaiAi/Paiai_iOS/App/PhotoDetail/PhotoDetailCoordinator.swift
@@ -7,9 +7,57 @@
 
                 //
              
 
                 
              
 
                 import Foundation
              
 
                +import PaiaiDataKit
              
 
                +
              
 
                +final class PhotoDetailCoordinator: Coordinator {
              
 
                +    let navigationController: UINavigationController
              
 
                +    let photoDetailViewController: PhotoDetailViewController
              
 
                +    let shareListViewModel: PhotoDetailListViewModel
              
 
                +    
              
 
                +    fileprivate var coordinators = [String: Coordinator]()
              
 
                +    
              
 
                +    init(_ photoDetailVC: PhotoDetailViewController,
              
 
                +         nav: UINavigationController,
              
 
                +         viewModel: PhotoDetailViewModel,
              
 
                +         listViewModel: PhotoDetailListViewModel) {
              
 
                +        photoDetailViewController = photoDetailVC
              
 
                +        shareListViewModel = listViewModel
              
 
                +        navigationController = nav
              
 
                +        photoDetailViewController.listViewModel = shareListViewModel
              
 
                +        photoDetailViewController.viewModel = viewModel
              
 
                +        
              
 
                +        viewModel.delegate = self
              
 
                +        shareListViewModel.synchronization = viewModel
              
 
                +        shareListViewModel.delegate = self
              
 
                +    }
              
 
                +    
              
 
                +    func start() {
              
 
                +        
              
 
                +    }
              
 
                +}
              
 
                +
              
 
                +extension PhotoDetailCoordinator: PhotoDetailViewModelDelegate {
              
 
                +    func navigateToGroup(_ item: GroupItem) {
              
 
                +        let vc = GroupViewController.instantiate()
              
 
                +        vc.viewModel = GroupViewModel(groupItem: item)
              
 
                +        let coordinator = GroupCoordinator(vc,
              
 
                +                                           navigationController: navigationController)
              
 
                +        coordinators["group"] = coordinator
              
 
                +        
              
 
                +        navigationController.pushViewController(vc)
              
 
                +    }
              
 
                +}
              
 
                +
              
 
                +extension PhotoDetailCoordinator: PhotoDetailListViewModelDelegate {
              
 
                +    func didSelected() {
              
 
                +        let vc = UIStoryboard.photoDetail.instantiateController(PhotoPreviewViewController.self)
              
 
                +        vc.viewModel = shareListViewModel
              
 
                +        navigationController.pushViewController(vc, animated: true)
              
 
                +    }
              
 
                +}
              
 
                 
              
 
                 extension UIStoryboard {
              
 
                     static var photoDetail: UIStoryboard {
              
 
                -        return UIStoryboard(name: "Detail", bundle: Bundle(identifier: "com.Paiai-iOS"))
              
 
                +        return UIStoryboard(name: "PhotoDetail", bundle: Bundle(identifier: "com.Paiai-iOS"))
              
 
                     }
              
 
                 }
              
--- a/PaiAi/Paiai_iOS/App/PhotoDetail/PhotoDetailImageCell.swift
+++ b/PaiAi/Paiai_iOS/App/PhotoDetail/PhotoDetailImageCell.swift
@@ -9,5 +9,5 @@
 
                 import UIKit
              
 
                 
              
 
                 class PhotoDetailImageCell: UICollectionViewCell {
              
 
                -    
              
 
                +    @IBOutlet weak var imageView: UIImageView!
              
 
                 }
              
--- a/PaiAi/Paiai_iOS/App/PhotoDetail/PhotoDetailViewController.swift
+++ b/PaiAi/Paiai_iOS/App/PhotoDetail/PhotoDetailViewController.swift
@@ -9,6 +9,7 @@
 
                 import UIKit
              
 
                 import RxSwift
              
 
                 import RxCocoa
              
 
                +import RxDataSources
              
 
                 import PaiaiDataKit
              
 
                 import PaiaiUIKit
              
 
                 
              
@@ -17,6 +18,7 @@ let kPhotographerMark = 1
 
                 
              
 
                 final class PhotoDetailViewController: UIViewController {
              
 
                 
              
 
                +    @IBOutlet weak var enterGroupView: UIView!
              
 
                     @IBOutlet weak var groupAvatar: UIImageView!
              
 
                     @IBOutlet weak var groupName: UILabel!
              
 
                     
              
@@ -30,409 +32,333 @@ final class PhotoDetailViewController: UIViewController {
 
                     @IBOutlet weak var thumbupView: UIView!
              
 
                     
              
 
                     @IBOutlet weak var commentCount: UILabel!
              
 
                -    @IBOutlet weak var tableView: UITableView!
              
 
                +    @IBOutlet weak var commentTableView: UITableView!
              
 
                     
              
 
                -    @IBOutlet weak var commentView: UIView!
              
 
                +    @IBOutlet weak var commentEditingView: UIView!
              
 
                     @IBOutlet weak var commentHeight: NSLayoutConstraint!
              
 
                     @IBOutlet weak var commentTextField: UITextField!
              
 
                     @IBOutlet weak var sendBtn: UIButton!
              
 
                     
              
 
                     @IBOutlet weak var buyView: UIView!
              
 
                +    @IBOutlet weak var waterMarkView: UIView!
              
 
                     @IBOutlet weak var waterMarkImage: UIImageView!
              
 
                     @IBOutlet weak var waterMarkLabel: UILabel!
              
 
                -
              
 
                +    
              
 
                +    @IBOutlet weak var thumbupViewHeightConstraint: NSLayoutConstraint!
              
 
                +    @IBOutlet weak var commentEditYConstraint: NSLayoutConstraint!
              
 
                +    
              
 
                     // MARK: data property
              
 
                     var viewModel: PhotoDetailViewModel!
              
 
                -    lazy var datas = [PhotoItem]()
              
 
                -    lazy var currentPhotoIndex = 0
              
 
                -    var isHiddenEnterView = false
              
 
                +    var listViewModel: PhotoDetailListViewModel!
              
 
                +    
              
 
                     let disposeBag = DisposeBag()
              
 
                -    static let storyboardCtl = UIStoryboard.photoDetail.instantiateInitialViewController() as! PhotoDetailViewController
              
 
                 
              
 
                     // MARK: view function
              
 
                     override func viewDidLoad() {
              
 
                         super.viewDidLoad()
              
 
                -//        detailPageViewModel.tipDelegate = self
              
 
                -//        tableView.tableFooterView = UIView()
              
 
                -        configureNotification()
              
 
                -        
              
 
                -        commentTextField.rx.text
              
 
                -                        .map {!($0?.isEmpty)!}
              
 
                -                        .bind(to: sendBtn.rx.isEnabled)
              
 
                -                        .disposed(by: disposeBag)
              
 
                +        binding()
              
 
                +        setup()
              
 
                +    }
              
 
                +    
              
 
                +    func setup() {
              
 
                +        setupCommentTextField()
              
 
                +        setupWaterMarkView()
              
 
                     }
              
 
                     
              
 
                     func setupCommentTextField() {
              
 
                         commentTextField.addLeftPadding(7)
              
 
                     }
              
 
                +    
              
 
                +    func setupWaterMarkView() {
              
 
                +        guard let image = UIImage.PhotoDetail.purchaseBackground else { return }
              
 
                +        waterMarkView.backgroundColor = UIColor(patternImage: image)
              
 
                +    }
              
 
                 
              
 
                     override func viewWillAppear(_ animated: Bool) {
              
 
                         super.viewWillAppear(true)
              
 
                -//        titleWithbackBar = "详情"
              
 
                -        navigationController?.isNavigationBarHidden = false
              
 
                -//        refreshUI(index: currentPhotoIndex)
              
 
                -    }
              
 
                -
              
 
                -//    override func backToController() {
              
 
                -//        navigationController?.popViewController(animated: true)
              
 
                -//        if let last = navigationController?.viewControllers[(navigationController?.viewControllers.count)! - 1] as? HomeViewController {
              
 
                -////            last.mainViewModel.models.value = datas
              
 
                -//        }
              
 
                -//
              
 
                -//        if let last = navigationController?.viewControllers[(navigationController?.viewControllers.count)! - 1] as? GroupViewController {
              
 
                -////            last.MineGroupViewModel.models.value = datas
              
 
                -//        }
              
 
                -//    }
              
 
                -
              
 
                -    func configureNotification() {
              
 
                -        do {
              
 
                -//            NotificationCenter.default.rx.notification(Notification.Name(rawValue: WXPayDidFinishNotification)).asObservable().subscribe { (notification) in
              
 
                -//                FFToastView.showLoadingToast(inView: UIApplication.shared.keyWindow!, blockSuperView: true)
              
 
                -//                self.detailPageViewModel.handleResult(errorCode: 0, success: {[weak self](PhotoItem) in
              
 
                -//                    if let weakself = self {
              
 
                -//                        weakself.datas[weakself.currentPhotoIndex].murl = PhotoItem.murl
              
 
                -//                        weakself.datas[weakself.currentPhotoIndex].rurl = PhotoItem.rurl
              
 
                -////                        weakself.showBuyView()
              
 
                -//                        weakself.tableView.reloadRows(at: [IndexPath(item: 0, section: 1)], with: .none)
              
 
                -//                        let fullPicCtl = UIStoryboard.detailBoard.instantiateController(ShowFullPicController.self)
              
 
                -//                        fullPicCtl.datas = weakself.datas
              
 
                -//                        fullPicCtl.currentPhotoIndex = weakself.currentPhotoIndex
              
 
                -//                        fullPicCtl.showNomark = weakself.detailPageViewModel.watermarkPrice != -1
              
 
                -//                        fullPicCtl.showHD = weakself.detailPageViewModel.hdPrice != -1
              
 
                -//                        weakself.navigationController?.pushViewController(fullPicCtl, animated: true)
              
 
                -//                   }
              
 
                -//                })
              
 
                -//                }.disposed(by: disposeBag)
              
 
                -        }
              
 
                -        do {
              
 
                -//            NotificationCenter.default.rx.notification(Notification.Name.UIKeyboardWillShow)
              
 
                -//                .asObservable()
              
 
                -//                .subscribe({ (notification) in
              
 
                -//                    guard let info = notification.element?.userInfo, let avalue = info[UIKeyboardFrameEndUserInfoKey] else {
              
 
                -//                        return
              
 
                -//                    }
              
 
                -//
              
 
                -//                    let height = (avalue as AnyObject).cgRectValue.size.height
              
 
                -//                    self.returnKeyboarAction(notification.element!, height: height)
              
 
                -//                }).disposed(by: disposeBag)
              
 
                -        }
              
 
                -
              
 
                -        do {
              
 
                -            NotificationCenter.default.rx.notification(UIResponder.keyboardWillHideNotification)
              
 
                -                .asObservable()
              
 
                -                .subscribe({ (notification) in
              
 
                -                    self.returnKeyboarAction(notification.element!, height: 0)
              
 
                -                }).disposed(by: disposeBag)
              
 
                -        }
              
 
                -
              
 
                +        viewModel.viewWillAppear.accept(())
              
 
                     }
              
 
                +}
              
 
                 
              
 
                -    // MARK: refresh interface
              
 
                -    func refreshUI(index: Int) {
              
 
                -        currentPhotoIndex = index
              
 
                -//        detailPageViewModel.currentPhoto = datas[index]
              
 
                -
              
 
                -//        detailPageViewModel.fetchThumbup(success: {[weak self] in
              
 
                -//            if let weakself = self {
              
 
                -//                var model = weakself.datas[index]
              
 
                -//                model.thumbup_num =  weakself.detailPageViewModel.thumbups.count
              
 
                -//                weakself.datas[index] = model
              
 
                -////                PhotoLocalStorage.instance.updateLocalData(PhotoItem: model)
              
 
                -//                weakself.reloadSection(inter: 3)
              
 
                -//            }
              
 
                -//        })
              
 
                -//        detailPageViewModel.fetchComment(success: {[weak self] in
              
 
                -//            if let weakself = self {
              
 
                -//
              
 
                -//                var model = weakself.datas[index]
              
 
                -//                model.comment_num =  weakself.detailPageViewModel.comments.count
              
 
                -//                weakself.datas[index] = model
              
 
                -////                PhotoLocalStorage.instance.updateLocalData(PhotoItem: model)
              
 
                -//                weakself.reloadSection(inter: 4)
              
 
                -//            }
              
 
                -//        })
              
 
                +//MARK textField delegate
              
 
                +extension PhotoDetailViewController: UIGestureRecognizerDelegate {
              
 
                +    // MARK: textField
              
 
                 
              
 
                -//        reloadSection(inter: 0)
              
 
                -//        reloadSection(inter: 2)
              
 
                -        showBuyView()
              
 
                +    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
              
 
                +        return commentTextField.isFirstResponder
              
 
                     }
              
 
                +    
              
 
                +}
              
 
                 
              
 
                -    func showBuyView() {
              
 
                -//        if detailPageViewModel.currentPhoto.photo_from == kPhotographerMark && detailPageViewModel.currentPhoto.display_payment_btn == 1 {
              
 
                -//            buyView.isHidden = false
              
 
                -//            detailPageViewModel.hdPrice = -0.01
              
 
                -//            detailPageViewModel.watermarkPrice = -0.01
              
 
                -//            shuiyinLabel.text = !detailPageViewModel.currentPhoto.murl.isEmpty ? "查看无水印图" : "去除水印"
              
 
                -//            shuiyinImage.isHidden = false
              
 
                -//        } else {
              
 
                -//            buyView.isHidden = true
              
 
                -//        }
              
 
                -    }
              
 
                 
              
 
                -    // MARK: Storyboard  button function
              
 
                -    @IBAction func HDPay(_ sender: UIButton) {
              
 
                -//        detailPageViewModel.getHD (getPriceSuccess: { [weak self] (isExist) in
              
 
                -//            if let weakself = self {
              
 
                -//                if isExist {
              
 
                -//                    let fullPicCtl = UIStoryboard(name: "Detail", bundle: nil).instantiateController(ShowFullPicController.self)
              
 
                -//                    fullPicCtl.datas = [weakself.datas[weakself.currentPhotoIndex]]
              
 
                -//                    fullPicCtl.showNomark = true
              
 
                -//                    fullPicCtl.currentPhotoIndex = weakself.currentPhotoIndex
              
 
                -//                    weakself.navigationController?.pushViewController(fullPicCtl, animated: true)
              
 
                -//                } else {
              
 
                -//                }
              
 
                -//            }
              
 
                -//        })
              
 
                +/// bind storyboard gesture action
              
 
                +extension PhotoDetailViewController {
              
 
                +    @IBAction func purchase(_ sender: UITapGestureRecognizer) {
              
 
                +        
              
 
                     }
              
 
                -
              
 
                -    @IBAction func waterMarkPay(_ sender: UIButton) {
              
 
                -
              
 
                -//        detailPageViewModel.getWatermark (getPriceSuccess: { [weak self] (isExist) in
              
 
                -//            if let weakself = self {
              
 
                -//                if isExist {
              
 
                -//                    let fullPicCtl = UIStoryboard(name: "Detail", bundle: nil).instantiateController(ShowFullPicController.self)
              
 
                -//                    fullPicCtl.datas = weakself.datas
              
 
                -//                    fullPicCtl.showNomark = true
              
 
                -//                    fullPicCtl.currentPhotoIndex = weakself.currentPhotoIndex
              
 
                -//                    weakself.navigationController?.pushViewController(fullPicCtl, animated: true)
              
 
                -//                } else {
              
 
                -//                    weakself.shuiyinImage.isHidden = true
              
 
                -//                    weakself.shuiyinLabel.text = "￥\((weakself.detailPageViewModel.watermarkPrice/100))"
              
 
                -//                }
              
 
                -//            }
              
 
                -//        })
              
 
                +    
              
 
                +    @IBAction func enterGroup(_ sender: UITapGestureRecognizer) {
              
 
                +        self.viewModel.navigateToGroup()
              
 
                     }
              
 
                +}
              
 
                 
              
 
                +/// bind storyboard button action
              
 
                +extension PhotoDetailViewController {
              
 
                     @IBAction func share() {
              
 
                         let ctl = UIStoryboard.photoDetail.instantiateController(ShareController.self)
              
 
                         ctl.shareContent = "我使用拍爱分享了一张美图，你也快来试试吧"
              
 
                -        ctl.shareImgUrlThumb = datas[currentPhotoIndex].photo_thumbnail_url
              
 
                -        ctl.shareUrl = datas[currentPhotoIndex].photo_share_url
              
 
                +        //        ctl.shareImgUrlThumb = datas[currentPhotoIndex].photo_thumbnail_url
              
 
                +        //        ctl.shareUrl = datas[currentPhotoIndex].photo_share_url
              
 
                         presentController(ctl)
              
 
                     }
              
 
                -
              
 
                +    
              
 
                     @IBAction func comment() {
              
 
                -        commentView.isHidden = false
              
 
                         commentTextField.becomeFirstResponder()
              
 
                +        
              
 
                     }
              
 
                -
              
 
                +    
              
 
                     @IBAction func sendComment() {
              
 
                -        guard let text = commentTextField.text else {
              
 
                -            return
              
 
                -        }
              
 
                -//        detailPageViewModel.sendComment(content: text, success: { [weak self] in
              
 
                -//            if let weakself = self {
              
 
                -//                weakself.commentTextField.text = ""
              
 
                -//                weakself.commentTextField.resignFirstResponder()
              
 
                -//                weakself.commentView.isHidden = true
              
 
                -//                weakself.refreshUI(index: weakself.currentPhotoIndex)
              
 
                -//            }
              
 
                -//        })
              
 
                +        guard let text = commentTextField.text else { return }
              
 
                +        
              
 
                +        viewModel.submitComment(text: text)
              
 
                +        commentTextField.resignFirstResponder()
              
 
                     }
              
 
                -
              
 
                +    
              
 
                     @IBAction func thumbup() {
              
 
                -//        detailPageViewModel.sendThumbup(success: {[weak self]  in
              
 
                -//            if let weakself = self {
              
 
                -//                weakself.refreshUI(index: weakself.currentPhotoIndex)
              
 
                -//            }
              
 
                -//
              
 
                -//        })
              
 
                +        viewModel.submitThumbup()
              
 
                     }
              
 
                +}
              
 
                 
              
 
                -    // MARK: custom function
              
 
                -    func reloadSection(inter: Int) {
              
 
                -        tableView.beginUpdates()
              
 
                -        let indexSet = IndexSet(integer: inter)
              
 
                -        tableView.reloadSections(indexSet, with: .none)
              
 
                -        tableView.endUpdates()
              
 
                +/// bind rx
              
 
                +extension PhotoDetailViewController {
              
 
                +    
              
 
                +    var commentTableViewDataSource: RxTableViewSectionedAnimatedDataSource<AnimatableSectionModel<Int, PhotoCommentItem>> {
              
 
                +        return RxTableViewSectionedAnimatedDataSource<AnimatableSectionModel<Int, PhotoCommentItem>>(configureCell: { (dataSource, tableView, indexPath, item) in
              
 
                +            let cell = tableView.dequeueReusableCell(withIdentifier: "photoDetailCommentCell", for: indexPath) as! PhotoDetailCommentCell
              
 
                +            cell.setInfo(item)
              
 
                +            return cell
              
 
                +        })
              
 
                     }
              
 
                -
              
 
                -    @objc func showThumps() {
              
 
                -//        if detailPageViewModel.thumbupsCount > 0 {
              
 
                -//            detailPageViewModel.thumbupsCount = 0
              
 
                -//        } else {
              
 
                -//            detailPageViewModel.thumbupsCount = detailPageViewModel.thumbups.count
              
 
                -//        }
              
 
                -        reloadSection(inter: 3)
              
 
                -    }
              
 
                -    @objc func showComments() {
              
 
                -//        if detailPageViewModel.commentsCount > 0 {
              
 
                -//            detailPageViewModel.commentsCount = 0
              
 
                -//        } else {
              
 
                -//            detailPageViewModel.commentsCount = detailPageViewModel.comments.count
              
 
                -//        }
              
 
                -        reloadSection(inter: 4)
              
 
                +    
              
 
                +    var photoCollectionViewDataSource: RxCollectionViewSectionedAnimatedDataSource<AnimatableSectionModel<Int, PhotoItem>> {
              
 
                +        return RxCollectionViewSectionedAnimatedDataSource<AnimatableSectionModel<Int, PhotoItem>>(configureCell: { (dataSource, collectionView, indexPath, item) in
              
 
                +            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "photoDetailImageCell", for: indexPath) as! PhotoDetailImageCell
              
 
                +            cell.imageView.setImage(item.photo_thumbnail2_url, placeholder: UIImage.photoPlaceholder)
              
 
                +            return cell
              
 
                +        })
              
 
                     }
              
 
                -
              
 
                -    @objc func loadReportController() {
              
 
                -//        let ctl = UIStoryboard.photoDetail.instantiateController(ReportController.self)
              
 
                -//        presentController(ctl)
              
 
                +    
              
 
                +    func binding() {
              
 
                +        bindEnterGroupViewHiddenState()
              
 
                +        bindViewModelToGroupName()
              
 
                +        bindViewModelToGroupAvatar()
              
 
                +        
              
 
                +        bindViewModelToUserName()
              
 
                +        bindgingViewModelToUserAvatar()
              
 
                +        
              
 
                +        bindViewModelToThumbupCount()
              
 
                +        bindViewModelToThumbupView()
              
 
                +        
              
 
                +        bindViewModelToCommentCount()
              
 
                +        bindViewModelToCommentTableView()
              
 
                +        
              
 
                +        bindBuyViewIsVisiable()
              
 
                +        
              
 
                +        bindCommentTextFieldToSendBtn()
              
 
                +        
              
 
                +        bindCollectionViewDelegate()
              
 
                +        bindCollectionViewSelected()
              
 
                +        bindCollectionViewToListViewModel()
              
 
                +        bindListViewModelToCollectionView()
              
 
                +        
              
 
                +        bindViewWillAppear()
              
 
                +        
              
 
                +        monitorKeyboardWillShow()
              
 
                +        monitorKeyboardWillHide()
              
 
                     }
              
 
                -
              
 
                -    func returnKeyboarAction(_ notification: Notification, height: CGFloat) {
              
 
                -        guard let info = (notification as NSNotification).userInfo, let duration = info[UIResponder.keyboardAnimationDurationUserInfoKey] as? TimeInterval else {
              
 
                -            return
              
 
                -        }
              
 
                -
              
 
                -        UIView.animate(withDuration: duration, animations: {() -> Void in
              
 
                -                self.commentHeight.constant = height
              
 
                -                self.commentView.superview!.layoutIfNeeded()
              
 
                -        })
              
 
                +    
              
 
                +    func bindEnterGroupViewHiddenState() {
              
 
                +        viewModel.isHiddenEnterGroupBtn.bind(to: enterGroupView.rx.isHidden).disposed(by: disposeBag)
              
 
                     }
              
 
                -
              
 
                -    // MARK: deinit
              
 
                -    deinit {
              
 
                -        NotificationCenter.default.removeObserver(self)
              
 
                +    
              
 
                +    func bindViewModelToGroupName() {
              
 
                +        viewModel.groupName.bind(to: groupName.rx.text).disposed(by: disposeBag)
              
 
                     }
              
 
                -
              
 
                -}
              
 
                -
              
 
                -// MARK: custom delegate function
              
 
                -extension PhotoDetailViewController: CellDelegate {
              
 
                -    func selectIndex(indexpath: IndexPath) {
              
 
                -        let ctl = UIStoryboard.photoDetail.instantiateController(ShowFullPicController.self)
              
 
                -        ctl.datas = datas
              
 
                -        ctl.currentPhotoIndex = currentPhotoIndex
              
 
                -        show(ctl, sender: nil)
              
 
                +    
              
 
                +    func bindViewModelToGroupAvatar() {
              
 
                +        viewModel.groupAvatar
              
 
                +            .subscribe(onNext: {[weak self] (avatar) in
              
 
                +            guard let `self` = self else { return }
              
 
                +            self.groupAvatar.setImage(avatar)
              
 
                +        }).disposed(by: disposeBag)
              
 
                     }
              
 
                -
              
 
                -    func returnCurrentIndex(index: Int) {
              
 
                -        refreshUI(index: index)
              
 
                +    
              
 
                +    func bindgingViewModelToUserAvatar() {
              
 
                +        viewModel.userAvatar
              
 
                +            .subscribe(onNext: {[weak self] (avatar) in
              
 
                +                guard let `self` = self else { return }
              
 
                +                self.userAvatar.setImage(avatar)
              
 
                +            }).disposed(by: disposeBag)
              
 
                     }
              
 
                -
              
 
                -    func pushNext() {
              
 
                -        let ctl = UIStoryboard.main.instantiateController(GroupViewController.self)
              
 
                -
              
 
                -//        ctl.groupModel = GroupModel(map: Map(mappingType: .fromJSON, JSON: datas[currentPhotoIndex].toJSON()))
              
 
                -        show(ctl, sender: nil)
              
 
                +    
              
 
                +    func bindViewModelToUserName() {
              
 
                +        viewModel.groupName.bind(to: userName.rx.text).disposed(by: disposeBag)
              
 
                     }
              
 
                -}
              
 
                -
              
 
                -//MARK textField delegate
              
 
                -extension PhotoDetailViewController: UIGestureRecognizerDelegate {
              
 
                -    // MARK: textField
              
 
                -
              
 
                -    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
              
 
                -        return commentTextField.isFirstResponder
              
 
                +    
              
 
                +    func bindViewModelToPhotoTime() {
              
 
                +        viewModel.photoTime.bind(to: photoTime.rx.text).disposed(by: disposeBag)
              
 
                     }
              
 
                -
              
 
                -    @IBAction func ReturnKeyboard(_ sender: UITapGestureRecognizer) {
              
 
                -        if !commentView.isHidden {
              
 
                -            commentTextField.resignFirstResponder()
              
 
                -            commentView.isHidden = true
              
 
                -        }
              
 
                +    
              
 
                +    func bindViewModelToThumbupCount() {
              
 
                +        viewModel.thumbupCount.bind(to: thumbupCount.rx.text).disposed(by: disposeBag)
              
 
                     }
              
 
                -
              
 
                -}
              
 
                -
              
 
                -// MARK: UITableView delegate
              
 
                -extension PhotoDetailViewController: UITableViewDataSource, UITableViewDelegate {
              
 
                -
              
 
                -    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
              
 
                -        if section == 3 {
              
 
                -            let cell = tableView.dequeueReusableCell(withIdentifier: "thumbupHeadCell")
              
 
                -            if let label = cell?.viewWithTag(1001) as? UILabel {
              
 
                -//                label.text = "(\(detailPageViewModel.thumbups.count))"
              
 
                -            }
              
 
                -            if let button = cell?.viewWithTag(1011) as? UIButton {
              
 
                -                button.addTarget(self, action: #selector(showThumps), for: .touchUpInside)
              
 
                -            }
              
 
                -            if let imageView = cell?.viewWithTag(1008) as? UIImageView {
              
 
                -//                let imageName = detailPageViewModel.thumbupsCount <= 0 ? "收起" : "list-arrow"
              
 
                -//                imageView.image = UIImage(named : imageName)
              
 
                -            }
              
 
                -            return cell?.contentView
              
 
                -        } else if section == 4 {
              
 
                -            let cell = tableView.dequeueReusableCell(withIdentifier: "comentHeadCell")
              
 
                -            if let label = cell?.viewWithTag(1002) as? UILabel {
              
 
                -//                label.text = "(\(detailPageViewModel.comments.count))"
              
 
                -            }
              
 
                -            if let button = cell?.viewWithTag(1012) as? UIButton {
              
 
                -                button.addTarget(self, action: #selector(showComments), for: .touchUpInside)
              
 
                -            }
              
 
                -            if let imageView = cell?.viewWithTag(1009) as? UIImageView {
              
 
                -//                let imageName = detailPageViewModel.commentsCount <= 0 ? "收起" : "list-arrow"
              
 
                -//                imageView.image = UIImage(named : imageName)
              
 
                -            }
              
 
                -            return cell?.contentView
              
 
                -        }
              
 
                -        return nil
              
 
                +    
              
 
                +    func bindViewModelToThumbupView() {
              
 
                +        viewModel.thumbupItems
              
 
                +            .asDriver(onErrorJustReturn: [])
              
 
                +            .drive(onNext: { [weak self] (items) in
              
 
                +                self?.setupThumbupView(items: items)
              
 
                +            }).disposed(by: disposeBag)
              
 
                     }
              
 
                -
              
 
                -    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
              
 
                -        if section == 3 || section == 4 {
              
 
                -            return 44
              
 
                -        }
              
 
                -        return 0
              
 
                +    
              
 
                +    func bindViewModelToCommentCount() {
              
 
                +        viewModel.commentCount.bind(to: commentCount.rx.text).disposed(by: disposeBag)
              
 
                     }
              
 
                -
              
 
                -    func numberOfSections(in tableView: UITableView) -> Int {
              
 
                -        return 0
              
 
                +    
              
 
                +    func bindViewModelToCommentTableView() {
              
 
                +        viewModel.commentItems
              
 
                +            .bind(to: commentTableView.rx.items(dataSource: commentTableViewDataSource))
              
 
                +            .disposed(by: disposeBag)
              
 
                     }
              
 
                -
              
 
                -    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
              
 
                -//        if section == 3 {
              
 
                -//            return detailPageViewModel.thumbupsCount > 0 ? 1 : 0
              
 
                -//        } else if section == 4 {
              
 
                -//            return detailPageViewModel.commentsCount
              
 
                -//        }
              
 
                -        return 0
              
 
                +    
              
 
                +    func bindBuyViewIsVisiable() {
              
 
                +        viewModel.canBuy.map { !$0 }.bind(to: buyView.rx.isHidden).disposed(by: disposeBag)
              
 
                     }
              
 
                -
              
 
                -    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
              
 
                -        if indexPath.section == 0 {
              
 
                -            let cell = tableView.dequeueReusableCell(withIdentifier: "headCell", for: indexPath) as! DetailPageHeadCell
              
 
                -            cell.enterView.isHidden = isHiddenEnterView
              
 
                -//            cell.setInfo(datas[currentPhotoIndex])
              
 
                -            cell.delegate = self
              
 
                -            if let reportBtn = cell.viewWithTag(40001) as? UIButton {
              
 
                -
              
 
                -                reportBtn.addTarget(self, action: #selector(loadReportController), for: .touchUpInside)
              
 
                -//                reportBtn.isHidden = !(UserDefaults.Account.bool(forKey: .isAudit))
              
 
                -            }
              
 
                -            return cell
              
 
                -        } else if indexPath.section == 1 {
              
 
                -            let cell = tableView.dequeueReusableCell(withIdentifier: "detailPagePhotoCell", for: indexPath) as! DetailPagePhotoCell
              
 
                -//            cell.datas = datas
              
 
                -//            cell.currentPhotoIndex = currentPhotoIndex
              
 
                -            cell.delegate = self
              
 
                -            cell.first = true
              
 
                -            cell.collectionView.reloadData()
              
 
                -            return cell
              
 
                -        } else if indexPath.section == 2 {
              
 
                -            let cell = tableView.dequeueReusableCell(withIdentifier: "nameCell", for: indexPath) as! DetailPageNameCell
              
 
                -//            cell.setInfo(datas[currentPhotoIndex])
              
 
                -            return cell
              
 
                -        } else if indexPath.section == 3 {
              
 
                -            let cell = tableView.dequeueReusableCell(withIdentifier: "thumbupCell", for: indexPath) as! DetailthumbupImagesCell
              
 
                -//            if detailPageViewModel.thumbups.count > 0 {
              
 
                -//                let headers = detailPageViewModel.thumbups.map {$0.avatar}
              
 
                -//                cell.setInfo(content: headers)
              
 
                -//            }
              
 
                -            return cell
              
 
                -        } else {
              
 
                -            let cell = tableView.dequeueReusableCell(withIdentifier: "comentCell", for: indexPath) as! DetailCommentCell
              
 
                -//            cell.setInfo(detailPageViewModel.comments[indexPath.row])
              
 
                -            return cell
              
 
                -        }
              
 
                +    
              
 
                +    func bindCommentTextFieldToSendBtn() {
              
 
                +        commentTextField.rx.text
              
 
                +            .map { !($0?.isEmpty)! }
              
 
                +            .bind(to: sendBtn.rx.isEnabled)
              
 
                +            .disposed(by: disposeBag)
              
 
                +    }
              
 
                +    
              
 
                +    func bindCollectionViewDelegate() {
              
 
                +        photoCollectionView.rx.setDelegate(self).disposed(by: disposeBag)
              
 
                +        
              
 
                +    }
              
 
                +    
              
 
                +    func bindListViewModelToCollectionView() {
              
 
                +        listViewModel.content
              
 
                +            .bind(to: photoCollectionView.rx.items(dataSource: photoCollectionViewDataSource))
              
 
                +            .disposed(by: disposeBag)
              
 
                +    }
              
 
                +    
              
 
                +    func bindCollectionViewToListViewModel() {
              
 
                +        photoCollectionView.rx.willDisplayCell
              
 
                +            .asDriver()
              
 
                +            .drive(onNext: { [unowned self] in
              
 
                +                self.listViewModel.willShow(index: $0.at.row)
              
 
                +            })
              
 
                +            .disposed(by: disposeBag)
              
 
                +    }
              
 
                +    
              
 
                +    func bindCollectionViewSelected() {
              
 
                +        photoCollectionView.rx.itemSelected
              
 
                +            .asDriver(onErrorJustReturn: IndexPath(item: 0, section: 0))
              
 
                +            .drive(onNext: { [unowned self] _ in self.listViewModel.didSelected() })
              
 
                +            .disposed(by: disposeBag)
              
 
                +    }
              
 
                +    
              
 
                +    func bindViewWillAppear() {
              
 
                +        viewModel.viewWillAppear
              
 
                +            .asDriver()
              
 
                +            .drive(onNext: { [unowned self] _ in
              
 
                +                self.photoCollectionView.scrollToItem(at: IndexPath(item: self.listViewModel.currIndex, section: 0), at: .right, animated: false)
              
 
                +            })
              
 
                +            .disposed(by: disposeBag)
              
 
                     }
              
 
                +    
              
 
                +    func monitorKeyboardWillShow() {
              
 
                +        NotificationCenter.default.rx
              
 
                +            .notification(UIResponder.keyboardWillShowNotification)
              
 
                +            .takeUntil(self.rx.deallocated)
              
 
                +            .subscribe { [unowned self] notification in
              
 
                +                guard let userInfo = notification.element?.userInfo,
              
 
                +                    let keyboardFrame = userInfo[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect,
              
 
                +                    let timeInterval = userInfo[UIResponder.keyboardAnimationDurationUserInfoKey] as? TimeInterval,
              
 
                +                    let curve = userInfo[UIResponder.keyboardAnimationCurveUserInfoKey] as? Int
              
 
                +                    else { return }
              
 
                +                UIView.setAnimationCurve(UIView.AnimationCurve(rawValue: curve) ?? .linear)
              
 
                +                UIView.animate(withDuration: timeInterval, animations: {
              
 
                +                    self.commentEditYConstraint.constant = keyboardFrame.height
              
 
                +                    self.view.layoutIfNeeded()
              
 
                +                })
              
 
                +        }.disposed(by: disposeBag)
              
 
                +    }
              
 
                +    
              
 
                +    func monitorKeyboardWillHide() {
              
 
                +        NotificationCenter.default.rx
              
 
                +            .notification(UIResponder.keyboardWillHideNotification)
              
 
                +            .takeUntil(self.rx.deallocated)
              
 
                +            .subscribe { [unowned self] notification in
              
 
                +                guard let userInfo = notification.element?.userInfo,
              
 
                +                    let timeInterval = userInfo[UIResponder.keyboardAnimationDurationUserInfoKey] as? TimeInterval,
              
 
                +                    let curve = userInfo[UIResponder.keyboardAnimationCurveUserInfoKey] as? Int
              
 
                +                    else { return }
              
 
                +                UIView.setAnimationCurve(UIView.AnimationCurve(rawValue: curve) ?? .linear)
              
 
                +                UIView.animate(withDuration: timeInterval, animations: {
              
 
                +                    self.commentEditYConstraint.constant = -56
              
 
                +                    self.view.layoutIfNeeded()
              
 
                +                })
              
 
                +                self.commentTextField.clear()
              
 
                +        }.disposed(by: disposeBag)
              
 
                +    }
              
 
                +}
              
 
                 
              
 
                -    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
              
 
                -        if indexPath.section == 0 {
              
 
                -            return 48
              
 
                -        } else if indexPath.section == 1 {
              
 
                -            return 360
              
 
                -        } else if indexPath.section == 2 {
              
 
                -            return 36
              
 
                -        } else if indexPath.section == 3 {
              
 
                -            return 40
              
 
                -        } else {
              
 
                -//            return 40 + detailPageViewModel.comments[indexPath.row].cellHeigth
              
 
                -            return 40
              
 
                +extension PhotoDetailViewController {
              
 
                +    func setupThumbupView(items: [PhotoThumbupUserItem]) {
              
 
                +        thumbupView.subviews.forEach { $0.removeFromSuperview() }
              
 
                +        
              
 
                +        let row = (Int(kScreenWidth) - 6) / 34
              
 
                +        var topConstraint: CGFloat = 6
              
 
                +        var last: UIImageView?
              
 
                +        
              
 
                +        for (index, item) in items.enumerated() {
              
 
                +            let imageView = UIImageView()
              
 
                +            imageView.cornerRadius = 5
              
 
                +            imageView.translatesAutoresizingMaskIntoConstraints = false
              
 
                +            imageView.setImage(item.avatar, placeholder: UIImage.defaultAvatar)
              
 
                +            thumbupView.addSubview(imageView)
              
 
                +            
              
 
                +            if index % row == 0 && index != 0 {
              
 
                +                topConstraint += 28 + 6
              
 
                +                last = nil
              
 
                +            }
              
 
                +            
              
 
                +            NSLayoutConstraint.activate([
              
 
                +                imageView.widthAnchor.constraint(equalToConstant: 28),
              
 
                +                imageView.heightAnchor.constraint(equalToConstant: 28),
              
 
                +                imageView.topAnchor.constraint(equalTo: thumbupView.topAnchor, constant: topConstraint),
              
 
                +                imageView.leadingAnchor.constraint(equalTo: last?.trailingAnchor ?? thumbupView.leadingAnchor, constant: 6)
              
 
                +                ])
              
 
                +            
              
 
                +            last = imageView
              
 
                         }
              
 
                +        thumbupViewHeightConstraint.constant = items.isEmpty ? 1 : topConstraint + 34
              
 
                +        commentTableView.tableHeaderView?.height = 532 + thumbupViewHeightConstraint.constant
              
 
                     }
              
 
                 }
              
 
                 
              
 
                -extension PhotoDetailViewController {
              
 
                +extension PhotoDetailViewController: UICollectionViewDelegateFlowLayout {
              
 
                +    func collectionView(_ collectionView: UICollectionView,
              
 
                +                        layout collectionViewLayout: UICollectionViewLayout,
              
 
                +                        sizeForItemAt indexPath: IndexPath) -> CGSize {
              
 
                +        return CGSize(width: kScreenWidth, height: 359)
              
 
                +    }
              
 
                     
              
 
                +    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat {
              
 
                +        return 0
              
 
                +    }
              
 
                 }
              
 
                +
              
 
                +extension PhotoDetailViewController: NavigationBackViewController {}
              
--- a/PaiAi/Paiai_iOS/App/PhotoDetail/PhotoPreviewViewController.swift
+++ b/PaiAi/Paiai_iOS/App/PhotoDetail/PhotoPreviewViewController.swift
@@ -1,5 +1,5 @@
 
                 //
              
 
                -//  ShowFullPicController.swift
              
 
                +//  PhotoPreviewViewController.swift
              
 
                 //  PaiAi
              
 
                 //
              
 
                 //  Created by zhengjianfei on 16/4/9.
              
@@ -9,49 +9,104 @@
 
                 import UIKit
              
 
                 import PaiaiDataKit
              
 
                 import PaiaiUIKit
              
 
                +import RxCocoa
              
 
                +import RxSwift
              
 
                +import RxDataSources
              
 
                 
              
 
                -final class ShowFullPicController: UIViewController {
              
 
                +final class PhotoPreviewViewController: UIViewController {
              
 
                 
              
 
                -    // MARK: Storyboard property
              
 
                +    /// MARK: Storyboard property
              
 
                     @IBOutlet weak var collectionView: UICollectionView!
              
 
                -//    @IBOutlet weak var progressView: FFProgress!
              
 
                -   // MARK: parameter property
              
 
                -    lazy var datas = [PhotoItem]()
              
 
                -    lazy var currentPhotoIndex = 0
              
 
                -    lazy var firstLayout = true
              
 
                -    lazy var currentPageIndex = 0
              
 
                -    lazy var showNomark = false
              
 
                -    lazy var showHD = false
              
 
                -
              
 
                -    var shufflingImage = [String]()
              
 
                -
              
 
                -    // MARK: Controller fucntion
              
 
                +    var viewModel: PhotoDetailListViewModel!
              
 
                +    var disposeBag = DisposeBag()
              
 
                +    
              
 
                +    override var prefersStatusBarHidden: Bool {
              
 
                +        return true
              
 
                +    }
              
 
                +    
              
 
                     override func viewDidLoad() {
              
 
                         super.viewDidLoad()
              
 
                -        navigationController?.isNavigationBarHidden = true
              
 
                -//        titleWithbackBar = ""
              
 
                -
              
 
                -     }
              
 
                -
              
 
                -    override func viewDidLayoutSubviews() {
              
 
                -        if firstLayout {
              
 
                -            collectionView.contentOffset = CGPoint(x: (CGFloat(currentPhotoIndex) * (collectionView.width)), y: 0)
              
 
                -            firstLayout = false
              
 
                +        binding()
              
 
                +        scrollToSpecifiedImage()
              
 
                +        navigationController?.setNavigationBarHidden(true, animated: true)
              
 
                +        
              
 
                +    }
              
 
                +    
              
 
                +    func scrollToSpecifiedImage() {
              
 
                +        collectionView.layoutIfNeeded()
              
 
                +        collectionView.scrollToItem(at: IndexPath(item: viewModel.currIndex, section: 0), at: .right, animated: false)
              
 
                +    }
              
 
                +    
              
 
                +    override func viewDidAppear(_ animated: Bool) {
              
 
                +        super.viewWillAppear(animated)
              
 
                +        bindCollectionViewToViewModel()
              
 
                +    }
              
 
                +    
              
 
                +    override func viewWillDisappear(_ animated: Bool) {
              
 
                +        super.viewWillDisappear(animated)
              
 
                +        navigationController?.setNavigationBarHidden(false, animated: true)
              
 
                +    }
              
 
                +    
              
 
                +    @IBAction func download(_ sender: UIButton) {
              
 
                +        guard let cell = collectionView.cellForItem(at: IndexPath(item: viewModel.currIndex, section: 0)) as? ImageCell,
              
 
                +            let image = cell.photoImage.image else {
              
 
                +                //            FFToastView.showToast(inView: view, withText: "未检测到图片")
              
 
                +                return
              
 
                         }
              
 
                -        super.viewDidLayoutSubviews()
              
 
                +        
              
 
                +        UIImageWriteToSavedPhotosAlbum(image, self, #selector(image(_:didFinishSavingWithError:contextInfo:)), nil)
              
 
                     }
              
 
                +    
              
 
                +    @objc func image(_ image: UIImage?, didFinishSavingWithError error: NSError?, contextInfo info: UnsafeMutableRawPointer) {
              
 
                +        if error != nil {
              
 
                +            //            FFToastView.showToast(inView: view, withText: "保存图片失败")
              
 
                +        } else {
              
 
                +            //            FFToastView.showImageToast(inView: view, withText: "已保存图片到相册", withImage: "提示弹窗-勾")
              
 
                +        }
              
 
                +    }
              
 
                +}
              
 
                +
              
 
                +/// binding
              
 
                +extension PhotoPreviewViewController {
              
 
                +    
              
 
                +    var dataSource: RxCollectionViewSectionedAnimatedDataSource<AnimatableSectionModel<Int, PhotoItem>> {
              
 
                +        return RxCollectionViewSectionedAnimatedDataSource<AnimatableSectionModel<Int, PhotoItem>>(configureCell: { (dataSource, collectionView, indexPath, item) in
              
 
                +            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "imageCell", for: indexPath) as! ImageCell
              
 
                +            cell.setModel(url: item.murl.isEmpty ? item.photo_url : item.murl)
              
 
                +            return cell
              
 
                +        })
              
 
                +    }
              
 
                +    
              
 
                +    func binding() {
              
 
                +        bindViewModelToCollectionView()
              
 
                +        bindCollectionViewDelegate()
              
 
                +    }
              
 
                +    
              
 
                +    func bindViewModelToCollectionView() {
              
 
                +        viewModel.content
              
 
                +            .bind(to: collectionView.rx.items(dataSource: dataSource))
              
 
                +            .disposed(by: disposeBag)
              
 
                +    }
              
 
                +    
              
 
                +    func bindCollectionViewDelegate() {
              
 
                +        collectionView.rx.setDelegate(self).disposed(by: disposeBag)
              
 
                +    }
              
 
                +    
              
 
                +    func bindCollectionViewToViewModel() {
              
 
                +        collectionView.rx.willDisplayCell
              
 
                +            .asDriver()
              
 
                +            .drive(onNext: { [unowned self] in self.viewModel.willShow(index: $0.at.row) })
              
 
                +            .disposed(by: disposeBag)
              
 
                +    }
              
 
                +}
              
 
                 
              
 
                -    // MARK: Storyboard  button function
              
 
                +/// storyboard button action
              
 
                +extension PhotoPreviewViewController {
              
 
                     @IBAction  func back() {
              
 
                -         _ = navigationController?.popViewController(animated: true)
              
 
                -        guard let ctl = navigationController?.viewControllers.last as? PhotoDetailViewController else {
              
 
                -            return
              
 
                -        }
              
 
                -//        ctl.currentPhotoIndex = currentPageIndex
              
 
                -//        ctl.tableView.reloadData()
              
 
                +        navigationController?.popViewController(animated: true)
              
 
                     }
              
 
                     @IBAction func rotateTheImage(_ sender: UIButton) {
              
 
                -        guard let cell = collectionView.cellForItem(at: IndexPath(item: currentPageIndex, section: 0)) as? ImageCell else {
              
 
                +        guard let cell = collectionView.cellForItem(at: IndexPath(item: viewModel.currIndex, section: 0)) as? ImageCell else {
              
 
                             return
              
 
                         }
              
 
                         UIView.beginAnimations("image.rotate", context: nil)
              
@@ -71,54 +126,14 @@ final class ShowFullPicController: UIViewController {
 
                             }
              
 
                         }
              
 
                     }
              
 
                +    
              
 
                 
              
 
                -    @IBAction func load() {
              
 
                -        guard let cell = collectionView.cellForItem(at: IndexPath(item: currentPageIndex, section: 0)) as? ImageCell else {
              
 
                -//            FFToastView.showToast(inView: view, withText: "未检测到图片")
              
 
                -            return
              
 
                -        }
              
 
                -        guard let image = cell.photoImage.image else {
              
 
                -//            FFToastView.showToast(inView: view, withText: "未检测到图片")
              
 
                -            return
              
 
                -        }
              
 
                -        UIImageWriteToSavedPhotosAlbum(image, self, #selector(image(_:didFinishSavingWithError:contextInfo:)), nil)
              
 
                -    }
              
 
                -
              
 
                -    @objc func image(_ image: UIImage?, didFinishSavingWithError error: NSError?, contextInfo info: UnsafeMutableRawPointer) {
              
 
                -        if error != nil {
              
 
                -//            FFToastView.showToast(inView: view, withText: "保存图片失败")
              
 
                -        } else {
              
 
                -//            FFToastView.showImageToast(inView: view, withText: "已保存图片到相册", withImage: "提示弹窗-勾")
              
 
                -        }
              
 
                -
              
 
                -    }
              
 
                 }
              
 
                 
              
 
                 // MARK: UICollectionView delegate
              
 
                -extension ShowFullPicController: UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
              
 
                -
              
 
                -    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
              
 
                -        return shufflingImage.count > datas.count ? shufflingImage.count : datas.count
              
 
                -    }
              
 
                -
              
 
                -    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
              
 
                -        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "imageCell", for: indexPath) as! ImageCell
              
 
                -        if shufflingImage.count <= 0 {
              
 
                -            let data = datas[indexPath.item]
              
 
                -            let urlStr = data.murl.isEmpty ? data.photo_url : data.murl
              
 
                -            cell.setModel(url: urlStr)
              
 
                -        } else {
              
 
                -            cell.setModel(url: shufflingImage[indexPath.row])
              
 
                -        }
              
 
                -        return cell
              
 
                -    }
              
 
                +extension PhotoPreviewViewController: UICollectionViewDelegateFlowLayout {
              
 
                 
              
 
                     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
              
 
                         return CGSize(width: collectionView.width, height: collectionView.height - 20)
              
 
                     }
              
 
                -
              
 
                -    func scrollViewDidScroll(_ scrollView: UIScrollView) {
              
 
                -        let page = Int(scrollView.contentOffset.x / (collectionView.width))
              
 
                -        currentPageIndex = page
              
 
                -    }
              
 
                 }
              
--- a/PaiAi/Paiai_iOS/App/PhotoDetail/ShareView.swift
+++ b/PaiAi/Paiai_iOS/App/PhotoDetail/ShareView.swift
@@ -9,13 +9,21 @@
 
                 import UIKit
              
 
                 
              
 
                 class ShareView: UIView {
              
 
                +    
              
 
                +}
              
 
                +
              
 
                 
              
 
                -    /*
              
 
                -    // Only override draw() if you perform custom drawing.
              
 
                -    // An empty implementation adversely affects performance during animation.
              
 
                -    override func draw(_ rect: CGRect) {
              
 
                -        // Drawing code
              
 
                -    }
              
 
                -    */
              
 
                 
              
 
                +extension ShareView {
              
 
                +    
              
 
                +    func activateConstraints() {
              
 
                +        
              
 
                +    }
              
 
                +    
              
 
                +    func activateConstraintsShareView() {
              
 
                +        guard let superView = superview else { return }
              
 
                +        
              
 
                +        self.translatesAutoresizingMaskIntoConstraints = false
              
 
                +        
              
 
                +    }
              
 
                 }
              
--- a/PaiAi/launch_multiple_simulators.sh
+++ b/PaiAi/launch_multiple_simulators.sh
@@ -1,15 +0,0 @@
 
                -#!/bin/bash
              
 
                -
              
 
                -xcrun simctl shutdown all
              
 
                -
              
 
                -path=$(find ~/Library/Developer/Xcode/DerivedData/Paiai-*/Build/Products/Debug-iphonesimulator -name "Paiai.app" | head -n 1)
              
 
                -echo "${path}"
              
 
                -
              
 
                -filename=MultiSimConfig.txt
              
 
                -grep -v '^#' $filename | while read -r line
              
 
                -do
              
 
                -  echo $line
              
 
                -  xcrun instruments -w "$line"
              
 
                -  xcrun simctl install booted $path
              
 
                -  xcrun simctl launch booted com.Paiai.Paiai
              
 
                -done
Autor	SHA1	Wiadomość	Data
Brightcells	157367103c	Add WATERMARK_OR_NOT to make watermark invocation or not	8 lat temu
Brightcells	57206d9cbd	Fix Bug: change default ext from 'jpeg' to '.jpeg'	8 lat temu
Brightcells	e37b46a428	Fix Bug: thumbnail2 have watermark just for lensman	8 lat temu
Brightcells	680f424408	Update water mark	8 lat temu
Brightcells	d824fbd441	Add photo_md5 for GroupPhotoInfo	8 lat temu
Brightcells	d06c19c1d5	Fix Bug: photo_watermark_path	8 lat temu
Brightcells	435363c27a	file md5 error	8 lat temu
Brightcells	90fd7187d8	file md5	8 lat temu
Brightcells	ae70dce3ef	file md5	8 lat temu
Brightcells	6e308e93b4	file md5	8 lat temu
Brightcells	25b296f848	Add attentions/schedules for GroupInfo	8 lat temu