no message

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -303,6 +303,7 @@
 		A784F2BD2350730C00E49140 /* PublishNewPopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A784F2BC2350730C00E49140 /* PublishNewPopView.swift */; };
 		A784F2C623544B4A00E49140 /* CircleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A784F2C523544B4A00E49140 /* CircleViewController.swift */; };
 		A784F2C923544CA500E49140 /* CircleRouterModuleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A784F2C823544CA500E49140 /* CircleRouterModuleType.swift */; };
+		A784F2CC23547C9600E49140 /* CommunityCircleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A784F2CB23547C9600E49140 /* CommunityCircleModel.swift */; };
 		A78A5F7622FAA03800DD1764 /* share_iSpt.gif in Resources */ = {isa = PBXBuildFile; fileRef = A78A5F7522FAA03800DD1764 /* share_iSpt.gif */; };
 		A78A5F7822FAC7F000DD1764 /* SetGenderModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A78A5F7722FAC7F000DD1764 /* SetGenderModel.swift */; };
 		A78CEE0A22E0864100C512A4 /* BaseLottieAnimateContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A78CEE0922E0864100C512A4 /* BaseLottieAnimateContentView.swift */; };
@@ -994,6 +995,7 @@
 		A784F2BC2350730C00E49140 /* PublishNewPopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishNewPopView.swift; sourceTree = "<group>"; };
 		A784F2C523544B4A00E49140 /* CircleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircleViewController.swift; sourceTree = "<group>"; };
 		A784F2C823544CA500E49140 /* CircleRouterModuleType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircleRouterModuleType.swift; sourceTree = "<group>"; };
+		A784F2CB23547C9600E49140 /* CommunityCircleModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommunityCircleModel.swift; sourceTree = "<group>"; };
 		A78A5F7522FAA03800DD1764 /* share_iSpt.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = share_iSpt.gif; sourceTree = "<group>"; };
 		A78A5F7722FAC7F000DD1764 /* SetGenderModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetGenderModel.swift; sourceTree = "<group>"; };
 		A78CEE0922E0864100C512A4 /* BaseLottieAnimateContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseLottieAnimateContentView.swift; sourceTree = "<group>"; };
@@ -4095,6 +4097,7 @@
 		A7D5F25D22C0612A00F8E9AF /* CommunityModel */ = {
 			isa = PBXGroup;
 			children = (
+				A784F2CB23547C9600E49140 /* CommunityCircleModel.swift */,
 				A7811C99231F908C00C2D8DE /* CommunityRecommendCategorysModel.swift */,
 				A7D5F25E22C0614400F8E9AF /* CommunityTopicCategoryModel.swift */,
 				A72623D222C1FFD100AEF875 /* CommunityPostMyModel.swift */,
@@ -5856,6 +5859,7 @@
 				A72A72D522321E2700B21995 /* ColorMacro.swift in Sources */,
 				BD0FAA5C22C4C32E00DDFB37 /* AliyunCropViewController.m in Sources */,
 				BD1DC6CD228D160D00B89C57 /* OrderPurchaseModel.swift in Sources */,
+				A784F2CC23547C9600E49140 /* CommunityCircleModel.swift in Sources */,
 				A7CC7526227196A8003C4F38 /* AccountSecurityTableViewCell.swift in Sources */,
 				A7D5F25722C05BE900F8E9AF /* UserDetailModel.swift in Sources */,
 				BDE8AD1622CC59EE00E03C65 /* CommunityVideoListModel.swift in Sources */,

RainbowPlanet/RainbowPlanet/Model/CommunityModel/CommunityCircleModel.swift

@@ -0,0 +1,64 @@
+//
+//	CommunityCircleModel.swift
+//	Model file generated using JSONExport: https://github.com/Ahmed-Ali/JSONExport
+
+import Foundation 
+import ObjectMapper
+
+
+class CommunityCircleModel : NSObject, Mappable{
+
+	var chatroom : CommunityCircleFunctionsModel?
+	var id : Int?
+	var image : String?
+	var isJoin : Int?
+	var joinLimit : Int?
+	var members : CommunityCircleFunctionsModel?
+	var name : String?
+	var notice : String?
+	var pictures : CommunityCircleFunctionsModel?
+
+
+	class func newInstance(map: Map) -> Mappable?{
+		return CommunityCircleModel()
+	}
+	required init?(map: Map){}
+	private override init(){}
+
+	func mapping(map: Map)
+	{
+		chatroom <- map["chatroom"]
+		id <- map["id"]
+		image <- map["image"]
+		isJoin <- map["is_join"]
+		joinLimit <- map["join_limit"]
+		members <- map["members"]
+		name <- map["name"]
+		notice <- map["notice"]
+		pictures <- map["pictures"]
+		
+	}
+
+}
+
+class CommunityCircleFunctionsModel : NSObject, Mappable{
+    
+    var extra : String?
+    var isOpen : Int?
+    
+    
+    class func newInstance(map: Map) -> Mappable?{
+        return CommunityCircleFunctionsModel()
+    }
+    required init?(map: Map){}
+    private override init(){}
+    
+    func mapping(map: Map)
+    {
+        extra <- map["extra"]
+        isOpen <- map["is_open"]
+        
+    }
+    
+}
+

RainbowPlanet/RainbowPlanet/Modules/CircleModule/Circle/ViewController/CircleViewController.swift

@@ -59,6 +59,18 @@ class CircleViewController: BaseViewController {
         navigationBar.onClickRightButton = {
             [weak self] in
             
+        }
+        loadCircle()
+        
+    }
+    
+    
+    /// 加载圈子详情
+    func loadCircle() {
+        SwiftMoyaNetWorkServiceCommunity.shared().communityCircleApi(id: circleId ?? 0, completion: { (communityCircleModel) -> (Void) in
+            
+        }) { (loadingStatus) in
+            
         }
     }
     

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

@@ -218,7 +218,9 @@ class CommunityFeaturedTopicsViewController: BaseViewController {
         }
         
         circleButton.rx.tap.subscribe(onNext: { [weak self] _ in
-            Mediator.push(CircleRouterModuleType.circle(circleId: "\(self?.communityTopicDetailModel?.circle?.id ?? 0)"))
+//            Mediator.push(CircleRouterModuleType.circle(circleId: "\(self?.communityTopicDetailModel?.circle?.id ?? 0)"))
+            Mediator.push(CircleRouterModuleType.circle(circleId: "\(2)"))
+
         }).disposed(by: disposeBag)
         
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("followApi"), object: nil, queue: OperationQueue.main) { [weak self] (notification) in

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceCommunity/SwiftMoyaNetWorkServiceCommunity.swift

@@ -576,7 +576,25 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
                 completion("")
             }) {
                 (loadingStatus) in
+               
             }
         })
     }
