推荐,关注,话题,点赞展示

后院页面调试
首页tabbar置顶

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -163,6 +163,9 @@
 		A74322A922B900180017C367 /* CommunityFindFriendsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74322A822B900180017C367 /* CommunityFindFriendsViewController.swift */; };
 		A74322AB22B900F00017C367 /* CommunityFindFriendsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74322AA22B900F00017C367 /* CommunityFindFriendsView.swift */; };
 		A7464B6C23386521003CE3A0 /* PushConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7464B6B23386521003CE3A0 /* PushConfigModel.swift */; };
+		A7464B7023389688003CE3A0 /* BackyardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7464B6F23389688003CE3A0 /* BackyardViewController.swift */; };
+		A7464B722338AC4E003CE3A0 /* BackyardModuleRouterType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7464B712338AC4E003CE3A0 /* BackyardModuleRouterType.swift */; };
+		A7464B752338B2C6003CE3A0 /* CommunityModule.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A7464B742338B2C6003CE3A0 /* CommunityModule.xcassets */; };
 		A74D9D572327B54100F05C14 /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74D9D562327B54100F05C14 /* NotificationService.swift */; };
 		A74D9D5B2327B54100F05C14 /* NotificationService.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = A74D9D542327B54100F05C14 /* NotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		A74DF74922EAAF17007FB505 /* MJDIYFullScreenHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74DF74822EAAF17007FB505 /* MJDIYFullScreenHeader.swift */; };
@@ -316,7 +319,6 @@
 		A7BB685922696B9200AB07A2 /* SelfRecommendationCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7BB685822696B9200AB07A2 /* SelfRecommendationCollectionViewCell.swift */; };
 		A7BB68662269B1DD00AB07A2 /* AddressPOIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7BB68632269B1DD00AB07A2 /* AddressPOIView.swift */; };
 		A7BB68672269B1DD00AB07A2 /* AddressPOIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7BB68652269B1DD00AB07A2 /* AddressPOIViewController.swift */; };
-		A7BF202422B392D600396DB3 /* CommunityModule.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A7BF202322B392D600396DB3 /* CommunityModule.xcassets */; };
 		A7BF202722B3930100396DB3 /* MessageModule.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A7BF202622B3930100396DB3 /* MessageModule.xcassets */; };
 		A7BF202B22B396F300396DB3 /* CardContentTitleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7BF202922B396F300396DB3 /* CardContentTitleTableViewCell.swift */; };
 		A7BF203122B47CC000396DB3 /* CardContentCommnetTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7BF203022B47CC000396DB3 /* CardContentCommnetTableViewCell.swift */; };
@@ -373,7 +375,6 @@
 		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 */; };
-		A7D5F21F22BB1FA800F8E9AF /* CommunityPlanetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D5F21E22BB1FA800F8E9AF /* CommunityPlanetViewController.swift */; };
 		A7D5F22922BB686200F8E9AF /* BaseJSWebBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D5F22822BB686200F8E9AF /* BaseJSWebBaseViewController.swift */; };
 		A7D5F22B22BB687100F8E9AF /* BaseJSWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D5F22A22BB687100F8E9AF /* BaseJSWebViewController.swift */; };
 		A7D5F22D22BB689700F8E9AF /* WKWebViewEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D5F22C22BB689700F8E9AF /* WKWebViewEnum.swift */; };
@@ -815,6 +816,9 @@
 		A74322A822B900180017C367 /* CommunityFindFriendsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityFindFriendsViewController.swift; sourceTree = "<group>"; };
 		A74322AA22B900F00017C367 /* CommunityFindFriendsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityFindFriendsView.swift; sourceTree = "<group>"; };
 		A7464B6B23386521003CE3A0 /* PushConfigModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PushConfigModel.swift; sourceTree = "<group>"; };
+		A7464B6F23389688003CE3A0 /* BackyardViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BackyardViewController.swift; path = RainbowPlanet/Modules/BackyardModule/Backyard/ViewController/BackyardViewController.swift; sourceTree = SOURCE_ROOT; };
+		A7464B712338AC4E003CE3A0 /* BackyardModuleRouterType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackyardModuleRouterType.swift; sourceTree = "<group>"; };
+		A7464B742338B2C6003CE3A0 /* CommunityModule.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = CommunityModule.xcassets; sourceTree = "<group>"; };
 		A74D9D542327B54100F05C14 /* NotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		A74D9D562327B54100F05C14 /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
 		A74D9D582327B54100F05C14 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -985,7 +989,6 @@
 		A7BB685822696B9200AB07A2 /* SelfRecommendationCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfRecommendationCollectionViewCell.swift; sourceTree = "<group>"; };
 		A7BB68632269B1DD00AB07A2 /* AddressPOIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddressPOIView.swift; sourceTree = "<group>"; };
 		A7BB68652269B1DD00AB07A2 /* AddressPOIViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddressPOIViewController.swift; sourceTree = "<group>"; };
-		A7BF202322B392D600396DB3 /* CommunityModule.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = CommunityModule.xcassets; sourceTree = "<group>"; };
 		A7BF202622B3930100396DB3 /* MessageModule.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = MessageModule.xcassets; sourceTree = "<group>"; };
 		A7BF202922B396F300396DB3 /* CardContentTitleTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardContentTitleTableViewCell.swift; sourceTree = "<group>"; };
 		A7BF203022B47CC000396DB3 /* CardContentCommnetTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardContentCommnetTableViewCell.swift; sourceTree = "<group>"; };
@@ -1042,7 +1045,6 @@
 		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>"; };
-		A7D5F21E22BB1FA800F8E9AF /* CommunityPlanetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityPlanetViewController.swift; sourceTree = "<group>"; };
 		A7D5F22822BB686200F8E9AF /* BaseJSWebBaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseJSWebBaseViewController.swift; sourceTree = "<group>"; };
 		A7D5F22A22BB687100F8E9AF /* BaseJSWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseJSWebViewController.swift; sourceTree = "<group>"; };
 		A7D5F22C22BB689700F8E9AF /* WKWebViewEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WKWebViewEnum.swift; sourceTree = "<group>"; };
@@ -1424,14 +1426,6 @@
 			path = PickView;
 			sourceTree = "<group>";
 		};
-		A714348522DD9CD000132DA9 /* RedemptionAreaModule */ = {
-			isa = PBXGroup;
-			children = (
-				A701454022F9813A0090E1BD /* RedemptionArea */,
-			);
-			path = RedemptionAreaModule;
-			sourceTree = "<group>";
-		};
 		A714348822DD9E2800132DA9 /* ViewController */ = {
 			isa = PBXGroup;
 			children = (
@@ -1548,7 +1542,6 @@
 				A7D5F21A22BB1EE700F8E9AF /* Main */,
 				A7D5F21C22BB1F3E00F8E9AF /* Follow */,
 				A7AA9F6122C62AA70086498B /* Recommend */,
-				A7D5F21B22BB1F0100F8E9AF /* Planet */,
 			);
 			path = ViewController;
 			sourceTree = "<group>";
@@ -1866,14 +1859,14 @@
 			path = KeyBoardCommentView;
 			sourceTree = "<group>";
 		};
