Merge branch 'release/beta-0.1.0'

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -343,6 +343,9 @@
 		BD20F1D82283D2AA00677D8E /* ShoppingCartModule.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BD20F1D72283D2AA00677D8E /* ShoppingCartModule.xcassets */; };
 		BD29A92E228F99780018CFC3 /* OrderCommentParameterModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD29A92D228F99780018CFC3 /* OrderCommentParameterModel.swift */; };
 		BD3474F522857B85000908C5 /* CommonPayHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD3474F422857B85000908C5 /* CommonPayHeader.swift */; };
+		BD3AA45822AE63EC00EF4F20 /* MessageMainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD3AA45722AE63EC00EF4F20 /* MessageMainViewController.swift */; };
+		BD3AA45B22AE64F000EF4F20 /* MessageMainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD3AA45A22AE64F000EF4F20 /* MessageMainView.swift */; };
+		BD3AA45F22AE6F2500EF4F20 /* MessagePlanetTableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD3AA45E22AE6F2500EF4F20 /* MessagePlanetTableCell.swift */; };
 		BD6EDF48229007EA009A20FE /* OrderApplyRefundModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD6EDF47229007EA009A20FE /* OrderApplyRefundModel.swift */; };
 		BD7AB83622841A8B0030646A /* ShoppingCartPayOrderItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB83522841A8B0030646A /* ShoppingCartPayOrderItemCell.swift */; };
 		BD7AB838228420310030646A /* ShoppingCartPayOrderHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7AB837228420310030646A /* ShoppingCartPayOrderHeader.swift */; };
@@ -754,6 +757,9 @@
 		BD20F1D72283D2AA00677D8E /* ShoppingCartModule.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = ShoppingCartModule.xcassets; sourceTree = "<group>"; };
 		BD29A92D228F99780018CFC3 /* OrderCommentParameterModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCommentParameterModel.swift; sourceTree = "<group>"; };
 		BD3474F422857B85000908C5 /* CommonPayHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonPayHeader.swift; sourceTree = "<group>"; };
+		BD3AA45722AE63EC00EF4F20 /* MessageMainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageMainViewController.swift; sourceTree = "<group>"; };
+		BD3AA45A22AE64F000EF4F20 /* MessageMainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageMainView.swift; sourceTree = "<group>"; };
+		BD3AA45E22AE6F2500EF4F20 /* MessagePlanetTableCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessagePlanetTableCell.swift; sourceTree = "<group>"; };
 		BD6EDF47229007EA009A20FE /* OrderApplyRefundModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderApplyRefundModel.swift; sourceTree = "<group>"; };
 		BD7AB83522841A8B0030646A /* ShoppingCartPayOrderItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartPayOrderItemCell.swift; sourceTree = "<group>"; };
 		BD7AB837228420310030646A /* ShoppingCartPayOrderHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartPayOrderHeader.swift; sourceTree = "<group>"; };
@@ -2064,6 +2070,7 @@
 			isa = PBXGroup;
 			children = (
 				A77F2CAE2232010F001BD3F6 /* RegisterLoginModule */,
+				BD3AA45422AE635700EF4F20 /* MessageModule */,
 				A77F2CA92232010F001BD3F6 /* MineModule */,
 				A7FF155A228C689C00A85748 /* OrderModule */,
 				A77F2CA32232010F001BD3F6 /* ShoppingMallModule */,
@@ -2975,6 +2982,40 @@
 			path = ViewController;
 			sourceTree = "<group>";
 		};