+    
+    
+    /// 圈子详情
+    ///
+    /// - Parameters:
+    ///   - id: 圈子Id
+    ///   - completion: 完成
+    ///   - fail: 失败
+    func communityCircleApi(id:Int,completion: @escaping successCallBack,fail: @escaping failCallback) {
+        var parameters = Dictionary<String,Any>()
+        parameters.updateValue(id, forKey: "id")
+        SwiftMoyaNetWorkManager.shared.requestObject(CommunityCircleModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityCircle(parameters: parameters)), completion: { (communityCircleModel) in
+            completion(communityCircleModel)
+        }) { (loadingStatus) in
+             fail(loadingStatus)
+        }
+    }
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceCommunity/SwiftMoyaServiceCommunityApi.swift

@@ -92,30 +92,34 @@ public let kCommunityPostCommentsApi = "/community/post/comment"
 /// 回复列表
 public let kCommunityPostReplyApi = "/community/post/reply"
 
-//// MARK: - 评论&回复
+// MARK: - 评论&回复
 ///// 评论&回复
 public let kCommunityPostCommentApi = "/community/post/comment"
 
-//// MARK: - 删除评论
-///// 删除评论
+// MARK: - 删除评论
+/// 删除评论
 public let kCommunityPostDeleteCommentApi = "/community/post/comment"
 
