Browse Source

发布完成引导

Chris 5 years ago
parent
commit
86fe408d5f
13 changed files with 295 additions and 1 deletions
  1. 16 0
      RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj
  2. 2 1
      RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/Controller/PublishAddTopicController.swift
  3. 147 0
      RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishSuccess/PublishShareBottomView.swift
  4. 64 0
      RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishSuccess/PublishSuccessController.swift
  5. 22 0
      RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_download.imageset/Contents.json
  6. BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_download.imageset/edit_pic_download@2x.png
  7. BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_download.imageset/edit_pic_download@3x.png
  8. 22 0
      RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_moments.imageset/Contents.json
  9. BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_moments.imageset/edit_pic_moments@2x.png
  10. BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_moments.imageset/edit_pic_moments@3x.png
  11. 22 0
      RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_wechat.imageset/Contents.json
  12. BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_wechat.imageset/edit_pic_wechat@2x.png
  13. BIN
      RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_wechat.imageset/edit_pic_wechat@3x.png

+ 16 - 0
RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -447,6 +447,8 @@
 		BD28079722B791AF002AB976 /* PublishTopicItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28079622B791AF002AB976 /* PublishTopicItemCell.swift */; };
 		BD28079922B79A58002AB976 /* PublishTopicHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28079822B79A58002AB976 /* PublishTopicHeaderView.swift */; };
 		BD28079B22B79BAB002AB976 /* PublishSelTopicCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28079A22B79BAB002AB976 /* PublishSelTopicCollectionCell.swift */; };
+		BD28079E22B7AC2C002AB976 /* PublishSuccessController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28079D22B7AC2C002AB976 /* PublishSuccessController.swift */; };
+		BD2807A022B7AD76002AB976 /* PublishShareBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28079F22B7AD76002AB976 /* PublishShareBottomView.swift */; };
 		BD29A92E228F99780018CFC3 /* OrderCommentParameterModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD29A92D228F99780018CFC3 /* OrderCommentParameterModel.swift */; };
 		BD2FCBE222B21CF70006D974 /* CommunityRecommendController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD2FCBE122B21CF70006D974 /* CommunityRecommendController.swift */; };
 		BD2FCBE422B244250006D974 /* RecommendDetailContentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD2FCBE322B244250006D974 /* RecommendDetailContentCell.swift */; };
@@ -989,6 +991,8 @@
 		BD28079622B791AF002AB976 /* PublishTopicItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishTopicItemCell.swift; sourceTree = "<group>"; };
 		BD28079822B79A58002AB976 /* PublishTopicHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishTopicHeaderView.swift; sourceTree = "<group>"; };
 		BD28079A22B79BAB002AB976 /* PublishSelTopicCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishSelTopicCollectionCell.swift; sourceTree = "<group>"; };
+		BD28079D22B7AC2C002AB976 /* PublishSuccessController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishSuccessController.swift; sourceTree = "<group>"; };
+		BD28079F22B7AD76002AB976 /* PublishShareBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishShareBottomView.swift; sourceTree = "<group>"; };
 		BD29A92D228F99780018CFC3 /* OrderCommentParameterModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCommentParameterModel.swift; sourceTree = "<group>"; };
 		BD2FCBE122B21CF70006D974 /* CommunityRecommendController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityRecommendController.swift; sourceTree = "<group>"; };
 		BD2FCBE322B244250006D974 /* RecommendDetailContentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendDetailContentCell.swift; sourceTree = "<group>"; };
@@ -3488,6 +3492,7 @@
 				BD28077422B72175002AB976 /* PublishEditController */,
 				BD28078722B769E8002AB976 /* PublishAddTopic */,
 				BD28078922B76A30002AB976 /* PublishAddAddress */,
+				BD28079C22B7AC12002AB976 /* PublishSuccess */,
 			);
 			path = PublishModule;
 			sourceTree = "<group>";
