精选话题页面完成

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -322,6 +322,9 @@
 		A7CC753A2271B98B003C4F38 /* AddressManagerAddTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7CC75392271B98B003C4F38 /* AddressManagerAddTableViewCell.swift */; };
 		A7CC753C2271C177003C4F38 /* AddressManagerSelfMentionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7CC753B2271C177003C4F38 /* AddressManagerSelfMentionTableViewCell.swift */; };
 		A7CC75432271E038003C4F38 /* SelfMentionContactsListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7CC75422271E038003C4F38 /* SelfMentionContactsListViewController.swift */; };
+		A7D07CBF22B73EE600186014 /* UserPersonalCenterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D07CBE22B73EE600186014 /* UserPersonalCenterViewController.swift */; };
+		A7D07CC122B73F0200186014 /* OtherPersonalCenterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D07CC022B73F0200186014 /* OtherPersonalCenterViewController.swift */; };
+		A7D07CC322B745C800186014 /* PersonViewUserAndOtherHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D07CC222B745C800186014 /* PersonViewUserAndOtherHeaderView.swift */; };
 		A7D4608E227616F800A5A54E /* SQLiteManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D4608D227616F800A5A54E /* SQLiteManager.swift */; };
 		A7D46090227617D200A5A54E /* SQLModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D4608F227617D200A5A54E /* SQLModel.swift */; };
 		A7D46092227619CD00A5A54E /* BaiduToCityFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D46091227619CC00A5A54E /* BaiduToCityFactory.swift */; };
