修复了提问题功能

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

@@ -291,8 +291,11 @@ class CircleHeaderView: BaseView {
             bgImageView.kf.setImage(with: kURLImage(name: communityCircleModel?.image ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = communityCircleModel?.name
             avatarImageView.kf.setImage(with: kURLImage(name: communityCircleModel?.image ?? "default_avatar"), placeholder: kImage(name: "default_avatar"))
-            memberNumberLabel.text = "  \(communityCircleModel?.members?.extra ?? 0)"
-            albumNumberLabel.text = "  \(communityCircleModel?.pictures?.extra ?? 0)"
+            
+            memberNumberLabel.text = TGCaculateNumberTool.string(fromNumber: Double(communityCircleModel?.members?.extra ?? 0), toFixedCount: 1, roundingMode: TGCNRoundingMode.onlyDown)
+            
+            albumNumberLabel.text = TGCaculateNumberTool.string(fromNumber: Double(communityCircleModel?.pictures?.extra ?? 0), toFixedCount: 1, roundingMode: TGCNRoundingMode.onlyDown)
+
             
             if communityCircleModel?.notice == nil ||  communityCircleModel?.notice == "" {
                 bottomView.isHidden = true
@@ -338,7 +341,7 @@ class CircleHeaderView: BaseView {
         self.communityCircleModel?.isJoin = 1
         SwiftProgressHUD.shared().showText("加入成功")
         self.communityCircleModel?.members?.extra = (self.communityCircleModel?.members?.extra ?? 0) + 1
-        self.memberNumberLabel.text = "\(self.communityCircleModel?.members?.extra ?? 0)"
+        self.memberNumberLabel.text = TGCaculateNumberTool.string(fromNumber: Double(communityCircleModel?.members?.extra ?? 0), toFixedCount: 1, roundingMode: TGCNRoundingMode.onlyDown)
     }
     /// 退出圈子
     func dropOutSuccess() {
@@ -346,8 +349,7 @@ class CircleHeaderView: BaseView {
         self.communityCircleModel?.isJoin = 0
         SwiftProgressHUD.shared().showText("退出成功")
         self.communityCircleModel?.members?.extra = (self.communityCircleModel?.members?.extra ?? 1) - 1
-        self.memberNumberLabel.text = "\(self.communityCircleModel?.members?.extra ?? 0)"
-        
+        self.memberNumberLabel.text = TGCaculateNumberTool.string(fromNumber: Double(communityCircleModel?.members?.extra ?? 0), toFixedCount: 1, roundingMode: TGCNRoundingMode.onlyDown)        
     }
     
     

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

@@ -46,7 +46,13 @@ class CircleLeavingMessageView: BaseView {
         })
     }
     
-    private lazy var tableView: UITableView = {
+    var isRefresh : Bool? {
+        didSet {
+            communityCircleMessagesGetApi(page: 1)
+        }
+    }
+    
+    lazy var tableView: UITableView = {
         let tableView = UITableView(frame: CGRect.zero, style: UITableView.Style.grouped)
         tableView.separatorStyle = .none
         tableView.backgroundColor = kf7f8faColor

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

@@ -30,6 +30,7 @@ class CircleViewController: BaseViewController {
     let JXHeightForHeaderInSection: Int = 44
     var communityCircleModel : CommunityCircleModel?
     var cmsTemplateTitles = ["精选", "提问"]
+    var circleLeavingMessageView : CircleLeavingMessageView?
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -190,11 +191,10 @@ class CircleViewController: BaseViewController {
     }()
     
     func reloadCircleLeavingMessageView() {
+        self.circleLeavingMessageView?.isRefresh = true
         self.segmentedView.selectItemAt(index: 1)
-        self.segmentedView.defaultSelectedIndex = 1
-        self.segmentedDataSource.reloadData(selectedIndex: 1)
-        self.pagingView.listContainerView.defaultSelectedIndex = 1
-        self.pagingView.listContainerView.reloadData()
+        self.segmentedView.reloadData()
+
     }
     
     //1.初始化JXSegmentedView
@@ -316,6 +316,7 @@ extension CircleViewController : JXPagingViewDelegate {
             let view = CircleLeavingMessageView()
             view.circleId = circleId
             view.communityCircleModel = communityCircleModel
+            circleLeavingMessageView = view
             return view
         }
     }

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

@@ -218,9 +218,7 @@ 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: "\(2)"))
-
+            Mediator.push(CircleRouterModuleType.circle(circleId: "\(self?.communityTopicDetailModel?.circle?.id ?? 0)"))
         }).disposed(by: disposeBag)
         
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("followApi"), object: nil, queue: OperationQueue.main) { [weak self] (notification) in
@@ -359,12 +357,12 @@ extension CommunityFeaturedTopicsViewController {
             self?.communityFeaturedTopicsHeaderView.communityTopicDetailModel = self?.communityTopicDetailModel
             self?.tableView.tableHeaderView = self?.communityFeaturedTopicsHeaderView
             
-//            if self?.communityTopicDetailModel?.circle != nil {
+            if self?.communityTopicDetailModel?.circle?.id != nil {
                 self?.circleButton.isHidden = false
                 self?.circleButton.setTitle("    \( self?.communityTopicDetailModel?.circle?.name ?? "")    ", for: UIControl.State.normal)
-//            } else {
-//                self?.circleButton.isHidden = true
-//            }
+            } else {
+                self?.circleButton.isHidden = true
+            }
         
         }
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/AllCommentCell/RecommendMajorCommentCell.swift

@@ -100,7 +100,7 @@ class RecommendMajorCommentCell: UITableViewCell {
     private lazy var iconButton : UIButton = {
         let iconButton = UIButton(type: UIButton.ButtonType.custom)
         iconButton.setImage(kImage(name: "default_avatar"), for: UIControl.State.normal)
-        iconButton.cornerRadius = 12
+        iconButton.cornerRadius = 19
         iconButton.masksToBounds = true
         iconButton.rx.tap.subscribe(onNext: { [weak self] in
             if UserModel.shared().getModel()?.uid != self?.communityPostCommentModel?.uid {

RainbowPlanet/RainbowPlanet/Modules/H5Modules/H5Common/ViewController/H5CommonViewController.swift

@@ -18,11 +18,12 @@ class H5CommonViewController: BaseJSWebBaseViewController {
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
         KingfisherManager.shared.cache.clearDiskCache()
-//        KingfisherManager.shared.cache.clearMemoryCache()
+        KingfisherManager.shared.cache.clearMemoryCache()
     }
     
     deinit {
         NXLLog("deinit")
+        wkWebView.removeObserver(self, forKeyPath: "estimatedProgress")
         if observe != nil {
             NotificationCenter.default.removeObserver(observe!)
         }