+		BD3AA45422AE635700EF4F20 /* MessageModule */ = {
+			isa = PBXGroup;
+			children = (
+				BD3AA45522AE63A200EF4F20 /* MessageMain */,
+			);
+			path = MessageModule;
+			sourceTree = "<group>";
+		};
+		BD3AA45522AE63A200EF4F20 /* MessageMain */ = {
+			isa = PBXGroup;
+			children = (
+				BD3AA45922AE63FB00EF4F20 /* View */,
+				BD3AA45622AE63B800EF4F20 /* ViewController */,
+			);
+			path = MessageMain;
+			sourceTree = "<group>";
+		};
+		BD3AA45622AE63B800EF4F20 /* ViewController */ = {
+			isa = PBXGroup;
+			children = (
+				BD3AA45722AE63EC00EF4F20 /* MessageMainViewController.swift */,
+			);
+			path = ViewController;
+			sourceTree = "<group>";
+		};
+		BD3AA45922AE63FB00EF4F20 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				BD3AA45A22AE64F000EF4F20 /* MessageMainView.swift */,
+				BD3AA45E22AE6F2500EF4F20 /* MessagePlanetTableCell.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 		BD77BE18228D8C2E0060E23C /* OrderComment */ = {
 			isa = PBXGroup;
 			children = (
@@ -3392,6 +3433,7 @@
 				BDDF3B28228EBB72003A7D16 /* ProductRefundReasonModel.swift in Sources */,
 				A7CC74DC2270352F003C4F38 /* MineOrderCollectionViewCell.swift in Sources */,
 				BDD4FB1222840597006FE833 /* ShoppingCartPayOrderController.swift in Sources */,
+				BD3AA45F22AE6F2500EF4F20 /* MessagePlanetTableCell.swift in Sources */,
 				A7284404224DBFBD00F82F30 /* UserModel.swift in Sources */,
 				A7CC74D822700359003C4F38 /* MineTableViewHeaderView.swift in Sources */,
 				A71D2A602265673A00A55D16 /* RegisterLoginView.swift in Sources */,
@@ -3600,6 +3642,7 @@
 				A71AF0BC226F099B001730FE /* ProductHBigTableViewCell.swift in Sources */,
 				BD108C9622A60C2100837DAB /* HGImagePickerCell.swift in Sources */,
 				A7A98E3C228036D7005306E9 /* ShoppingMallCategoryCollectionViewCell.swift in Sources */,
+				BD3AA45822AE63EC00EF4F20 /* MessageMainViewController.swift in Sources */,
 				A71AF0AA226EDDF5001730FE /* SearchView.swift in Sources */,
 				A7FF1583228C843700A85748 /* OrderDetailExpressSelfMentionTableViewCell.swift in Sources */,
 				A7A98E0E227EC0C6005306E9 /* CategoryTableViewCell.swift in Sources */,
@@ -3653,6 +3696,7 @@
 				BDEF7791228571DC00ED0AC0 /* CommonPayView.swift in Sources */,
 				A71AF0A6226EDDC8001730FE /* SearchViewController.swift in Sources */,
 				BD20F1CF2283CE2300677D8E /* OrderFinishPayView.swift in Sources */,
+				BD3AA45B22AE64F000EF4F20 /* MessageMainView.swift in Sources */,
 				A7A98E4322804851005306E9 /* ShoppingMallSepcialFlowLayout.swift in Sources */,
 				A79057062276EA3D0037F823 /* OpenCityListModel.swift in Sources */,
 				BD7AB838228420310030646A /* ShoppingCartPayOrderHeader.swift in Sources */,

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/View/MessageMainView.swift

@@ -0,0 +1,123 @@
+//
+//  MessageMainView.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/10.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+
+class MessageMainView: BaseView {
+    
+    typealias CommitOrderBlock = () -> Void
+    var commitOrderBlock : CommitOrderBlock?
+    
+    
+    override func setupViews() {
+        self.backgroundColor = kf7f8faColor
+        
+        addSubview(topView)
+        addSubview(tableView)
+    }
+    
+    override func setupLayouts() {
+        
+        topView.snp.makeConstraints { (make) in
+            make.top.left.right.equalToSuperview().offset(0)
+            make.height.equalTo(104)
+        }
+        
+        tableView.snp.makeConstraints { (make) in
+            make.top.equalTo(topView.snp_bottom).offset(10)
+            make.left.right.equalTo(0)
+            make.bottom.equalToSuperview()
+        }
+    }
+    
+    private lazy var topView: UIView = {
+        let topView = UIView()
+        topView.backgroundColor = UIColor.white
+        return topView
+    }()
+    
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame: CGRect.zero, style: UITableView.Style.grouped)
+        tableView.separatorStyle = .none
+        tableView.backgroundColor = kf7f8faColor
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.isScrollEnabled = false
+        tableView.estimatedRowHeight = 70
+        tableView.estimatedSectionFooterHeight = 0.000001
+        tableView.estimatedSectionHeaderHeight = 0.000001
+        return tableView
+    }()
+    
+    
+    
+    
+    private lazy var accountBtn: UIButton = {
+        let accountBtn = UIButton(type: UIButton.ButtonType.custom)
+        accountBtn.backgroundColor = kFFA42FColor
+        accountBtn.setTitle("提交订单", for: UIControl.State.normal)
+        accountBtn.setTitleColor(kffffffColor, for: UIControl.State.normal)
+        accountBtn.titleLabel?.font = kScaleRegularFont15
+        accountBtn.cornerRadius = 18
+        accountBtn.masksToBounds = true
+        accountBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
+            if let commitOrderBlock = self?.commitOrderBlock {
+                commitOrderBlock()
+            }
+        }).disposed(by: disposeBag)
+        return accountBtn
+    }()
+    
+    private lazy var prePriceLabel: UILabel = {
+        let prePriceLabel = UILabel()
+        prePriceLabel.text = "合计"
+        prePriceLabel.textColor = k333333Color
+        prePriceLabel.font = kScaleRegularFont16
+        return prePriceLabel
+    }()
+    
+}
+
+// MARK: - tableView dataSource && delegate
+extension MessageMainView : UITableViewDelegate, UITableViewDataSource {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 2
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        switch indexPath.row {
+        case 0:
+            // 星球通知
+            return UITableViewCell()
+        case 1:
+            // 星球活动
+            return UITableViewCell()
+        default:
+            return UITableViewCell()
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 70
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        switch indexPath.row {
+        case 0:
+            // 星球通知
+            print("点击--星球通知")
+        case 1:
+            // 星球活动
+            print("点击--星球活动")
+        default:
+            return
+        }
+    }
+
+}

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/View/MessagePlanetTableCell.swift