@@ -842,6 +845,9 @@
 		A7CC75392271B98B003C4F38 /* AddressManagerAddTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressManagerAddTableViewCell.swift; sourceTree = "<group>"; };
 		A7CC753B2271C177003C4F38 /* AddressManagerSelfMentionTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressManagerSelfMentionTableViewCell.swift; sourceTree = "<group>"; };
 		A7CC75422271E038003C4F38 /* SelfMentionContactsListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfMentionContactsListViewController.swift; sourceTree = "<group>"; };
+		A7D07CBE22B73EE600186014 /* UserPersonalCenterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPersonalCenterViewController.swift; sourceTree = "<group>"; };
+		A7D07CC022B73F0200186014 /* OtherPersonalCenterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OtherPersonalCenterViewController.swift; sourceTree = "<group>"; };
+		A7D07CC222B745C800186014 /* PersonViewUserAndOtherHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonViewUserAndOtherHeaderView.swift; sourceTree = "<group>"; };
 		A7D4608D227616F800A5A54E /* SQLiteManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SQLiteManager.swift; sourceTree = "<group>"; };
 		A7D4608F227617D200A5A54E /* SQLModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SQLModel.swift; sourceTree = "<group>"; };
 		A7D46091227619CC00A5A54E /* BaiduToCityFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaiduToCityFactory.swift; sourceTree = "<group>"; };
@@ -2387,6 +2393,7 @@
 		A77F2CA92232010F001BD3F6 /* MineModule */ = {
 			isa = PBXGroup;
 			children = (
+				A7D07CB822B73E5500186014 /* PersonalCenter */,
 				A77F2CAA2232010F001BD3F6 /* Mine */,
 				A7CC75302271AB6C003C4F38 /* AddressManager */,
 				A71AA50D22721537008FF1A5 /* ExpressAddressList */,
@@ -3135,6 +3142,72 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		A7D07CB622B73B9E00186014 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				BD1FC18022B08D7A00D55081 /* CommunityMyFollowTopicCell.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
+		A7D07CB722B73BAE00186014 /* ViewController */ = {
+			isa = PBXGroup;
+			children = (
+				BD1FC17E22B08D3C00D55081 /* CommunityMyFollowTopicController.swift */,
+			);
+			path = ViewController;
+			sourceTree = "<group>";
+		};
+		A7D07CB822B73E5500186014 /* PersonalCenter */ = {
+			isa = PBXGroup;
+			children = (
+				A7D07CBD22B73EC000186014 /* PersonalCenterView */,
+				A7D07CB922B73E6700186014 /* UserPersonalCenter */,
+				A7D07CBA22B73E7300186014 /* OtherPersonalCenter */,
+			);
+			path = PersonalCenter;
+			sourceTree = "<group>";
+		};
+		A7D07CB922B73E6700186014 /* UserPersonalCenter */ = {
+			isa = PBXGroup;
+			children = (
+				A7D07CBC22B73EBD00186014 /* ViewController */,
+			);
+			path = UserPersonalCenter;
+			sourceTree = "<group>";
+		};
+		A7D07CBA22B73E7300186014 /* OtherPersonalCenter */ = {
+			isa = PBXGroup;
+			children = (
+				A7D07CBB22B73E9D00186014 /* ViewController */,
+			);
+			path = OtherPersonalCenter;
+			sourceTree = "<group>";
+		};
+		A7D07CBB22B73E9D00186014 /* ViewController */ = {
+			isa = PBXGroup;
+			children = (
+				A7D07CC022B73F0200186014 /* OtherPersonalCenterViewController.swift */,
+			);
+			path = ViewController;
+			sourceTree = "<group>";
+		};
+		A7D07CBC22B73EBD00186014 /* ViewController */ = {
+			isa = PBXGroup;
+			children = (
+				A7D07CBE22B73EE600186014 /* UserPersonalCenterViewController.swift */,
+			);
+			path = ViewController;
+			sourceTree = "<group>";
+		};
+		A7D07CBD22B73EC000186014 /* PersonalCenterView */ = {
+			isa = PBXGroup;
+			children = (
+				A7D07CC222B745C800186014 /* PersonViewUserAndOtherHeaderView.swift */,
+			);
+			path = PersonalCenterView;
+			sourceTree = "<group>";
+		};
 		A7D4608C227616E600A5A54E /* FMDB */ = {
 			isa = PBXGroup;
 			children = (
@@ -3582,8 +3655,8 @@
 		BD1FC17D22B08CEB00D55081 /* CommunityMyFollowTopic */ = {
 			isa = PBXGroup;
 			children = (
-				BD1FC17E22B08D3C00D55081 /* CommunityMyFollowTopicController.swift */,
-				BD1FC18022B08D7A00D55081 /* CommunityMyFollowTopicCell.swift */,
+				A7D07CB722B73BAE00186014 /* ViewController */,
+				A7D07CB622B73B9E00186014 /* View */,
 			);
 			path = CommunityMyFollowTopic;
 			sourceTree = "<group>";
@@ -4439,6 +4512,7 @@
 				A7CC752F2271A1F2003C4F38 /* SetPasswordView.swift in Sources */,
 				BD12B68E22B4F5DD00AEB10B /* KSMediaPickerCameraToolBar.swift in Sources */,
 				A7A98E09227EB8DD005306E9 /* CategoryView.swift in Sources */,
+				A7D07CC122B73F0200186014 /* OtherPersonalCenterViewController.swift in Sources */,
 				A7CC75362271AC14003C4F38 /* AddressManagerView.swift in Sources */,
 				A7146349228EFCE20066099B /* ORSKUDataFilter.m in Sources */,
 				BDF8629C228E4125000DEF84 /* OrderCommentController.swift in Sources */,
@@ -4554,6 +4628,7 @@
 				A7274C50228EE5F0000E3A07 /* PhotoAndCameraManager.swift in Sources */,
 				A77F2C612231FB49001BD3F6 /* AppDelegate.swift in Sources */,
 				A729B5A82266F2E0004AE098 /* AlertSheetView.swift in Sources */,
+				A7D07CC322B745C800186014 /* PersonViewUserAndOtherHeaderView.swift in Sources */,
 				A7CC75382271ADD6003C4F38 /* AddressManagerSelfMentionExpressHeaderView.swift in Sources */,
 				A738D66F225D9BD900EEE860 /* UMLoginModel.swift in Sources */,
 				A7FF156C228C6E5E00A85748 /* OrderTotalAmountTableViewCell.swift in Sources */,
@@ -4615,6 +4690,7 @@
 				A72A72CF22321E2700B21995 /* NotificationCenterMacro.swift in Sources */,
 				A72A72BF22321DE000B21995 /* Extension+UIButton.swift in Sources */,
 				BDD4FB1722840DD3006FE833 /* OrderPayAcountView.swift in Sources */,
+				A7D07CBF22B73EE600186014 /* UserPersonalCenterViewController.swift in Sources */,
 				A7CC753C2271C177003C4F38 /* AddressManagerSelfMentionTableViewCell.swift in Sources */,
 				A7FF1587228C851100A85748 /* OrderDetailInfoTableViewCell.swift in Sources */,
 			);

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFeaturedTopics/ViewController/CommunityFeaturedTopicsViewController.swift

@@ -26,6 +26,8 @@ class CommunityFeaturedTopicsViewController: BaseViewController {
         setnavigationBar()
     }
     
+    
+    /// 设置navigationBar
     func setnavigationBar() {
         navigationBar.addSubview(navigationBgView)
         navigationBar.addSubview(topicLable)
@@ -79,6 +81,11 @@ class CommunityFeaturedTopicsViewController: BaseViewController {
              (button:UIButton) -> Bool in
             return !button.isSelected
         }
+        navigationBar.onClickRightButton = {
+            [weak self] in
+            let vc = CommunityMyFollowTopicController()
+            self?.navigationController?.pushViewController(vc, animated: true)
+        }
     }
     
     private lazy var tableView: UITableView = {

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/OtherPersonalCenter/ViewController/OtherPersonalCenterViewController.swift

@@ -0,0 +1,30 @@
+//
+//  OtherPersonalCenterViewController.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/6/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+
+class OtherPersonalCenterViewController: BaseViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+    }
+    
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destination.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}

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

@@ -0,0 +1,29 @@
+//
+//  PersonViewUserAndOtherHeaderView.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/6/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+
+class PersonViewUserAndOtherHeaderView: BaseView {
+
+    override func setupViews() {
+        addSubview(titleLabel)
+    }
+    
+    override func setupLayouts() {
+        
+    }
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "昵称"
+        titleLabel.textColor = .white
+        titleLabel.font = kBoldFont18
+        return titleLabel
+    }()
+
+}

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

@@ -0,0 +1,30 @@
+//
+//  UserPersonalCenterViewController.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/6/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+
+class UserPersonalCenterViewController: BaseViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+    }
+    
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destination.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/DefaultPage/defaul_tavatar.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/Rectangle 2.imageset/Contents.json

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