后端对接

RainbowPlanet/RainbowPlanet/Manager/WebViewJavascriptBridgeManager/WebViewJavascriptBridgeManager.swift

@@ -189,6 +189,13 @@ class WebViewJavascriptBridgeManager: NSObject {
                 }
             }
             
+            // 圈子
+            if wvjbModel?.params?.paramsModelPage == .circle {
+                if wvjbModel?.params?.payload?.circleId != nil {
+                    Mediator.push(CircleRouterModuleType.circle(circleId: "\(wvjbModel?.params?.payload?.circleId ?? 0)"))
+                }
+            }
+            
         }
         
     }

RainbowPlanet/RainbowPlanet/Model/WVJBModel/WVJBModel.swift

@@ -85,6 +85,7 @@ enum WVJBParamsModelPage : String {
     case user = "user"
     case signin = "signin"
     case chatroom = "chatroom"
+    case circle = "circle"
     
 }
 /// WebViewJavascriptBridgeParameterModel 简写 WVJBParameterModel
@@ -177,6 +178,7 @@ class WVJBPayloadModel:NSObject,Mappable {
     var uid : Int?
     var roomId : String?
     var roomName : String?
+    var circleId : Int?
     
     
     class func newInstance(map: Map) -> Mappable?{
@@ -190,6 +192,8 @@ class WVJBPayloadModel:NSObject,Mappable {
         uid <- map["uid"]
         roomId <- map["room_id"]
         roomName <- map["room_name"]
+        circleId <- map["circle_id"]
+        
     }
     
 }

RainbowPlanet/RainbowPlanet/Modules/CircleModule/Circle/View/CircleEssenceView/CircleEssenceView.swift

@@ -141,6 +141,7 @@ class CircleEssenceView: BaseView {
         SwiftMoyaNetWorkServiceCommunity.shared().communityCircleArticlesApi(id: circleId ?? 0, page: page, completion: {
             [weak self] (communityRecommendFeedModel) -> (Void) in
             let communityRecommendFeedModel = communityRecommendFeedModel as? CommunityRecommendFeedModel
+            DIYEmptyView.emptyNoDataTableView(tableView: self?.tableView)
             if communityRecommendFeedModel?.pagination?.currentPage == 1{
                 self?.communityRecommendDataModels.removeAll()
                 self?.tableView.resetNoMoreData()

RainbowPlanet/RainbowPlanet/Modules/CircleModule/Circle/View/CircleLeavingMessageView/CircleLeavingMessageView.swift

@@ -68,6 +68,7 @@ class CircleLeavingMessageView: BaseView {
     func communityCircleMessagesGetApi(page: Int) {
         SwiftMoyaNetWorkServiceCommunity.shared().communityCircleMessagesGetApi(id: circleId ?? 0, page: page, completion: {
             [weak self] (communityCircleMessagesModel) -> (Void) in
+            DIYEmptyView.emptyNoDataTableView(tableView: self?.tableView)
             let communityCircleMessagesModel = communityCircleMessagesModel as? CommunityCircleMessagesModel
             if communityCircleMessagesModel?.pagination?.currentPage == 1{
                 self?.communityCircleMessageModels.removeAll()

RainbowPlanet/RainbowPlanet/Modules/CircleModule/CircleQuestionsAnswers/ViewController/CircleQuestionsAnswersViewController.swift

@@ -44,14 +44,6 @@ class CircleQuestionsAnswersViewController: BaseViewController {
     }
     
     override func setupLayouts() {
-        navigationBar.titleLabel.snp.remakeConstraints { (make) in
-            make.top.equalTo(kSafeStatusBarHeight + 4)
-            make.centerX.equalToSuperview()
-        }
-        subtitleLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(navigationBar.titleLabel.snp.bottom)
-            make.centerX.equalToSuperview()
-        }
         submitButton.snp.makeConstraints { (make) in
             make.bottom.equalTo(-(kSafeTabBarHeight + 16))
             make.left.equalTo(25)
@@ -71,7 +63,7 @@ class CircleQuestionsAnswersViewController: BaseViewController {
         let subtitleLabel = UILabel()
         subtitleLabel.textColor = kbbbbbbColor
         subtitleLabel.font = kRegularFont11
-        subtitleLabel.text = "今日剩余 0 次答题机会"
+        subtitleLabel.isHidden = true
         return subtitleLabel
     }()
     
@@ -102,7 +94,26 @@ class CircleQuestionsAnswersViewController: BaseViewController {
         SwiftMoyaNetWorkServiceCommunity.shared().communityCircleQuestionApi(circleId: circleId ?? 0, completion: {
             [weak self] (communityCircleQuestionsAnswersModel) -> (Void) in
             self?.communityCircleQuestionsAnswersModel = communityCircleQuestionsAnswersModel as? CommunityCircleQuestionsAnswersModel
-            self?.subtitleLabel.text = "今日剩余 \( self?.communityCircleQuestionsAnswersModel?.answerCount ?? 0) 次答题机会"
+            if self?.communityCircleQuestionsAnswersModel?.answerCount == -1 {
+                self?.subtitleLabel.isHidden = true
+                self?.navigationBar.titleLabel.snp.remakeConstraints { (make) in
+                    make.centerY.equalTo((self?.navigationBar.leftButton)!)
+                    make.centerX.equalToSuperview()
+                }
+            }else {
+                
+                self?.subtitleLabel.text = "今日剩余 \( self?.communityCircleQuestionsAnswersModel?.answerCount ?? 0) 次答题机会"
+                self?.navigationBar.titleLabel.snp.remakeConstraints { (make) in
+                    make.top.equalTo(kSafeStatusBarHeight + 4)
+                    make.centerX.equalToSuperview()
+                }
+                self?.subtitleLabel.snp.makeConstraints { (make) in
+                    make.top.equalTo((self?.navigationBar.titleLabel.snp.bottom)!)
+                    make.centerX.equalToSuperview()
+                }
+                self?.subtitleLabel.isHidden = false
+
+            }
             self?.submitButton.isHidden = false
             self?.tableView.reloadData()
         }) { (loadingStatus) in