个人中心搭建完成

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -2471,7 +2471,6 @@
 			children = (
 				A77F2CA42232010F001BD3F6 /* ShoppingMall */,
 				A77F2CB02232010F001BD3F6 /* ShoppingCart */,
-				A7DF50D922A556C300998908 /* BrowsePictures */,
 				A7FF1550228AC22700A85748 /* ProductAllComment */,
 				A70B2C122286B14C00B2449F /* ProductView */,
 				A70B2C112286B10000B2449F /* ProductDetail */,
@@ -2586,6 +2585,7 @@
 		A77F2CBC2232022A001BD3F6 /* Tools */ = {
 			isa = PBXGroup;
 			children = (
+				A7DF50D922A556C300998908 /* BrowsePictures */,
 				A790706222B9DF81008CE279 /* TextLimitTool */,
 				A743229922B8C1440017C367 /* AppStoreReview */,
 				BD1FC19022B1075E00D55081 /* CommentKeyboard */,

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/PersonalCenterView/PersonViewUserAndOtherHeaderView.swift

@@ -158,6 +158,12 @@ class PersonViewUserAndOtherHeaderView: BaseView {
         avatarButton.setBackgroundImage(kImage(name: "defaul_tavatar"), for: UIControl.State.normal)
         avatarButton.cornerRadius = 30
         avatarButton.masksToBounds = true
+        avatarButton.rx.tap.subscribe(onNext: {[weak self] (data) in
+            let currentVC = avatarButton.findViewController() as? BaseViewController
+            let vc = BrowsePicturesViewController.init(images: [avatarButton.currentBackgroundImage!], index: 0)
+            currentVC?.navigationController?.pushViewController(vc, animated: true)
+        }).disposed(by: disposeBag)
+
         return avatarButton
     }()
     

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/ViewController/UserPersonalCenterViewController.swift

@@ -99,10 +99,19 @@ class UserPersonalCenterViewController: BaseViewController {
         self.pagingView.reloadData()
     }
     
+    /// 编辑
+    func pushModifyData() {
+        let vc = ModifyDataViewController()
+        self.navigationController?.pushViewController(vc, animated: true)
+    }
+    
     lazy var avatarButton: UIButton = {
         let avatarButton = UIButton(type: UIButton.ButtonType.custom)
         avatarButton.setImage(kImage(name: "defaul_tavatar"), for: UIControl.State.normal)
         avatarButton.alpha = 0
+        avatarButton.rx.tap.subscribe(onNext: {[weak self] (data) in
+            self?.pushModifyData()
+        }).disposed(by: disposeBag)
         return avatarButton
     }()
     
@@ -112,6 +121,9 @@ class UserPersonalCenterViewController: BaseViewController {
         nameButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
         nameButton.titleLabel?.font = kBoldFont18
         nameButton.alpha = 0
+        nameButton.rx.tap.subscribe(onNext: {[weak self] (data) in
+           self?.pushModifyData()
+        }).disposed(by: disposeBag)
         return nameButton
     }()
     

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductAllComment/ViewController/ProductAllCommentViewController.swift

@@ -49,7 +49,7 @@ class ProductAllCommentViewController: BaseViewController {
         }
         productAllCommentView.didSelectItemAtClosure = {
             [weak self] (images,indexPath) in
-            let vc = BrowsePicturesViewController.init(images: images, index: indexPath.row)
+            let vc = BrowsePicturesViewController.init(imageStrs: images, index: indexPath.row)
             self?.navigationController?.pushViewController(vc, animated: true)
         }
     }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/View/Cell/ProductDetailEvaluation/ProductDetailEvaluationTableViewCell.swift

@@ -170,7 +170,7 @@ extension ProductDetailEvaluationTableViewCell: UICollectionViewDelegateFlowLayo
     }
     
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        let vc = BrowsePicturesViewController.init(images: commentImages, index: indexPath.row)
+        let vc = BrowsePicturesViewController.init(imageStrs: commentImages, index: indexPath.row)
         responderViewController()?.navigationController?.pushViewController(vc, animated: true)
     }
     

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/View/Cell/ProductDetailProductLabel/ProductDetailProductLabelTableViewCell.swift

@@ -78,7 +78,7 @@ class ProductDetailProductLabelTableViewCell: UITableViewCell {
         bgView.rx.tap.subscribe(onNext: {
             [weak self] (data) in
             if !(self?.productDetailModel?.report?.isEmpty ?? true) {
-                let vc = BrowsePicturesViewController.init(images: (self?.productDetailModel?.report)!, index: 0)
+                let vc = BrowsePicturesViewController.init(imageStrs: (self?.productDetailModel?.report)!, index: 0)
                 self?.responderViewController()?.navigationController?.pushViewController(vc, animated: true)
             }
         }).disposed(by: disposeBag)

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/BrowsePictures/ViewController/BrowsePicturesViewController.swift

@@ -10,8 +10,11 @@ import UIKit
 
 class BrowsePicturesViewController: BaseViewController {
     
+    //存储图片Str数组
+    var imageStrs:[String]
+    
     //存储图片数组
-    var images:[String]
+    var images:[UIImage]
     
     //默认显示的图片索引
     var index:Int
@@ -26,7 +29,8 @@ class BrowsePicturesViewController: BaseViewController {
     var pageControl : UIPageControl!
     
     //初始化
-    init(images:[String], index:Int = 0){
+    init(imageStrs:Array<String> = [],images:Array<UIImage> = [], index:Int = 0){
+        self.imageStrs = imageStrs
         self.images = images
         self.index = index
         
@@ -84,7 +88,22 @@ class BrowsePicturesViewController: BaseViewController {
         pageControl = UIPageControl()
         pageControl.center = CGPoint(x: UIScreen.main.bounds.width/2,
                                      y: UIScreen.main.bounds.height - 20 -  kSafeTabBarHeight)
-        pageControl.numberOfPages = images.count
+        if !(imageStrs.isEmpty ){
+             pageControl.numberOfPages = imageStrs.count
+            if imageStrs.count == 1 {
+                pageControl.isHidden = true
+            }else {
+                pageControl.isHidden = true
+            }
+        }
+        if !(images.isEmpty ){
+            pageControl.numberOfPages = images.count
+            if images.count == 1 {
+                pageControl.isHidden = true
+            }else {
+                pageControl.isHidden = true
+            }
+        }
         pageControl.isUserInteractionEnabled = false
         pageControl.currentPage = index
         view.addSubview(self.pageControl)
@@ -132,14 +151,25 @@ UICollectionViewDelegateFlowLayout{
                         cellForItemAt indexPath: IndexPath)
         -> UICollectionViewCell {
             let cell = BrowsePicturesPagerViewCell.cellWith(collectionView: collectionView, indexPath: indexPath)
-            cell.iconImageView.kf.setImage(with: kURLImage(name: images[indexPath.row]), placeholder: kImage(name: ""))
+            if !(imageStrs.isEmpty){
+                cell.iconImageView.kf.setImage(with: kURLImage(name: imageStrs[indexPath.row]), placeholder: kImage(name: ""))
+            }
+            if !(images.isEmpty){
+                cell.iconImageView.image = images[indexPath.row]
+            }
             return cell
     }
     
     //collectionView单元格数量
     func collectionView(_ collectionView: UICollectionView,
                         numberOfItemsInSection section: Int) -> Int {
-        return self.images.count
+        if !(imageStrs.isEmpty){
+            return self.imageStrs.count
+        }
+        if !(images.isEmpty){
+            return self.images.count
+        }
+        return 0
     }
     
     //collectionView单元格尺寸