@@ -3711,6 +3716,15 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		BD28079C22B7AC12002AB976 /* PublishSuccess */ = {
+			isa = PBXGroup;
+			children = (
+				BD28079D22B7AC2C002AB976 /* PublishSuccessController.swift */,
+				BD28079F22B7AD76002AB976 /* PublishShareBottomView.swift */,
+			);
+			path = PublishSuccess;
+			sourceTree = "<group>";
+		};
 		BD2FCBDE22B21BE00006D974 /* CommunityRecommendDetail */ = {
 			isa = PBXGroup;
 			children = (
@@ -4247,6 +4261,7 @@
 				BD12B68122B4EF2600AEB10B /* KSMediaPickerViewVideoCell.swift in Sources */,
 				A7284A75225465DD000BAEC4 /* SwiftMoyaNetWorkServicePay.swift in Sources */,
 				A77F2CC722320627001BD3F6 /* WRNavigationBar.swift in Sources */,
+				BD28079E22B7AC2C002AB976 /* PublishSuccessController.swift in Sources */,
 				A7274C5E228EE636000E3A07 /* LBXPermissions.swift in Sources */,
 				A7D46092227619CD00A5A54E /* BaiduToCityFactory.swift in Sources */,
 				A71AA51C227219EF008FF1A5 /* EditExpressAddressView.swift in Sources */,
@@ -4421,6 +4436,7 @@
 				A775CC00223774A300EBDCF8 /* ShoppingMallView.swift in Sources */,
 				A7FF1555228AC27600A85748 /* ProductAllCommentView.swift in Sources */,
 				A7CC7526227196A8003C4F38 /* AccountSecurityTableViewCell.swift in Sources */,
+				BD2807A022B7AD76002AB976 /* PublishShareBottomView.swift in Sources */,
 				A7CC74F122706FE3003C4F38 /* MessageOneCollectionViewCell.swift in Sources */,
 				BDF47D80228288F900941AB9 /* ShoppingCartAccountView.swift in Sources */,
 				A7284401224DBB7700F82F30 /* SwiftMoyaNetWorkServiceUser.swift in Sources */,

+ 2 - 1
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/Controller/PublishAddTopicController.swift

@@ -26,7 +26,8 @@ class PublishAddTopicController: BaseViewController {
         navigationBar.wr_setRightButton(title: "完成(x/5)", titleColor: k7AD489Color)
         navigationBar.onClickRightButton = {
             [weak self] in
-            print("----点击了完成")
+            let vc = PublishSuccessController()
+            self?.navigationController?.pushViewController(vc, animated: true)
         }
         
         view.addSubview(tableView)

+ 147 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishSuccess/PublishShareBottomView.swift

@@ -0,0 +1,147 @@
+//
+//  PublishShareBottomView.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+import RxSwift
+import RxCocoa
+
+class PublishShareBottomView: BaseView {
+    
+    override func setupViews() {
+        self.backgroundColor = kffffffColor
+        
+        addSubview(titleLabel)
+        addSubview(wechatBtn)
+        addSubview(friendsBtn)
+        addSubview(saveImgBtn)
+        addSubview(sepView)
+        addSubview(jumpBtn)
+    }
+    
+    override func setupLayouts() {
+        titleLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(24)
+            make.centerX.equalToSuperview()
+            make.height.equalTo(18)
+        }
+        
+        wechatBtn.snp.makeConstraints { (make) in
+            make.top.equalTo(titleLabel.snp_bottom).offset(20)
+            make.centerX.equalTo(friendsBtn.snp_centerX).multipliedBy(0.565)
+            make.width.equalTo(50)
+            make.height.equalTo(69)
+        }
+        wechatBtn.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 4)
+        
+        friendsBtn.snp.makeConstraints { (make) in
+            make.top.equalTo(titleLabel.snp_bottom).offset(20)
+            make.centerX.equalToSuperview()
+            make.width.equalTo(50)
+            make.height.equalTo(69)
+        }
+        friendsBtn.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 4)
+        
+        saveImgBtn.snp.makeConstraints { (make) in
+            make.top.equalTo(titleLabel.snp_bottom).offset(20)
+            make.centerX.equalTo(friendsBtn.snp_centerX).multipliedBy(1.435)
+            make.width.equalTo(50)
+            make.height.equalTo(69)
+        }
+        saveImgBtn.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.top, imageTitleSpace: 4)
+        
+        sepView.snp.makeConstraints { (make) in
+            make.left.right.equalToSuperview()
+            make.height.equalTo(1)
+            make.bottom.equalTo(-44)
+        }
+        
+        jumpBtn.snp.makeConstraints { (make) in
+            make.centerX.equalToSuperview()
+            make.bottom.equalToSuperview()
+            make.width.equalTo(160)
+            make.height.equalTo(44)
+        }
+    }
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "向好友传递美好生活,收货更多彩虹豆"
+        titleLabel.textColor = k333333Color
+        titleLabel.font = kRegularFont16
+        return titleLabel
+    }()
+    
+    private lazy var wechatBtn: UIButton = {
+        let wechatBtn = UIButton(type: UIButton.ButtonType.custom)
+        wechatBtn.setTitle("微信", for: UIControl.State.normal)
+        wechatBtn.setTitleColor(k333333Color, for: UIControl.State.normal)
+        wechatBtn.setImage(kImage(name: "edit_pic_wechat"), for: UIControl.State.normal)
+        wechatBtn.titleLabel?.font = kRegularFont11
+        wechatBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
+//            if let allSelectBlock = self?.allSelectBlock {
+//                let isAllSel: Int = wechatBtn.isSelected == true ? 1 : 0
+//                allSelectBlock(isAllSel)
+//            }
+            print("----点击了-微信")
+        }).disposed(by: disposeBag)
+        return wechatBtn
+    }()
+    
+    private lazy var friendsBtn: UIButton = {
+        let friendsBtn = UIButton(type: UIButton.ButtonType.custom)
+        friendsBtn.setTitle("朋友圈", for: UIControl.State.normal)
+        friendsBtn.setTitleColor(k333333Color, for: UIControl.State.normal)
+        friendsBtn.setImage(kImage(name: "edit_pic_moments"), for: UIControl.State.normal)
+        friendsBtn.titleLabel?.font = kRegularFont11
+        friendsBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
+//            if let allSelectBlock = self?.allSelectBlock {
+//                let isAllSel: Int = wechatBtn.isSelected == true ? 1 : 0
+//                allSelectBlock(isAllSel)
+//            }
+            print("----点击了-朋友圈")
+        }).disposed(by: disposeBag)
+        return friendsBtn
+    }()
+    
+    private lazy var saveImgBtn: UIButton = {
+        let saveImgBtn = UIButton(type: UIButton.ButtonType.custom)
+        saveImgBtn.setTitle("保存图片", for: UIControl.State.normal)
+        saveImgBtn.setTitleColor(k333333Color, for: UIControl.State.normal)
+        saveImgBtn.setImage(kImage(name: "edit_pic_download"), for: UIControl.State.normal)
+        saveImgBtn.titleLabel?.font = kRegularFont11
+        saveImgBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
+//            if let allSelectBlock = self?.allSelectBlock {
+//                let isAllSel: Int = wechatBtn.isSelected == true ? 1 : 0
+//                allSelectBlock(isAllSel)
+//            }
+            print("----点击了-保存图片")
+        }).disposed(by: disposeBag)
+        return saveImgBtn
+    }()
+    
+    private lazy var sepView: UIView = {
+        let sepView = UIView()
+        sepView.backgroundColor = kDDDDDDColor
+        return sepView
+    }()
+    
+    private lazy var jumpBtn: UIButton = {
+        let jumpBtn = UIButton(type: UIButton.ButtonType.custom)
+        jumpBtn.setTitle("去首页", for: UIControl.State.normal)
+        jumpBtn.titleLabel?.font = kRegularFont16
+        jumpBtn.setTitleColor(k333333Color, for: .normal)
+        jumpBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
+//            if let orderPayBlock = self?.orderPayBlock {
+//                orderPayBlock()
+//            }
+            print("----点击了-去首页")
+        }).disposed(by: disposeBag)
+        return jumpBtn
+    }()
+    
+}