@@ -0,0 +1,111 @@
+//
+//  MessagePlanetTableCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/10.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  星球通知/活动のCell
+
+import UIKit
+
+class MessagePlanetTableCell: UITableViewCell {
+    
+    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> MessagePlanetTableCell {
+        let ID = "MessagePlanetTableCell"
+        tableView.register(MessagePlanetTableCell.self, forCellReuseIdentifier: ID)
+        let cell : MessagePlanetTableCell = tableView.dequeueReusableCell(withIdentifier: ID, for: indexPath) as! MessagePlanetTableCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupViews()
+        setupLayouts()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    var indexPath: IndexPath? {
+        didSet {
+            
+        }
+    }
+    
+    //MRAK: - 设置View
+    private func setupViews() {
+        self.selectionStyle = .none
+        backgroundColor = kffffffColor
+        addSubview(iconImageView)
+        addSubview(titleLabel)
+        addSubview(subLabel)
+        addSubview(timeLabel)
+    }
+    
+    private func setupLayouts() {
+        
+        iconImageView.snp.makeConstraints { (make) in
+            make.left.equalTo(14)
+            make.centerY.equalToSuperview()
+            make.size.equalTo(36)
+        }
+        
+        titleLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(12)
+            make.left.equalTo(iconImageView.snp_right).offset(8)
+            make.left.equalToSuperview().offset(30)
+            make.right.equalToSuperview().offset(-30)
+        }
+        
+        subLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(iconImageView.snp.bottom).offset(16)
+            make.centerX.equalToSuperview()
+            make.left.equalToSuperview().offset(30)
+            make.right.equalToSuperview().offset(-30)
+        }
+        
+        timeLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(iconImageView.snp.bottom).offset(16)
+            make.centerX.equalToSuperview()
+            make.left.equalToSuperview().offset(30)
+            make.right.equalToSuperview().offset(-30)
+        }
+        
+    }
+    
+    lazy var iconImageView : UIImageView = {
+        let iconImageView = UIImageView()
+        iconImageView.image = kImage(name: "page05")
+        return iconImageView
+    }()
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "购物车内无商品"
+        titleLabel.textColor = k333333Color
+        titleLabel.font = kRegularFont14
+        titleLabel.textAlignment = .center
+        return titleLabel
+    }()
+    
+    private lazy var subLabel: UILabel = {
+        let subLabel = UILabel()
+        subLabel.text = "购物车内无商品"
+        subLabel.textColor = k333333Color
+        subLabel.font = kRegularFont14
+        subLabel.textAlignment = .center
+        return subLabel
+    }()
+    
+    private lazy var timeLabel: UILabel = {
+        let timeLabel = UILabel()
+        timeLabel.text = "购物车内无商品"
+        timeLabel.textColor = k333333Color
+        timeLabel.font = kRegularFont14
+        timeLabel.textAlignment = .center
+        return timeLabel
+    }()
+    
+}

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/ViewController/MessageMainViewController.swift

@@ -0,0 +1,43 @@
+//
+//  MessageMainViewController.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/10.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+
+class MessageMainViewController: BaseViewController {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupViews()
+        setupLayouts()
+        
+    }
+    
+    override func setupViews() {
+        navigationBar.title = "消息"
+        view.addSubview(messageMainView)
+    }
+    
+    override func setupLayouts() {
+        messageMainView.snp.makeConstraints { (make) in
+            make.left.right.equalToSuperview()
+            make.top.equalTo(kNavBarTotalHeight)
+            make.height.equalTo(kScreenHeight - kNavBarTotalHeight - kTabBarTotalHeight)
+        }
+    }
+    
+    override func setupData() {
+        
+    }
+    
+    private lazy var messageMainView: MessageMainView = {
+        let messageMainView = MessageMainView()
+        
+        return messageMainView
+    }()
+    
+}