-//// MARK: - 用户上传音乐
-///// 用户上传音乐
+// MARK: - 用户上传音乐
+/// 用户上传音乐
 public let kCommunityUploadMusicApi = "/community/music/upload"
 
-//// MARK: - 热门推荐音乐列表
-///// 热门推荐音乐列表
+// MARK: - 热门推荐音乐列表
+/// 热门推荐音乐列表
 public let kCommunityRecMusicListApi = "/community/musicList"
 
-//// MARK: - 获取音乐分类
-///// 获取音乐分类
+// MARK: - 获取音乐分类
+/// 获取音乐分类
 public let kCommunityGetMusicCategoryApi = "/community/category/list"
 
-//// MARK: - 获取分类下所有音乐
-///// 获取分类下所有音乐
+// MARK: - 获取分类下所有音乐
+/// 获取分类下所有音乐
 public let kCommunityCateMusicListApi = "/community/music"
 
+// MARK: - 圈子详情
+/// 圈子详情
+public let kCommunityCircleApi = "/community/circle"
+
 /// 社区
 ///
 /// - communityTopicCategory: 话题组列表
@@ -144,6 +148,8 @@ public let kCommunityCateMusicListApi = "/community/music"
 /// - communityRecMusicList : 热门推荐音乐列表
 /// - communityGetMusicCategory : 获取音乐分类
 /// - communityCateMusicList : 获取分类下所有音乐
+/// - communityCircle : 圈子详情
+
 
 public enum SwiftMoyaServiceCommunityApi {
     case communityTopicCategory(parameters:Dictionary<String, Any>)
@@ -173,6 +179,7 @@ public enum SwiftMoyaServiceCommunityApi {
     case communityRecMusicList(parameters:Dictionary<String, Any>)
     case communityGetMusicCategory(parameters:Dictionary<String, Any>)
     case communityCateMusicList(parameters:Dictionary<String, Any>)
+    case communityCircle(parameters:Dictionary<String, Any>)
 }
 
 extension SwiftMoyaServiceCommunityApi: TargetType {
@@ -205,7 +212,8 @@ extension SwiftMoyaServiceCommunityApi: TargetType {
              .communityUploadMusic,
              .communityRecMusicList,
              .communityGetMusicCategory,
-             .communityCateMusicList
+             .communityCateMusicList,
+             .communityCircle
             :
             return URL(string: kApiDataPrefix())!
         }
@@ -267,6 +275,8 @@ extension SwiftMoyaServiceCommunityApi: TargetType {
             return kCommunityGetMusicCategoryApi
         case .communityCateMusicList:
             return kCommunityCateMusicListApi
+        case .communityCircle:
+            return kCommunityCircleApi
         }
     }
     
@@ -297,7 +307,8 @@ extension SwiftMoyaServiceCommunityApi: TargetType {
              .communityPostReply,
              .communityRecMusicList,
              .communityGetMusicCategory,
-             .communityCateMusicList
+             .communityCateMusicList,
+             .communityCircle
             :
             return .get
         case .communityMemberFollowTopicCancelFollow,
@@ -338,7 +349,8 @@ extension SwiftMoyaServiceCommunityApi: TargetType {
              .communityUploadMusic(var parameters),
              .communityRecMusicList(var parameters),
              .communityGetMusicCategory(var parameters),
-             .communityCateMusicList(var parameters)
+             .communityCateMusicList(var parameters),
+             .communityCircle(var parameters)
             :
             let sign = SwiftSign.shared().sign(signType:.AccessToken, parameters: parameters)
             parameters.updateValue(sign, forKey: "sign")
@@ -387,7 +399,8 @@ extension SwiftMoyaServiceCommunityApi: TargetType {
              .communityUploadMusic,
              .communityRecMusicList,
              .communityGetMusicCategory,
-             .communityCateMusicList
+             .communityCateMusicList,
+             .communityCircle
             :
             return (headerParameters(headerType: .tokenHeader) as! [String : String])
         }