-		A729B5A52266DBC9004AE098 /* CommonModules */ = {
+		A729B5A52266DBC9004AE098 /* CommonModule */ = {
 			isa = PBXGroup;
 			children = (
 				A70B2C692288810700B2449F /* PickView */,
 				A72C011F2275399D0065E0C3 /* ProvinceCityAreaModules */,
 				A7636ABD2268123B00374F9E /* LocationModule */,
 			);
-			path = CommonModules;
+			path = CommonModule;
 			sourceTree = "<group>";
 		};
 		A729B5A62266DBFA004AE098 /* AlertSheetView */ = {
@@ -2327,6 +2320,22 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		A7464B6E233894B9003CE3A0 /* BackyardModule */ = {
+			isa = PBXGroup;
+			children = (
+				A701454022F9813A0090E1BD /* RedemptionArea */,
+				A7D5F21B22BB1F0100F8E9AF /* Backyard */,
+			);
+			path = BackyardModule;
+			sourceTree = "<group>";
+		};
+		A7464B732338AD6E003CE3A0 /* RedemptionAreaModule */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = RedemptionAreaModule;
+			sourceTree = "<group>";
+		};
 		A74D9D552327B54100F05C14 /* NotificationService */ = {
 			isa = PBXGroup;
 			children = (
@@ -2868,16 +2877,17 @@
 		A77F2CA22232010F001BD3F6 /* Modules */ = {
 			isa = PBXGroup;
 			children = (
+				A7464B732338AD6E003CE3A0 /* RedemptionAreaModule */,
+				A719EE6622AF4374001AAC98 /* CommunityModule */,
+				A7464B6E233894B9003CE3A0 /* BackyardModule */,
 				A74144AD233076D10062FB6F /* RongCloudIMModule */,
 				A7811CCC2323D25A00C2D8DE /* PublishNewModule */,
 				A77F2CAE2232010F001BD3F6 /* RegisterLoginModule */,
-				A719EE6622AF4374001AAC98 /* CommunityModule */,
-				A714348522DD9CD000132DA9 /* RedemptionAreaModule */,
 				BD12B67122B4E96100AEB10B /* PublishModule */,
 				BD3AA45422AE635700EF4F20 /* MessageModule */,
 				A77F2CA92232010F001BD3F6 /* MineModule */,
 				A71AF0A3226E9D8A001730FE /* SearchModule */,
-				A729B5A52266DBC9004AE098 /* CommonModules */,
+				A729B5A52266DBC9004AE098 /* CommonModule */,
 				A7D5F25122BC8A7600F8E9AF /* H5Modules */,
 				A770E5EE22D57CEA00CBD0A4 /* ShareModules */,
 			);
@@ -2921,11 +2931,11 @@
 		A77F2CBB223201DC001BD3F6 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				A7464B742338B2C6003CE3A0 /* CommunityModule.xcassets */,
 				A77F2C672231FB4A001BD3F6 /* Assets.xcassets */,
 				A7D77DE822DDBEF70048D5F6 /* RedemptionAreaModule.xcassets */,
 				A7CC74DD22703B4A003C4F38 /* MineModule.xcassets */,
 				A7FF1576228C824300A85748 /* OrderModule.xcassets */,
-				A7BF202322B392D600396DB3 /* CommunityModule.xcassets */,
 				A7BF202622B3930100396DB3 /* MessageModule.xcassets */,
 				BD24FABA22B509CF00C7AA3B /* PublishModule.xcassets */,
 				A76068E322E47E0E008DF18F /* RegisterLoginModule.xcassets */,
@@ -3316,6 +3326,7 @@
 			isa = PBXGroup;
 			children = (
 				A770E5DA22CED8C600CBD0A4 /* RouterManager.swift */,
+				A7464B712338AC4E003CE3A0 /* BackyardModuleRouterType.swift */,
 				A7F304B8233324B400A4850F /* RongCloudIMRouterModuleType.swift */,
 				A770E5DF22CF19FA00CBD0A4 /* CommunityRouterModuleType.swift */,
 				A7DAB33222D881F5005B964E /* H5RouterModuleType.swift */,
@@ -3785,12 +3796,12 @@
 			path = Main;
 			sourceTree = "<group>";
 		};
-		A7D5F21B22BB1F0100F8E9AF /* Planet */ = {
+		A7D5F21B22BB1F0100F8E9AF /* Backyard */ = {
 			isa = PBXGroup;
 			children = (
-				A7D5F21D22BB1F6D00F8E9AF /* CommunityPlanet */,
+				A7D5F21D22BB1F6D00F8E9AF /* ViewController */,
 			);
-			path = Planet;
+			path = Backyard;
 			sourceTree = "<group>";
 		};
 		A7D5F21C22BB1F3E00F8E9AF /* Follow */ = {
@@ -3801,12 +3812,12 @@
 			path = Follow;
 			sourceTree = "<group>";
 		};
-		A7D5F21D22BB1F6D00F8E9AF /* CommunityPlanet */ = {
+		A7D5F21D22BB1F6D00F8E9AF /* ViewController */ = {
 			isa = PBXGroup;
 			children = (
-				A7D5F21E22BB1FA800F8E9AF /* CommunityPlanetViewController.swift */,
+				A7464B6F23389688003CE3A0 /* BackyardViewController.swift */,
 			);
-			path = CommunityPlanet;
+			path = ViewController;
 			sourceTree = "<group>";
 		};
 		A7D5F23022BB9B6D00F8E9AF /* H5Common */ = {
@@ -4125,10 +4136,10 @@
 			children = (
 				A7F2D6DA22B2524A0093000B /* User */,
 				A7F2D6DB22B252520093000B /* PicVideo */,
-				A7C0FDE522B4A36F00BC1E86 /* CommentList */,
+				A7BF202822B396D100396DB3 /* TitleContent */,
 				A7BF203222B47D6200396DB3 /* Action */,
+				A7C0FDE522B4A36F00BC1E86 /* CommentList */,
 				A7BF202F22B47CA000396DB3 /* Comment */,
-				A7BF202822B396D100396DB3 /* TitleContent */,
 			);
 			path = CardContent;
 			sourceTree = "<group>";
@@ -5275,7 +5286,6 @@
 				A78A5F7622FAA03800DD1764 /* share_iSpt.gif in Resources */,
 				BDD5483422C31752005BBE19 /* AlivcShortVideoImage.bundle in Resources */,
 				A7CC74DE22703B4A003C4F38 /* MineModule.xcassets in Resources */,
-				A7BF202422B392D600396DB3 /* CommunityModule.xcassets in Resources */,
 				A7EF3E102303DAEE001E4D26 /* Launch Screen.storyboard in Resources */,
 				BDD54A2522C31D5F005BBE19 /* music.json in Resources */,
 				A76068E922E4922F008DF18F /* Skittles.json in Resources */,
@@ -5290,6 +5300,7 @@
 				A72C01232275404A0065E0C3 /* province_city_area.json in Resources */,
 				BDD54A2622C31D60005BBE19 /* watermark.png in Resources */,
 				BD108C9B22A60C3300837DAB /* HGImage.storyboard in Resources */,
+				A7464B752338B2C6003CE3A0 /* CommunityModule.xcassets in Resources */,
 				A7FF1577228C824300A85748 /* OrderModule.xcassets in Resources */,
 				A7F577C422FD894F00E2D757 /* ATAuthSDK.bundle in Resources */,
 				A72E684F22F2BBB30063D967 /* login_video.mp4 in Resources */,
@@ -5536,6 +5547,7 @@
 				A72623D922C2F8B100AEF875 /* MessageHomeOneCollectionViewCell.swift in Sources */,
 				A75B782822DEC708007B986A /* SepcialTwoTypeLayout.swift in Sources */,
 				A71AA519227219D7008FF1A5 /* EditExpressAddressViewController.swift in Sources */,
+				A7464B722338AC4E003CE3A0 /* BackyardModuleRouterType.swift in Sources */,
 				A790705B22B9B680008CE279 /* ModifyDataViewController.swift in Sources */,
 				BD27F0B022CC929800A6514D /* CommunityVideoCoverCollectionCell.swift in Sources */,
 				A71738A822897E96000AEA6A /* SwiftMoyaNetWorkServiceShop.swift in Sources */,
@@ -5590,7 +5602,6 @@
 				A77F2CC3223203BA001BD3F6 /* AppDelegate+Window.swift in Sources */,
 				A7824B062271F25400ABA381 /* EditAddressTableViewCell.swift in Sources */,
 				BD12B69E22B4FAF000AEB10B /* KSMediaPickerNavigationView.swift in Sources */,
-				A7D5F21F22BB1FA800F8E9AF /* CommunityPlanetViewController.swift in Sources */,
 				A715333E22980CC60017C861 /* ConfigModel.swift in Sources */,
 				BD6122FA22C36A8100D3F513 /* QUProgressView.m in Sources */,
 				BD10FC0222C6F9770096A34E /* AlivcShortVideoUploadManager.m in Sources */,
@@ -5749,6 +5760,7 @@
 				A7DF50E322A55AB600998908 /* BrowsePicturesPagerViewCell.swift in Sources */,
 				A77F2CC822320627001BD3F6 /* WRCustomNavigationBar.swift in Sources */,
 				A72623DB22C2FC3C00AEF875 /* MessageHomeTwoCollectionViewCell.swift in Sources */,
+				A7464B7023389688003CE3A0 /* BackyardViewController.swift in Sources */,
 				A70B2C072284305400B2449F /* ProductModel.swift in Sources */,
 				A72A72BC22321DE000B21995 /* Extension+UIAlertController.swift in Sources */,
 				A7DAB33522D8D3AC005B964E /* RegisterLoginRouterModuleType.swift in Sources */,

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -21,7 +21,7 @@ class BaseTabbarViewController: NSObject {
     /// 商城
 //    var v2 = ShoppingMallViewController!
     /// 兑换专区
-    var v2 : RedemptionAreaViewController!
+    var v2 : BackyardViewController!
     /// 发布
     var v3 : BaseViewController!
     /// 消息
@@ -95,7 +95,7 @@ class BaseTabbarViewController: NSObject {
         /// 商城
         //    var v2 = ShoppingMallViewController!
         /// 兑换专区
-        v2 = RedemptionAreaViewController()
+        v2 = BackyardViewController()
         /// 发布
         v3 = BaseViewController()
         /// 消息
@@ -160,7 +160,7 @@ class BaseTabbarViewController: NSObject {
 //        v4.tabBarItem = ESTabBarItem.init(lottieAnimateContentView4, title: "消息", image: UIImage(named: "tabbar_massage")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
 //        v5.tabBarItem = ESTabBarItem.init(lottieAnimateContentView5, title: "我的", image: UIImage(named: "tabbar_my")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
         tabBarItemStyle(navc: v1, normalImg: "tabbar_home", selectorImg: "tabbar_home_pre", title: "社区")
-        tabBarItemStyle(navc: v2, normalImg: "tabbar_shopping", selectorImg: "tabbar_shopping_pre", title: "福利")
+        tabBarItemStyle(navc: v2, normalImg: "tabbar_shopping", selectorImg: "tabbar_shopping_pre", title: "后院")
         v3.tabBarItem = UITabBarItem(title: nil, image: UIImage(named: "tabbar_publish")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: UIImage(named: "tabbar_publish")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal))
         v3.tabBarItem.imageInsets = UIEdgeInsets(top: 4, left: 0, bottom: -4, right: 0);
         tabBarItemStyle(navc: v4, normalImg: "tabbar_massage", selectorImg: "tabbar_massage_pre", title: "消息")

RainbowPlanet/RainbowPlanet/Manager/WebViewJavascriptBridgeManager/WebViewJavascriptBridgeManager.swift

@@ -114,10 +114,7 @@ class WebViewJavascriptBridgeManager: NSObject {
             }
             // 兑换商城
             if wvjbModel?.params?.paramsModelPage == .exchange {
-                BaseTabbarViewController.shared.esTabBarController.selectedIndex = 1
-                if viewController != nil {
-                    viewController?.navigationController?.popToRootViewController(animated: true)
-                }
+                Mediator.push(BackyardModuleRouterType.redemptionArea)
             }
             // 去星球
             if wvjbModel?.params?.paramsModelPage == .planet {

RainbowPlanet/RainbowPlanet/Model/CommunityModel/CommunityFollowFeedModel.swift

@@ -108,7 +108,7 @@ class CommunityFollowRelateDataModel : NSObject, Mappable{
     var praiseCount : Int?
     var pv : Int?
     var title : String?
-    var topic : [CommunityFollowTopicModel]?
+    var topic : [CommunityTopicDataModel]?
     var type : String?
     var uid : Int?
     var username : String?
@@ -153,33 +153,15 @@ class CommunityFollowRelateDataModel : NSObject, Mappable{
     }
 }
 
-class CommunityFollowTopicModel: NSObject, Mappable{
-    
-    var id : Int?
-    var name : String?
-    
-    
-    class func newInstance(map: Map) -> Mappable?{
-        return CommunityFollowTopicModel()
-    }
-    required init?(map: Map){}
-    private override init(){}
-    
-    func mapping(map: Map)
-    {
-        id <- map["id"]
-        name <- map["name"]
-        
-    }
-    
-}
-
 class CommunityFollowPostCommentModel : NSObject, Mappable{
     
     var content : String?
     var id : Int?
     var uid : Int?
     var username : String?
+    var likeCount : Int?
+    var isLike : Int?
+    
     
     
     class func newInstance(map: Map) -> Mappable?{
@@ -194,6 +176,8 @@ class CommunityFollowPostCommentModel : NSObject, Mappable{
         id <- map["id"]
         uid <- map["uid"]
         username <- map["username"]
+        likeCount <- map["like_count"]
+        isLike <- map["is_like"]
         
     }
 }

RainbowPlanet/RainbowPlanet/Model/CommunityModel/CommunityRecommendFeedModel.swift

@@ -49,7 +49,7 @@ class CommunityRecommendDataModel : NSObject, Mappable{
     var pv : Int?
     var showType : String?
     var title : String?
-    var topic : [CommunityRecommendTopicModel]?
+    var topic : [CommunityTopicDataModel]?
     var type : String?
     var uid : Int?
     var username : String?
@@ -157,27 +157,6 @@ class CommunityRecommendTypeDataModel : NSObject, Mappable{
     }
 }
 
-class CommunityRecommendTopicModel: NSObject, Mappable{
-    
-    var id : Int?
-    var name : String?
-    
-    
-    class func newInstance(map: Map) -> Mappable?{
-        return CommunityRecommendTopicModel()
-    }
-    required init?(map: Map){}
-    private override init(){}
-    
-    func mapping(map: Map)
-    {
-        id <- map["id"]
-        name <- map["name"]
-        
-    }
-    
-}
-
 
 class CommunityRecommendCommentModel : NSObject , Mappable{
     
@@ -186,7 +165,9 @@ class CommunityRecommendCommentModel : NSObject , Mappable{
     var reply : [CommunityRecommendReplyModel]?
     var replyCount : Int?
     var username : String?
-    
+    var likeCount : Int?
+    var isLike : Int?
+    var uid : Int?
     
     class func newInstance(map: Map) -> Mappable?{
         return CommunityRecommendCommentModel()
@@ -196,11 +177,14 @@ class CommunityRecommendCommentModel : NSObject , Mappable{
     
     func mapping(map: Map)
     {
-        content <- map["content"]
         id <- map["id"]
+        uid <- map["uid"]
+        content <- map["content"]
         reply <- map["reply"]
         replyCount <- map["reply_count"]
         username <- map["username"]
+        likeCount <- map["like_count"]
+        isLike <- map["is_like"]
         
     }
     

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Planet/CommunityPlanet/CommunityPlanetViewController.swift

@@ -1,5 +1,5 @@
 //
-//  CommunityPlanetViewController.swift
+//  BackyardViewController.swift
 //  RainbowPlanet
 //
 //  Created by 南鑫林 on 2019/6/20.
@@ -13,7 +13,7 @@ import WebViewJavascriptBridge
 import SwiftyJSON
 import MJRefresh
 
-class CommunityPlanetViewController: BaseJSWebViewController {
+class BackyardViewController: BaseJSWebViewController {
     
     deinit {
         NXLLog("deinit")
@@ -25,7 +25,9 @@ class CommunityPlanetViewController: BaseJSWebViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        
         self.URLString = kH5PlanetUrl
+        statusBarStyle = .lightContent
         navigationBar.isHidden = true
         setupViews()
         setupData()
@@ -40,6 +42,7 @@ class CommunityPlanetViewController: BaseJSWebViewController {
     //MARK: - view
     override func setupViews() {
         super.setupViews()
+        self.wkWebView.frame = CGRect(x: 0, y: 0, width: kScreenWidth, height: kScreenHeight-kTabBarTotalHeight)
         self.wkWebView.navigationDelegate = self
     }
     override func setupData() {
@@ -80,7 +83,7 @@ class CommunityPlanetViewController: BaseJSWebViewController {
     }
 }
 
-extension CommunityPlanetViewController : WKNavigationDelegate {
+extension BackyardViewController : WKNavigationDelegate {
     
     //服务器开始请求的时候调用
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
@@ -153,9 +156,3 @@ extension CommunityPlanetViewController : WKNavigationDelegate {
     }
 
 }
-
-extension CommunityPlanetViewController : JXSegmentedListContainerViewListDelegate {
-    func listView() -> UIView {
-        return view
-    }
-}

RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/ViewController/RedemptionAreaViewController.swift

@@ -37,16 +37,13 @@ class RedemptionAreaViewController: BaseViewController {
     }
     
     override func setupViews() {
-        navigationBar.title = "福利"
+        navigationBar.title = "积分商城"
         view.addSubview(tableView)
         view.insertSubview(navigationBar, aboveSubview: tableView)
-        view.addSubview(scrollView)
-        
-        
     }
     
     lazy var tableView: UITableView = {
-        let tableView = UITableView(frame: CGRect(x: 0, y: kNavBarTotalHeight, width: kScreenWidth, height: kScreenHeight - kNavBarTotalHeight - kTabBarTotalHeight), style: UITableView.Style.grouped)
+        let tableView = UITableView(frame: CGRect(x: 0, y: kNavBarTotalHeight, width: kScreenWidth, height: kScreenHeight - kNavBarTotalHeight), style: UITableView.Style.grouped)
         tableView.separatorStyle = .none
         tableView.backgroundColor = UIColor.white
         tableView.dataSource = self
@@ -54,21 +51,6 @@ class RedemptionAreaViewController: BaseViewController {
         return tableView
     }()
     
-    lazy var scrollView: UIScrollView = {
-        let scrollView = UIScrollView(frame: CGRect(x: 0, y: kNavBarTotalHeight, width: kScreenWidth, height: kScreenHeight-kNavBarTotalHeight-kTabBarTotalHeight))
-        scrollView.contentSize = CGSize(width: kScreenWidth, height: 1795*kScaleWidth)
-        scrollView.bounces = false
-        scrollView.isHidden = true
-        scrollView.addSubview(imageView)
-        return scrollView
-    }()
-    
-    lazy var imageView: UIImageView = {
-        let imageView = UIImageView(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: 1795*kScaleWidth))
-        imageView.image = kImage(name: "activity")
-        return imageView
-    }()
-    
     
     override func setupData() {
         tableView.addHeader(withBeginRefresh: true, animation: true) {
@@ -109,18 +91,10 @@ extension RedemptionAreaViewController {
         SwiftMoyaNetWorkServiceCMS.shared().cmsTemplateExchangeApi(completion: {
             [weak self] (cmsRedemptionAreaModel) -> (Void) in
             DIYEmptyView.emptyNoDataTableView(tableView: self?.tableView)
-
             self?.cmsRedemptionAreaModel = cmsRedemptionAreaModel as? CMSRedemptionAreaModel
-            if self?.cmsRedemptionAreaModel?.isShow == 1 {
-                self?.navigationBar.wr_setRightButton(image: kImage(name: "navbar_class_black")!)
-                self?.navigationBar.rightButton.isHidden = false
-                self?.navigationBar.title = self?.cmsRedemptionAreaModel?.title
-                self?.scrollView.isHidden = true
-            }else {
-                self?.navigationBar.rightButton.isHidden = true
-                 self?.navigationBar.title = "福利"
-                self?.scrollView.isHidden = false
-            }
+            self?.navigationBar.wr_setRightButton(image: kImage(name: "navbar_class_black")!)
+            self?.navigationBar.rightButton.isHidden = false
+            self?.navigationBar.title = self?.cmsRedemptionAreaModel?.title
             self?.tableView.reloadData()
             MJRefreshManager.mjRefreshManager(tableView: self?.tableView)
         }) {
@@ -135,12 +109,7 @@ extension RedemptionAreaViewController {
 
 extension RedemptionAreaViewController : UITableViewDelegate, UITableViewDataSource {
     func numberOfSections(in tableView: UITableView) -> Int {
-        if self.cmsRedemptionAreaModel?.isShow == 1 {
-            return self.cmsRedemptionAreaModel?.content?.isEmpty ?? true ? 0 : (self.cmsRedemptionAreaModel?.content?.count)!
-        }else {
-            return 0
-        }
-        
+        return self.cmsRedemptionAreaModel?.content?.isEmpty ?? true ? 0 : (self.cmsRedemptionAreaModel?.content?.count)!
     }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/Action/CardContentActionTableViewCell.swift

@@ -9,6 +9,7 @@
 import UIKit
 import RxSwift
 import Lottie
+import SwiftyMediator
 
 class CardContentActionTableViewCell: UITableViewCell {
     
@@ -52,17 +53,7 @@ class CardContentActionTableViewCell: UITableViewCell {
     
     private func setupLayouts() {
         
-        skittlesButton.snp.makeConstraints { (make) in
-            make.centerY.equalToSuperview()
-            make.left.equalToSuperview().offset(10)
-        }
-        skittlesButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
-        skittlesBgView.snp.remakeConstraints { (make) in
-            make.centerY.equalToSuperview()
-            make.left.equalTo(14)
-            make.right.equalTo(skittlesButton).offset(10)
-            make.height.equalTo(24)
-        }
+        
         shareButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview().offset(1)
             make.right.equalTo(-13)
@@ -84,12 +75,25 @@ class CardContentActionTableViewCell: UITableViewCell {
         praiseAnimationView.snp.makeConstraints { (make) in
             make.edges.equalToSuperview()
         }
+        
+        skittlesButton.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview().offset(10)
+            make.right.lessThanOrEqualTo(praiseButton.snp.left).offset(-14)
+        }
+        skittlesButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
+        skittlesBgView.snp.remakeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(14)
+            make.right.equalTo(skittlesButton).offset(10)
+            make.height.equalTo(24)
+        }
 
     }
     
     private lazy var skittlesBgView: UIView = {
         let skittlesBgView = UIView()
-        skittlesBgView.backgroundColor = kFFF8ECColor
+        skittlesBgView.backgroundColor = kf7f8faColor
         skittlesBgView.cornerRadius = 12
         skittlesBgView.masksToBounds = true
         return skittlesBgView
@@ -97,11 +101,12 @@ class CardContentActionTableViewCell: UITableViewCell {
     
     private lazy var skittlesButton: UIButton = {
         let skittlesButton = UIButton(type: UIButton.ButtonType.custom)
-        skittlesButton.setImage(kImage(name: "ico_bean_org_40px"), for: .normal)
-        skittlesButton.setTitle("666 U米待收获", for: .normal)
-        skittlesButton.setTitleColor(kFFA42FColor, for: .normal)
+        skittlesButton.setImage(kImage(name: "edit_ico_topic_pre"), for: .normal)
+        skittlesButton.setTitleColor(k666666Color, for: .normal)
         skittlesButton.titleLabel?.font = kRegularFont13
-        skittlesButton.isEnabled = false
+        skittlesButton.rx.tap.subscribe(onNext: { [weak self] (data) in
+            Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id: self?.communityTopicDataModel?.id ?? 0))
+        }).disposed(by: disposeBag)
         return skittlesButton
     }()
     
@@ -191,7 +196,6 @@ class CardContentActionTableViewCell: UITableViewCell {
         let praiseButton = UIButton(type: UIButton.ButtonType.custom)
         praiseButton.setImage(kImage(name: "btn_praise_gray"), for: .normal)
         praiseButton.setImage(kImage(name: "btn_praise_pre"), for: .selected)
-        praiseButton.setTitle("268", for: .normal)
         praiseButton.setTitleColor(k666666Color, for: .normal)
         praiseButton.titleLabel?.font = kRegularFont12
         praiseButton.rx.tap.subscribe(onNext: {
@@ -226,9 +230,12 @@ class CardContentActionTableViewCell: UITableViewCell {
         return praiseButton
     }()
     
+    var communityTopicDataModel : CommunityTopicDataModel?
+    
     var communityRecommendDataModel: CommunityRecommendDataModel? {
         didSet {
-            skittlesButton.setTitle("\(communityRecommendDataModel?.willCollectBean ?? 0) U米待收获", for: UIControl.State.normal)
+            communityTopicDataModel = communityRecommendDataModel?.topic?[0]
+            skittlesButton.setTitle("\(communityTopicDataModel?.name ?? "话题")", for: UIControl.State.normal)
             skittlesButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
             
             if communityRecommendDataModel?.isLike == 0 {
@@ -247,9 +254,11 @@ class CardContentActionTableViewCell: UITableViewCell {
         }
     }
     
+    
     var communityFollowDataModel: CommunityFollowDataModel? {
         didSet {
-            skittlesButton.setTitle("\(communityFollowDataModel?.relateData?.willCollectBean ?? 0) U米待收获", for: UIControl.State.normal)
+            communityTopicDataModel = communityFollowDataModel?.relateData?.topic?[0]
+            skittlesButton.setTitle("\(communityTopicDataModel?.name ?? "话题")", for: UIControl.State.normal)
             skittlesButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
             
             if communityFollowDataModel?.relateData?.isLike == 0 {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/CommentList/CardContentCommentListContentTableViewCell.swift

@@ -37,14 +37,24 @@ class CardContentCommentListContentTableViewCell: UITableViewCell {
     private func setupViews() {
         self.selectionStyle = .none
         addSubview(commentLabel)
+        addSubview(likeCountLabel)
+        addSubview(likeButton)
     }
     
     private func setupLayouts() {
         commentLabel.snp_makeConstraints { (make) in
             make.top.equalToSuperview()
             make.left.equalTo(14)
+            make.right.equalTo(likeButton.snp.left).offset(-10)
+        }
+        likeCountLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(0)
             make.right.equalTo(-14)
-            make.bottom.equalToSuperview().offset(-4)
+        }
+        likeButton.snp.makeConstraints { (make) in
+            make.right.equalTo(likeCountLabel.snp.left).offset(-5)
+            make.centerY.equalTo(likeCountLabel)
+            make.size.equalTo(16)
         }
     }
     
@@ -54,9 +64,30 @@ class CardContentCommentListContentTableViewCell: UITableViewCell {
         commentLabel.textColor = k333333Color
         commentLabel.font = kRegularFont14
         commentLabel.isUserInteractionEnabled = true
+        commentLabel.textAlignment = .left
         return commentLabel
     }()
     
+    lazy var likeButton: UIButton = {
+        let likeButton = UIButton(type: UIButton.ButtonType.custom)
+        likeButton.setImage(kImage(name: "btn_praise"), for: UIControl.State.normal)
+        likeButton.setImage(kImage(name: "btn_praise_pre_36px"), for: UIControl.State.selected)
+        likeButton.addTarget(self, action: #selector(likeAction), for: UIControl.Event.touchUpInside)
+        return likeButton
+    }()
+    
+    lazy var likeCountLabel: UILabel = {
+        let likeCountLabel = UILabel()
+        likeCountLabel.textColor = k313334Color
+        likeCountLabel.font = kRegularFont14
+        likeCountLabel.addTapGesture(1, target: self, action:  #selector(likeAction))
+        return likeCountLabel
+    }()
+    
+    @objc func likeAction() {
+        
+    }
+    
     var communityRecommendCommentModel: CommunityRecommendCommentModel? {
         didSet {
             let nameStr = "\(communityRecommendCommentModel?.username ?? ""):"
@@ -68,6 +99,14 @@ class CardContentCommentListContentTableViewCell: UITableViewCell {
                    
                 }
             }
+            
+            let likeCount = "\(communityRecommendCommentModel?.likeCount ?? 0)"
+            likeCountLabel.text = likeCount
+            if communityRecommendCommentModel?.isLike == 1 {
+                likeButton.isSelected = true
+            }else {
+                likeButton.isSelected = false
+            }
         }
     }
     
@@ -82,6 +121,13 @@ class CardContentCommentListContentTableViewCell: UITableViewCell {
                     
                 }
             }
+            let likeCount = "\(communityFollowPostCommentModel?.likeCount ?? 0)"
+            likeCountLabel.text = likeCount
+            if communityFollowPostCommentModel?.isLike == 1 {
+                likeButton.isSelected = true
+            }else {
+                likeButton.isSelected = false
+            }
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/CommentList/CardContentCommentListFooterView.swift

@@ -26,7 +26,7 @@ class CardContentCommentListFooterView: BaseView {
     
     private lazy var allCommentLabel: UILabel = {
         let allCommentLabel = UILabel()
-        allCommentLabel.text = "共300条评论"
+        allCommentLabel.text = "共3条评论"
         allCommentLabel.textColor = k999999Color
         allCommentLabel.font = kRegularFont13
         return allCommentLabel

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/CommentList/CardContentCommentListTableViewCell.swift

@@ -133,15 +133,23 @@ extension CardContentCommentListTableViewCell : UITableViewDelegate,UITableViewD
             let communityFollowPostCommentModel = communityFollowDataModel?.relateData?.postComment?[indexPath.row]
             let nameStr = "\(communityFollowPostCommentModel?.username ?? ""):"
             let contentStr = "\(communityFollowPostCommentModel?.content ?? "")"
+            
+            let likeCountStr = "\(communityFollowPostCommentModel?.likeCount ?? 0)"
+            let likeWidth = likeCountStr.widthForComment(font: kRegularFont14!, height: 25.5)
+            
             let str =  nameStr + contentStr
-            let strHeight = str.heightForComment(font: kRegularFont14!, width: kScreenWidth-28)
+            let strHeight = (str.heightForComment(font: kRegularFont14!, width: kScreenWidth-28-10-16-5-likeWidth) + 5)
             return strHeight
         }else {
             let communityRecommendCommentModel = communityRecommendDataModel?.comment?[indexPath.row]
             let nameStr = "\(communityRecommendCommentModel?.username ?? ""):"
             let contentStr = "\(communityRecommendCommentModel?.content ?? "")"
+            
+            let likeCountStr = "\(communityRecommendCommentModel?.likeCount ?? 0)"
+            let likeWidth = likeCountStr.widthForComment(font: kRegularFont14!, height: 25.5)
+            
             let str =  nameStr + contentStr
-            let strHeight = str.heightForComment(font: kRegularFont14!, width: kScreenWidth-28)
+            let strHeight = (str.heightForComment(font: kRegularFont14!, width: kScreenWidth-28-10-16-5-likeWidth) + 5)
             return strHeight
         }
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/CommunityNavigationBarView.swift

@@ -51,7 +51,7 @@ class CommunityNavigationBarView: BaseView {
     
     override func setupViews() {
 
-        addSubview(leftButton)
+//        addSubview(leftButton)
         addSubview(rightButton)
         setScrollNumberLabel()
         addSubview(searchBgView)
@@ -100,11 +100,11 @@ class CommunityNavigationBarView: BaseView {
     
     override func setupLayouts() {
         
-        leftButton.snp.makeConstraints { (make) in
-            make.centerY.equalToSuperview()
-            make.left.equalToSuperview().offset(16)
-            make.size.equalTo(20)
-        }
+//        leftButton.snp.makeConstraints { (make) in
+//            make.centerY.equalToSuperview()
+//            make.left.equalToSuperview().offset(16)
+//            make.size.equalTo(20)
+//        }
         
         rightButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
@@ -126,7 +126,7 @@ class CommunityNavigationBarView: BaseView {
             make.centerY.equalToSuperview()
             make.height.equalTo(30)
             make.right.equalTo(rightButton.snp.left).offset(-10)
-            make.left.equalTo(leftButton.snp.right).offset(10)
+            make.left.equalTo(10)
         }
         
         searchIconImageView.snp.makeConstraints { (make) in

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift

@@ -289,6 +289,8 @@ extension CommunityFollowViewController {
             communityFollowPostCommentModel.content = text
             communityFollowPostCommentModel.id = communityPostCommentIdModel?.id
             communityFollowPostCommentModel.username = UserModel.shared().getModel()?.username
+            communityFollowPostCommentModel.uid = UserModel.shared().getModel()?.uid
+
             
             if  self?.communityFollowDataModel?.relateData?.postComment?.isEmpty ?? true {
                 self?.communityFollowDataModel?.relateData?.postComment = Array<CommunityFollowPostCommentModel>()
@@ -644,8 +646,12 @@ extension CommunityFollowViewController : UITableViewDelegate,UITableViewDataSou
                     
                     let nameStr = "\(communityFollowPostCommentModel.username ?? ""):"
                     let contentStr = "\(communityFollowPostCommentModel.content ?? "")"
+                    
+                    let likeCountStr = "\(communityFollowPostCommentModel.likeCount ?? 0)"
+                    let likeWidth = likeCountStr.widthForComment(font: kRegularFont14!, height: 25.5)
+                    
                     let str =  nameStr + contentStr
-                    let strHeight = str.heightForComment(font: kRegularFont14!, width: kScreenWidth-28)
+                    let strHeight = (str.heightForComment(font: kRegularFont14!, width:  kScreenWidth-28-10-16-5-likeWidth) + 10)
                     height = (height ?? 0) + strHeight
                 }
                 
@@ -658,7 +664,7 @@ extension CommunityFollowViewController : UITableViewDelegate,UITableViewDataSou
             return 0
         //评论
         case 5:
-            return 58
+            return 50
         default:
             return 0
         }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -123,7 +123,7 @@ class CommunityViewController: BaseViewController {
             if UserModel.isTokenNil() {
                 kAppDelegate.setLogin()
             }else {
-                self?.reloadSegmentedStarView()
+                self?.tabBarController?.selectedIndex = 1
             }
         }
         

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendViewController.swift

@@ -210,6 +210,7 @@ extension CommunityRecommnendViewController {
             communityRecommendCommentModel.content = text
             communityRecommendCommentModel.id = communityPostCommentIdModel?.id
             communityRecommendCommentModel.username = UserModel.shared().getModel()?.username
+            communityRecommendCommentModel.uid = UserModel.shared().getModel()?.uid
             
             if  self?.communityRecommendDataModel?.comment?.isEmpty ?? true {
                 self?.communityRecommendDataModel?.comment = Array<CommunityRecommendCommentModel>()
@@ -518,8 +519,12 @@ extension CommunityRecommnendViewController : UITableViewDelegate,UITableViewDat
                         
                         let nameStr = "\(communityRecommendCommentModel.username ?? ""):"
                         let contentStr = "\(communityRecommendCommentModel.content ?? "")"
+                        
+                        let likeCountStr = "\(communityRecommendCommentModel.likeCount ?? 0)"
+                        let likeWidth = likeCountStr.widthForComment(font: kRegularFont14!, height: 25.5)
+                        
                         let str =  nameStr + contentStr
-                        let strHeight = str.heightForComment(font: kRegularFont14!, width: kScreenWidth-28)
+                        let strHeight = (str.heightForComment(font: kRegularFont14!, width:  kScreenWidth-28-10-16-5-likeWidth) + 5)
                         height = (height ?? 0) + strHeight
                     }
                     
@@ -532,7 +537,7 @@ extension CommunityRecommnendViewController : UITableViewDelegate,UITableViewDat
                 return 0
             //评论
             case 5:
-                return 58
+                return 50
             default:
                 return 0
             }

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

@@ -347,6 +347,7 @@ extension CommunityFeaturedTopicsViewController {
             communityRecommendCommentModel.content = text
             communityRecommendCommentModel.id = communityPostCommentIdModel?.id
             communityRecommendCommentModel.username = UserModel.shared().getModel()?.username
+            communityRecommendCommentModel.uid = UserModel.shared().getModel()?.uid
             
             if  self?.communityRecommendDataModel?.comment?.isEmpty ?? true {
                 self?.communityRecommendDataModel?.comment = Array<CommunityRecommendCommentModel>()
@@ -574,8 +575,11 @@ extension CommunityFeaturedTopicsViewController : UITableViewDelegate,UITableVie
                     
                     let nameStr = "\(communityRecommendCommentModel.username ?? ""):"
                     let contentStr = "\(communityRecommendCommentModel.content ?? "")"
+                    let likeCountStr = "\(communityRecommendCommentModel.likeCount ?? 0)"
+                    let likeWidth = likeCountStr.widthForComment(font: kRegularFont14!, height: 25.5)
+                    
                     let str =  nameStr + contentStr
-                    let strHeight = str.heightForComment(font: kRegularFont14!, width: kScreenWidth-28)
+                    let strHeight = (str.heightForComment(font: kRegularFont14!, width:  kScreenWidth-28-10-16-5-likeWidth) + 5)
                     height = (height ?? 0) + strHeight
                 }
                 
@@ -588,7 +592,7 @@ extension CommunityFeaturedTopicsViewController : UITableViewDelegate,UITableVie
             return 0
         //评论
         case 5:
-            return 58
+            return 50
         default:
             return 0
         }

RainbowPlanet/RainbowPlanet/Router/BackyardModuleRouterType.swift

@@ -0,0 +1,30 @@
+//
+//  BackyardModuleRouterType.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/9/23.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+import SwiftyMediator
+/// RongCloudIM模块
+///
+/// - IMChatRoom: 聊天室
+
+/// 后院模块
+///
+/// - redemptionArea: 积分商城
+public enum BackyardModuleRouterType: MediatorTargetType {
+    case redemptionArea
+}
+
+extension BackyardModuleRouterType: MediatorSourceType {
+    public var viewController: UIViewController? {
+        switch self {
+        case .redemptionArea:
+            let vc = RedemptionAreaViewController()
+            return vc
+        }
+    }
+}

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/StarRating/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/CommunityModule.xcassets/activity.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Tools/FMLabel/FMLinkLabel.h

@@ -71,4 +71,4 @@ typedef void(^FMLinkLabelClickItemBlock)(id transmitBody);
 
 @property(nonatomic, copy)NSString *attachmentName;
 
-@end
+@end

RainbowPlanet/RainbowPlanet/Tools/FMLabel/FMLinkLabel.m

@@ -38,6 +38,7 @@
     [super awakeFromNib];
     [self setUp];
 }
+    
 /**
  *  初始化
  */
@@ -47,7 +48,9 @@
     self.userInteractionEnabled = YES;
     self.clipsToBounds = YES;
     self.textView.font = self.font;
-    self.textView.frame = CGRectMake(-5, -8, self.bounds.size.width + 10,  self.bounds.size.height + 18);
+    self.textView.frame = self.frame;
+    self.textView.textContainerInset = UIEdgeInsetsZero;
+    self.textView.textContainer.lineFragmentPadding = 0;
 }
 /**
  *  添加一个点击事件