+ 64 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishSuccess/PublishSuccessController.swift

@@ -0,0 +1,64 @@
+//
+//  PublishSuccessController.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+import RxSwift
+
+class PublishSuccessController: BaseViewController {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupViews()
+        setupData()
+    }
+    
+    override func setupViews() {
+        self.view.backgroundColor = kffffffColor
+        
+        view.addSubview(shareView)
+        view.addSubview(iconImageView)
+        
+        shareView.snp.makeConstraints { (make) in
+            make.left.right.equalToSuperview()
+            make.bottom.equalTo(-kSafeTabBarHeight)
+            make.height.equalTo(185)
+        }
+        iconImageView.snp.makeConstraints { (make) in
+            make.top.left.right.equalToSuperview()
+            make.bottom.equalTo(shareView.snp_top)
+        }
+    }
+    
+    override func setupLayouts() {
+        
+    }
+    
+    override func setupData() {
+        
+    }
+    
+    lazy var iconImageView: UIImageView = {
+        let iconImageView = UIImageView()
+        iconImageView.image = kImage(name: "pic_example_12")
+        return iconImageView
+    }()
+    
+    lazy var shareView: PublishShareBottomView = {
+        let shareView = PublishShareBottomView()
+        
+//        shareView.orderPayBlock = {
+//            [weak self] in
+//            if let orderPayTransBlock = self?.orderPayTransBlock {
+//                orderPayTransBlock(self!.selModelArr, self!.totalPrice)
+//            }
+//        }
+        
+        return shareView
+    }()
+    
+}

+ 22 - 0
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_download.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "edit_pic_download@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "edit_pic_download@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_download.imageset/edit_pic_download@2x.png


BIN
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_download.imageset/edit_pic_download@3x.png


+ 22 - 0
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_moments.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "edit_pic_moments@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "edit_pic_moments@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_moments.imageset/edit_pic_moments@2x.png


BIN
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_moments.imageset/edit_pic_moments@3x.png


+ 22 - 0
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_wechat.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "edit_pic_wechat@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "edit_pic_wechat@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

BIN
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_wechat.imageset/edit_pic_wechat@2x.png


BIN
RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_pic_wechat.imageset/edit_pic_wechat@3x.png