修改bug

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -99,12 +99,6 @@ extension AppDelegate {
         KingfisherManager.shared.cache.clearDiskCache()
     }
     
-    func setKingfisherManager() {
-        KingfisherManager.shared.cache.calculateDiskCacheSize { (size) in
-            NXLLog("disk size in bytes: \(size)")
-        }
-    }
-    
 
     /// 登录
     func setLogin() {

RainbowPlanet/RainbowPlanet/Base/BaseWebViewController/BaseJSWebBaseViewController.swift

@@ -49,15 +49,6 @@ class BaseJSWebBaseViewController: BaseViewController {
             webloadType(.HTMLName(name: HTMLName!))
         }
         
-        navigationBar.onClickLeftButton = {
-            [weak self] in
-            self?.wkWebView.stopLoading()
-            if (self?.wkWebView.canGoBack)! {
-                self?.goBack()
-            }else {
-                self?.navigationController?.popViewController(animated: true)
-            }
-        }
     }
     
     lazy var bridge: WebViewJavascriptBridge = {

RainbowPlanet/RainbowPlanet/Macro/Common.swift

@@ -92,15 +92,6 @@ func kURLImage(name :String) -> URL? {
     return URL(string: name)
 }
 
-/// 返回缩略图url图片
-///
-/// - Parameters:
-///   - name: 图片Str
-///   - size: 图片尺寸
-/// - Returns: 图片url
-func kURLThumbnailsImage(name:String,size: CGSize) -> URL? {
-    return URL(string: ThumbnailsManager.thumbnails(imgStr: name, size: size))
-}
 
 //MARK: - 返回一个颜色
 /// 返回一个颜色

RainbowPlanet/RainbowPlanet/Manager/AliyunVodManager/AliyunVodUpToyoPublishManager/AliyunVodupToyoPublishManager.swift

@@ -134,11 +134,14 @@ extension AliyunVodUpToyoPublishManager {
         SwiftMoyaNetWorkServiceCommunity.shared().communityPublishApi(type: "video", img: self.aliyunVodUpToYoPublishModel?.pushVideoCoverImageUrl ?? "", topic_ids: topicJsonStr, video: self.aliyunVodUpToYoPublishModel?.pushVideoId ?? "", title: self.aliyunVodUpToYoPublishModel?.title ?? "", content: self.aliyunVodUpToYoPublishModel?.content ?? "", location: self.aliyunVodUpToYoPublishModel?.locationString ?? "", imgs: imgsJsonStr, completion: {
             [weak self] (communityPublishModel) -> (Void) in
             let communityPublishModel = communityPublishModel as? CommunityPublishModel
-            VirusViewModel.shared.publishVirueRecordAddApi(postId: communityPublishModel?.postId, postType: "video", title: self?.aliyunVodUpToYoPublishModel?.title, content: self?.aliyunVodUpToYoPublishModel?.content, postCover: self?.aliyunVodUpToYoPublishModel?.videoCoverImageUrlPath)
-            self?.progressView?.curUploadStatus = .success
-            self?.progressView?.attachedView?.isHidden = true
-            self?.destroy()
-            NotificationCenter.default.post(name: NSNotification.Name("PublishPostSuccess"), object: nil)
+            VirusViewModel.shared.publishVirueRecordAddApi(postId: communityPublishModel?.postId, postType: "video", title: self?.aliyunVodUpToYoPublishModel?.title, content: self?.aliyunVodUpToYoPublishModel?.content, postCover: self?.aliyunVodUpToYoPublishModel?.videoCoverImageUrlPath,completion:{
+                [weak self] in
+                self?.progressView?.curUploadStatus = .success
+                self?.progressView?.attachedView?.isHidden = true
+                self?.destroy()
+                NotificationCenter.default.post(name: NSNotification.Name("PublishPostSuccess"), object: nil)
+            })
+
         }) { [weak self] _ in
             self?.progressView?.attachedView?.isHidden = true
             self?.destroy()
@@ -213,11 +216,13 @@ extension AliyunVodUpToyoPublishManager {
         SwiftMoyaNetWorkServiceCommunity.shared().communityPublishApi(type: "image", img: self.aliyunVodUpToYoPublishModel?.imageUrls.first ?? "", topic_ids: topicJsonStr, title: self.aliyunVodUpToYoPublishModel?.title ?? "", content: self.aliyunVodUpToYoPublishModel?.content ?? "", location: self.aliyunVodUpToYoPublishModel?.locationString ?? "", imgs: imgsJsonStr, completion: {
             [weak self] (communityPublishModel) -> (Void) in
             let communityPublishModel = communityPublishModel as? CommunityPublishModel
-            VirusViewModel.shared.publishVirueRecordAddApi(postId: communityPublishModel?.postId, postType: "image", title: self?.aliyunVodUpToYoPublishModel?.title, content: self?.aliyunVodUpToYoPublishModel?.content, postCover: self?.aliyunVodUpToYoPublishModel?.imageUrls.first)
-            self?.progressView?.curUploadStatus = .success
-            self?.progressView?.attachedView?.isHidden = true
-            self?.destroy()
-            NotificationCenter.default.post(name: NSNotification.Name("PublishPostSuccess"), object: nil)
+            VirusViewModel.shared.publishVirueRecordAddApi(postId: communityPublishModel?.postId, postType: "image", title: self?.aliyunVodUpToYoPublishModel?.title, content: self?.aliyunVodUpToYoPublishModel?.content, postCover: self?.aliyunVodUpToYoPublishModel?.imageUrls.first,completion:{
+                [weak self] in
+                self?.progressView?.curUploadStatus = .success
+                self?.progressView?.attachedView?.isHidden = true
+                self?.destroy()
+                NotificationCenter.default.post(name: NSNotification.Name("PublishPostSuccess"), object: nil)
+            })
 
         }) { [weak self] _ in
             self?.progressView?.attachedView?.isHidden = true

RainbowPlanet/RainbowPlanet/Manager/ThumbnailsManager/ThumbnailsManager.swift

@@ -34,6 +34,26 @@ let kSize92x92Image = CGSize(width: 92, height: 92)
 
 let kSize120x120Image = CGSize(width: 120, height: 120)
 
+/// 返回缩略图url图片
+///
+/// - Parameters:
+///   - name: 图片Str
+///   - size: 图片尺寸
+/// - Returns: 图片url
+func kURLThumbnailsImage(name:String,size: CGSize) -> URL? {
+    return URL(string: ThumbnailsManager.thumbnailsFill(imgStr: name, size: size))
+}
+
+/// 返回缩略图url图片
+///
+/// - Parameters:
+///   - name: 图片Str
+///   - size: 图片尺寸
+/// - Returns: 图片url
+func kURLThumbnailsPadImage(name:String,size: CGSize) -> URL? {
+    return URL(string: ThumbnailsManager.thumbnailsPad(imgStr: name, size: size))
+}
+
 
 class ThumbnailsManager: NSObject {
     
@@ -43,7 +63,7 @@ class ThumbnailsManager: NSObject {
     ///   - imgStr: 图片地址
     ///   - size: 图片大小
     /// - Returns: 返回图片地址
-    class func thumbnails(imgStr:String,size:CGSize) -> String {
+    class func thumbnailsFill(imgStr:String,size:CGSize) -> String {
         if imgStr.contains("*") {
             let imgStr1 = imgStr + "?x-oss-process=image/resize,m_fill,w_\(Int(size.width*1.5)),h_\(Int(size.height*1.5))"
             return String(imgStr1)
@@ -59,4 +79,29 @@ class ThumbnailsManager: NSObject {
         }
     }
     
+    /// 获取缩略图
+    ///
+    /// - Parameters:
+    ///   - imgStr: 图片地址
+    ///   - size: 图片大小
+    /// - Returns: 返回图片地址
+    class func thumbnailsPad(imgStr:String,size:CGSize) -> String {
+        if imgStr.contains("*") {
+            let imgStr1 = imgStr + "?x-oss-process=image/resize,m_pad,w_\(Int(size.width*1.5)),h_\(Int(size.height*1.5)),color_000000"
+            return String(imgStr1)
+        }else {
+            if imgStr.contains("?") {
+                var imgStr1 = imgStr.prefix(upTo:(imgStr.lastIndex(of: "?"))!)
+                imgStr1 = imgStr1 + "?x-oss-process=image/resize,m_pad,w_\(Int(size.width*1.5)),h_\(Int(size.height*1.5)),color_000000"
+                return String(imgStr1)
+            }else {
+                let imgStr1 = imgStr + "?x-oss-process=image/resize,m_pad,w_\(Int(280 * 1.5 * kScaleWidth)),h_\(Int(280 * 1.5 * kScaleWidth)),color_000000"
+                return String(imgStr1)
+            }
+        }
+    }
+    
+    
+    
 }
+

RainbowPlanet/RainbowPlanet/Manager/UMManager/UMManager.swift

@@ -403,51 +403,56 @@ extension UMManager {
         }
         let isInstall = UMSocialManager.default()?.isInstall(platformType)
         if isInstall!  { //验证
-            UMSocialManager.default().getUserInfo(with: platformType, currentViewController: nil) { result, error in
-
-                if error != nil {
-                    SwiftProgressHUD.shared().showText("授权失败,请重新登录")
-                } else {
-
-                    let resp = result as? UMSocialUserInfoResponse
-
-                    let UserModel = UMLoginModel()
-                    // 第三方登录数据(为空表示平台未提供)
-                    // 授权数据
-                    if let anUid = resp?.uid {
-                        NXLLog(" uid: \(anUid)")
-                        UserModel.union_id = anUid
-                    }
-                    if let anOpenid = resp?.openid {
-                        NXLLog(" openid: \(anOpenid)")
-                        UserModel.open_id = anOpenid
-                    }
-
-                    // 用户数据
-                    if let aName = resp?.name {
-                        NXLLog(" name: \(aName)")
-                        UserModel.username = aName
-                    }
-                    if let anIconurl = resp?.iconurl {
-                        NXLLog(" iconurl: \(anIconurl)")
-                        UserModel.avatar = anIconurl
-                    }
-                    if let aGender = resp?.unionGender {
-                        NXLLog(" gender: \(aGender)")
-                        if aGender == "男" {
-                            UserModel.gender = 1
-                        }else if aGender == "女" {
-                            UserModel.gender = 2
-                        }
-                    }
-                    callBack(UserModel)
-                }
-            }
-        }
-    else {
+            getUserInfo(platformType: platformType, callBack: callBack)
+        }else {
             if platformType == .wechatSession {
                 SwiftProgressHUD.shared().showText("微信未安装\n请您安装微信程序")
+            }else{
+                getUserInfo(platformType: platformType, callBack: callBack)
+            }
+        }
+    }
+}
+
+func getUserInfo(platformType: UMSocialPlatformType,callBack: @escaping (UMLoginModel) -> (Void)) {
+    UMSocialManager.default().getUserInfo(with: platformType, currentViewController: nil) { result, error in
+        
+        if error != nil {
+            SwiftProgressHUD.shared().showText("授权失败,请重新登录")
+        } else {
+            
+            let resp = result as? UMSocialUserInfoResponse
+            
+            let UserModel = UMLoginModel()
+            // 第三方登录数据(为空表示平台未提供)
+            // 授权数据
+            if let anUid = resp?.uid {
+                NXLLog(" uid: \(anUid)")
+                UserModel.union_id = anUid
+            }
+            if let anOpenid = resp?.openid {
+                NXLLog(" openid: \(anOpenid)")
+                UserModel.open_id = anOpenid
+            }
+            
+            // 用户数据
+            if let aName = resp?.name {
+                NXLLog(" name: \(aName)")
+                UserModel.username = aName
+            }
+            if let anIconurl = resp?.iconurl {
+                NXLLog(" iconurl: \(anIconurl)")
+                UserModel.avatar = anIconurl
+            }
+            if let aGender = resp?.unionGender {
+                NXLLog(" gender: \(aGender)")
+                if aGender == "男" {
+                    UserModel.gender = 1
+                }else if aGender == "女" {
+                    UserModel.gender = 2
+                }
             }
+            callBack(UserModel)
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/Banner/CommunityBannerFSPagerViewCell.swift

@@ -57,7 +57,7 @@ class CommunityBannerFSPagerViewCell: FSPagerViewCell {
     var communityRecommendTypeDataModel : CommunityRecommendTypeDataModel? {
         didSet {
             bgImageView.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendTypeDataModel?.image ?? "",size: self.size), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
 
         }
     }

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

@@ -97,7 +97,7 @@ 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("666U米待收获", for: .normal)
+        skittlesButton.setTitle("666 U米待收获", for: .normal)
         skittlesButton.setTitleColor(kFFA42FColor, for: .normal)
         skittlesButton.titleLabel?.font = kRegularFont13
         skittlesButton.isEnabled = false
@@ -227,7 +227,7 @@ class CardContentActionTableViewCell: UITableViewCell {
     
     var communityRecommendDataModel: CommunityRecommendDataModel? {
         didSet {
-            skittlesButton.setTitle("\(communityRecommendDataModel?.willCollectBean ?? 0)U米待收获", for: UIControl.State.normal)
+            skittlesButton.setTitle("\(communityRecommendDataModel?.willCollectBean ?? 0) U米待收获", for: UIControl.State.normal)
             skittlesButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
             
             if communityRecommendDataModel?.isLike == 0 {
@@ -248,7 +248,7 @@ class CardContentActionTableViewCell: UITableViewCell {
     
     var communityFollowDataModel: CommunityFollowDataModel? {
         didSet {
-            skittlesButton.setTitle("\(communityFollowDataModel?.relateData?.willCollectBean ?? 0)U米待收获", for: UIControl.State.normal)
+            skittlesButton.setTitle("\(communityFollowDataModel?.relateData?.willCollectBean ?? 0) U米待收获", for: UIControl.State.normal)
             skittlesButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
             
             if communityFollowDataModel?.relateData?.isLike == 0 {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/Comment/CardContentCommnetTableViewCell.swift

@@ -61,7 +61,7 @@ class CardContentCommnetTableViewCell: UITableViewCell {
     private lazy var avatarButton: UIButton = {
         let avatarButton = UIButton()
         avatarButton.kf.setImage(with: kURLThumbnailsImage(name: UserModel.shared().getModel()?.avatarurl ?? "",size:kSize28x28Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-        //ImageCache.default.clearMemoryCache()
+        
 
         avatarButton.cornerRadius = 14
         avatarButton.masksToBounds = true

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/PicVideo/CardContentPicVideoCollectionViewCell.swift

@@ -69,8 +69,6 @@ class CardContentPicVideoCollectionViewCell: UICollectionViewCell {
         didSet {
             let imageResource = ImageResource(downloadURL: kURLThumbnailsImage(name: imgStr ?? "",size: self.size)!)
             iconImageView.kf.setImage(with: imageResource, placeholder: kImage(name: "default_pic"))
-//            //ImageCache.default.clearMemoryCache()
-//            ImageCache.default.cleanExpiredDiskCache()
            
         }
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/PicVideo/CardContentPicVideoTableViewCell.swift

@@ -178,19 +178,14 @@ extension CardContentPicVideoTableViewCell: UICollectionViewDelegateFlowLayout,U
             if (PostType(rawValue: (communityRecommendDataModel?.type)!)) != .video {
                 if communityRecommendDataModel?.imgs?.isEmpty ?? true {
                     if communityRecommendDataModel?.img == "" || communityRecommendDataModel?.img == nil {
-                        
                     }else {
-                        let imgStr = getImageUrlStr(imgStr: communityRecommendDataModel?.img ?? "", width: cell.width, height: cell.height)
-                        cell.imgStr = imgStr
-                        
+                        cell.imgStr = communityRecommendDataModel?.img ?? ""
                     }
                 }else {
-                    let imgStr = getImageUrlStr(imgStr: communityRecommendDataModel?.imgs?[indexPath.row] ?? "", width: cell.width, height: cell.height)
-                    cell.imgStr =  imgStr
+                    cell.imgStr =  communityRecommendDataModel?.imgs?[indexPath.row] ?? ""
                 }
             }else {
-                let imgStr = getImageUrlStr(imgStr: communityRecommendDataModel?.img ?? "", width: cell.width, height: cell.height)
-                cell.imgStr = imgStr
+                cell.imgStr = communityRecommendDataModel?.img ?? ""
             }
             cell.communityRecommendDataModel = communityRecommendDataModel
         } else if type == .follow {
@@ -198,18 +193,15 @@ extension CardContentPicVideoTableViewCell: UICollectionViewDelegateFlowLayout,U
                 if communityFollowDataModel?.relateData?.imgs?.isEmpty ?? true {
                     if communityFollowDataModel?.relateData?.img == "" || communityFollowDataModel?.relateData?.img == nil {
                     }else {
-                        let imgStr = getImageUrlStr(imgStr: communityFollowDataModel?.relateData?.img ?? "", width: cell.width, height: cell.height)
-                        cell.imgStr = imgStr
+                        cell.imgStr = communityFollowDataModel?.relateData?.img ?? ""
                     }
                 }else {
                     
-                    let imgStr = getImageUrlStr(imgStr: communityFollowDataModel?.relateData?.imgs?[indexPath.row] ?? "", width: cell.width, height: cell.height)
-                    cell.imgStr = imgStr
+                    cell.imgStr = communityFollowDataModel?.relateData?.imgs?[indexPath.row] ?? ""
                     
                 }
             }else {
-                let imgStr = getImageUrlStr(imgStr: communityFollowDataModel?.relateData?.img ?? "", width: cell.width, height: cell.height)
-                cell.imgStr = imgStr
+                cell.imgStr = communityFollowDataModel?.relateData?.img ?? ""
             }
             cell.communityFollowDataModel = communityFollowDataModel
         }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/User/CardContentUserTableViewCell.swift

@@ -127,6 +127,7 @@ class CardContentUserTableViewCell: UITableViewCell {
         followButton.layer.masksToBounds = true
         followButton.layer.borderWidth = 0.5
         followButton.layer.borderColor = kThemeColor.cgColor
+        followButton.alpha = 0
         followButton.rx.tap.subscribe(onNext: {[weak self] (data) in
             followButton.isEnabled = false
             if let followClosure = self?.followClosure {
@@ -159,24 +160,23 @@ class CardContentUserTableViewCell: UITableViewCell {
     var communityRecommendDataModel: CommunityRecommendDataModel? {
         didSet {
             avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendDataModel?.avatar ?? "", size: kSize40x40Image), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
-//            //ImageCache.default.clearMemoryCache()
+//            
             titleButton.setTitle(communityRecommendDataModel?.username, for: UIControl.State.normal)
             timeLabel.text = communityRecommendDataModel?.createdAt
-            CommunityFollowUserViewModel.setFollowFeedType(followButton: followButton, followType: FollowType(rawValue: communityRecommendDataModel?.isFollow ?? 0))
-
             if communityRecommendDataModel?.uid == UserModel.shared().getModel()?.uid {
                 followButton.isHidden = true
             }else {
                 followButton.isHidden = false
-
             }
+            CommunityFollowUserViewModel.setFollowFeedType(followButton: followButton, followType: FollowType(rawValue: communityRecommendDataModel?.isFollow ?? 0))
+
         }
     }
     
     var communityFollowDataModel : CommunityFollowDataModel? {
         didSet {
             avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityFollowDataModel?.relateData?.avatar ?? "",size: kSize40x40Image), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
 
             titleButton.setTitle(communityFollowDataModel?.relateData?.username, for: UIControl.State.normal)
             timeLabel.text = communityFollowDataModel?.relateData?.createdAt

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/FeaturedTopics/FeaturedTopicsCollectionViewCell.swift

@@ -99,7 +99,7 @@ class FeaturedTopicsCollectionViewCell: UICollectionViewCell {
     var communityRecommendTypeDataModel : CommunityRecommendTypeDataModel? {
         didSet {
             picImageView.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendTypeDataModel?.img ?? "",size: CGSize(width: self.width, height: 130)), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
 
             topicLabel.text = communityRecommendTypeDataModel?.name
             numberPeopleLable.text = "\(communityRecommendTypeDataModel?.followCount ?? "0")人参与"

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/FollowStatus/CommunityFollowStatusTableViewCell.swift

@@ -296,7 +296,7 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
     var communityFollowDataModel : CommunityFollowDataModel? {
         didSet {
             avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityFollowDataModel?.followAvatar ?? "",size: kSize28x28Image), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
 
             titleButton.setTitle(communityFollowDataModel?.followUsername, for: UIControl.State.normal)
             skittlesTitleLabel.text = "收获 \(communityFollowDataModel?.content?.beans ?? 0) U米"
@@ -313,7 +313,7 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
             case .follow?:
                 timeStatusLabel.text = "\(communityFollowDataModel?.createdAt ?? "") 关注了"
                 avatarOtherButton.kf.setImage(with: kURLThumbnailsImage(name: communityFollowDataModel?.relateData?.avatar ?? "",size: kSize20x20Image), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
-                //ImageCache.default.clearMemoryCache()
+                
 
                 titleOtherButton.setTitle(communityFollowDataModel?.relateData?.username, for: UIControl.State.normal)
                 if communityFollowDataModel?.relateData?.uid == UserModel.shared().getModel()?.uid {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/PopularVideo/PopularVideoCollectionViewCell.swift

@@ -86,7 +86,7 @@ class PopularVideoCollectionViewCell: UICollectionViewCell {
         didSet {
             picImageView.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendTypeDataModel?.img ?? "",size: self.size), placeholder: kImage(name: "default_pic"))
             avatarImageView.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendTypeDataModel?.avatar ?? "",size: kSize54x54Image), placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
 
             nameLabel.text = communityRecommendTypeDataModel?.userName
         }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/RecommendFollow/CommunityRecommendFollowCollectionViewCell.swift

@@ -127,7 +127,7 @@ class CommunityRecommendFollowCollectionViewCell: UICollectionViewCell {
     var communityRecommendTypeDataModel : CommunityRecommendTypeDataModel? {
         didSet {
             avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendTypeDataModel?.avatar ?? "",size: kSize60x60Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
 
            
 
@@ -151,7 +151,7 @@ class CommunityRecommendFollowCollectionViewCell: UICollectionViewCell {
     var cmsMemberModel : CMSMemberModel? {
         didSet {
             avatarButton.kf.setImage(with: kURLThumbnailsImage(name: cmsMemberModel?.avatar ?? "",size: kSize60x60Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
 
 
             titleButton.setTitle(cmsMemberModel?.username, for: UIControl.State.normal)

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

@@ -306,7 +306,7 @@ extension CommunityFeaturedTopicsViewController {
             self?.topicLable.text = self?.communityTopicDetailModel?.name
             CommunityFollowTopicViewModel.shared.followTopicButton(communityTopicDetailModel: self?.communityTopicDetailModel, button: (self?.focusButton)!)
             self?.bgImageView.kf.setImage(with: kURLThumbnailsImage(name: self?.communityTopicDetailModel?.img ?? "", size: CGSize(width: (self?.view.width)!, height: (self?.view.width)!)), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
 
             self?.navigationBar.barBackgroundImage = self?.bgImageView.image
             self?.communityFeaturedTopicsHeaderView.communityTopicDetailModel = self?.communityTopicDetailModel

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFindFriends/View/CommunityFindFriendsView.swift

@@ -47,7 +47,7 @@ class CommunityFindFriendsView: BaseView {
         let picButton = UIButton(type: UIButton.ButtonType.custom)
         let configModel = ConfigModel.shared.object()
         picButton.kf.setBackgroundImage(with: kURLThumbnailsImage(name: configModel?.findFriendImg ?? "", size: CGSize(width: self.width-30, height: 100 * kScaleWidth)), for: UIControl.State.normal, placeholder: kImage(name: "default_pic"))
-        //ImageCache.default.clearMemoryCache()
+        
         picButton.cornerRadius = 5
         picButton.masksToBounds = true
         picButton.rx.tap.subscribe(onNext: { [weak self] _ in

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/Controller/CommunityRecommendController.swift

@@ -361,7 +361,7 @@ extension CommunityRecommendController {
             self?.communityPostDetailModel = communityPostDetailModel as? CommunityPostDetailModel
             self?.communityPostsApi(page:1)
             self?.avatarButton.kf.setImage(with: kURLThumbnailsImage(name: self?.communityPostDetailModel?.avatar ?? "", size: kSize30x30Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
             self?.nameButton.setTitle(self?.communityPostDetailModel?.username, for: UIControl.State.normal)
             if self?.communityPostDetailModel?.uid == UserModel.shared().getModel()?.uid {
                 self?.followButton.isHidden = true

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

@@ -167,7 +167,7 @@ class RecommendMajorCommentCell: UITableViewCell {
     var communityPostCommentModel : CommunityPostCommentModel? {
         didSet {
             iconButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostCommentModel?.avatar ?? "",size: kSize24x24Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
             titleLabel.text = communityPostCommentModel?.username
             contentLabel.text = communityPostCommentModel?.content
             timeLabel.text = communityPostCommentModel?.createdAt

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

@@ -123,7 +123,7 @@ class RecommendSubCommentTableViewCell: UITableViewCell {
     var communityPostReplyModel: CommunityPostReplyModel? {
         didSet {
             iconButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostReplyModel?.avatar ?? "", size: kSize24x24Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
 
             
             titleLabel.text = communityPostReplyModel?.username

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/CommunityPostDetailFSPagerViewCell.swift

@@ -56,8 +56,8 @@ class CommunityPostDetailFSPagerViewCell: FSPagerViewCell {
     
     var img : String? {
         didSet {
-            bgImageView.kf.setImage(with: kURLThumbnailsImage(name: img ?? "", size: self.size), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            bgImageView.kf.setImage(with: kURLThumbnailsPadImage(name: img ?? "", size: self.size), placeholder: kImage(name: "default_pic"))
+            
 
         }
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/CommunityPostDetailTableViewHeaderView.swift

@@ -34,7 +34,7 @@ class CommunityPostDetailTableViewHeaderView: BaseView {
     
     private lazy var pagerView: FSPagerView = {
         let pagerView = FSPagerView(frame: CGRect.zero)
-        pagerView.backgroundColor = kf7f8faColor
+        pagerView.backgroundColor = UIColor.black
         pagerView.scrollDirection = .horizontal
         pagerView.bounces = false
         pagerView.delegate = self

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/HTMLCell/CommunityRecommendDetailHTMLTableViewCell.swift

@@ -10,9 +10,13 @@ import UIKit
 import WebKit
 import SwiftyMediator
 import Kingfisher
+import RxSwift
 
 class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
     
+    let disposeBag = DisposeBag()
+    
+    
     deinit {
         NXLLog("deinit")
         webView.scrollView.removeObserver(self, forKeyPath: "contentSize")
@@ -153,6 +157,14 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
         followButton.masksToBounds = true
         followButton.layer.borderWidth = 0.5
         followButton.isHidden = true
+        followButton.rx.tap.subscribe(onNext: { [weak self] (data) in
+            if UserModel.isTokenNil() {
+                kAppDelegate.setLogin()
+            }else {
+                CommunityFollowUserViewModel.shared.follow(communityPostDetailModel: (self?.communityPostDetailModel)!, button: (self?.followButton)!)
+                
+            }
+        }).disposed(by: disposeBag)
         return followButton
     }()
     
@@ -249,10 +261,10 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
         didSet {
             
             avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostDetailModel?.avatar ?? "",size: kSize30x30Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
             nameButton.setTitle(communityPostDetailModel?.username, for: UIControl.State.normal)
-            CommunityFollowUserViewModel.setFollowType(followButton: followButton, followType: FollowType(rawValue: communityPostDetailModel?.isFollow ?? 0) ?? .futureFollow)
-            beanLabel.text = "\(communityPostDetailModel?.availableBean ?? 0)U米待收获"
+            CommunityFollowUserViewModel.setFollowListType(followButton: followButton, followType: FollowType(rawValue: communityPostDetailModel?.isFollow ?? 0) ?? .futureFollow)
+            beanLabel.text = "\(communityPostDetailModel?.availableBean ?? 0) U米待收获"
             timeReadLabel.text = " I \(communityPostDetailModel?.createdAt ?? "") I 阅读·\(communityPostDetailModel?.pv ?? "0")"
             webView.load(URLRequest(url: URL(string: communityPostDetailModel?.descUrl ?? "")!))
             

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/RecommendNoneCommentCell.swift

@@ -157,8 +157,7 @@ class RecommendNoneCommentCell: UITableViewCell {
     
     var communityPostDetailModel : CommunityPostDetailModel? {
         didSet {
-            iconButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostDetailModel?.avatar ?? "", size: kSize30x30Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            iconButton.kf.setImage(with: kURLThumbnailsImage(name: UserModel.shared().getModel()?.avatarurl ?? "", size: kSize30x30Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
 
         }
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/imageCell/RecommendDetailContentCell.swift

@@ -212,7 +212,7 @@ class RecommendDetailContentCell: UITableViewCell {
     
     var communityPostDetailModel : CommunityPostDetailModel? {
         didSet {
-            beanLabel.text = "\(communityPostDetailModel?.willCollectBean ?? 0)U米待收获"
+            beanLabel.text = "\(communityPostDetailModel?.willCollectBean ?? 0) U米待收获"
             contentLabel.text = communityPostDetailModel?.content
             if communityPostDetailModel?.location == nil || communityPostDetailModel?.location == "" {
                 timeLabel.text = "\(communityPostDetailModel?.createdAt ?? "")"

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityShareActivity/CommunityShareActivityViewController.swift

@@ -40,7 +40,7 @@ class CommunityShareActivityViewController: BaseViewController {
         bgImageView.snp.makeConstraints { (make) in
             make.top.left.equalToSuperview()
             make.width.equalTo(kScreenWidth)
-            make.height.equalTo(608*kScaleWidth)
+            make.height.equalTo(630*kScaleWidth)
         }
     }
     
@@ -50,7 +50,7 @@ class CommunityShareActivityViewController: BaseViewController {
     
     lazy var scrollView : UIScrollView = {
         let scrollView = UIScrollView(frame: CGRect(x: 0, y: kNavBarTotalHeight, width: kScreenWidth, height: kScreenHeight-kNavBarTotalHeight-152))
-        scrollView.contentSize = CGSize(width: kScreenWidth, height: 608*kScaleWidth)
+        scrollView.contentSize = CGSize(width: kScreenWidth, height: 630*kScaleWidth)
         scrollView.backgroundColor = kffffffColor
         return scrollView
     }()
@@ -58,6 +58,7 @@ class CommunityShareActivityViewController: BaseViewController {
     lazy var bgImageView: UIImageView = {
         let bgImageView = UIImageView()
         bgImageView.isUserInteractionEnabled = true
+//        bgImageView.contentMode = .scaleAspectFill
         return bgImageView
     }()
     
@@ -72,9 +73,7 @@ extension CommunityShareActivityViewController {
     func configPosterInviteApi() {
         SwiftMoyaNetWorkServiceConfig.shared().configPosterInviteApi {
              [weak self] (data) -> (Void) in
-            self?.bgImageView.kf.setImage(with: kURLThumbnailsImage(name: (data as! String),size: CGSize(width: kScreenWidth, height: 607*kScaleWidth)), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
-
+            self?.bgImageView.kf.setImage(with: kURLImage(name: (data as! String)), placeholder: kImage(name: "default_pic"))
             self?.shareCommunityContentView.imageUrl = (data as! String)
         }
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityShareContent/CommunityShareContentViewController.swift

@@ -124,11 +124,8 @@ class CommunityShareContentViewController: BaseViewController {
     }
     
     override func setupData() {
-        bgImageView.kf.setImage(with: kURLThumbnailsImage(name: imgUrl ?? "",size: CGSize(width: kScreenWidth, height: 481*kScaleWidth)), placeholder: kImage(name: "default_pic"))
         topicLabel.text = "#\(topicStr)#"
         titleLabel.text = titleStr
-        avatarImageView.kf.setImage(with: kURLThumbnailsImage(name: avatarStr ?? "",size: CGSize(width: 20*kScaleWidth, height: 20*kScaleWidth)), placeholder: kImage(name: "default_pic"))
-        //ImageCache.default.clearMemoryCache()
 
         nameLable.text = nameStr ?? ""
         
@@ -140,11 +137,15 @@ class CommunityShareContentViewController: BaseViewController {
         } else {
         }
         scanLabel.text = "扫码查看内容 领取\(bean ?? 0)U米"
-        scrollView.swContentScrollCapture {
-            [weak self] (image) in
-            self?.shareCommunityContentView.image = image
-        }
         
+        avatarImageView.kf.setImage(with: kURLThumbnailsImage(name: avatarStr ?? "",size: CGSize(width: 20*kScaleWidth, height: 20*kScaleWidth)), placeholder: kImage(name: "default_pic"),completionHandler:{ [weak self] (image, error, cacheType, url) in
+            self?.bgImageView.kf.setImage(with: kURLThumbnailsImage(name: self?.imgUrl ?? "",size: CGSize(width: kScreenWidth, height: 481*kScaleWidth)), placeholder: kImage(name: "default_pic"),completionHandler: { [weak self] (image, error, cacheType, url) in
+                self?.scrollView.swContentCapture {
+                    [weak self] (image) in
+                    self?.shareCommunityContentView.image = image
+                }
+            })
+        })
         shareCommunityContentView.completion = {
             [weak self] in
             VirusViewModel.shared.forwarVirueRecordAddApi(postId: self?.postId, postAuthorUid: "\(self?.uid ?? 0)", title: self?.titleStr, content: self?.contentStr, postType: self?.type, postCover: self?.imgUrl)
@@ -163,6 +164,7 @@ class CommunityShareContentViewController: BaseViewController {
         let bgImageView = UIImageView()
         bgImageView.isUserInteractionEnabled = true
         bgImageView.contentMode = .scaleAspectFill
+        bgImageView.clipsToBounds = true
         return bgImageView
     }()
     

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/View/CommunityMajorCommentCell.swift

@@ -112,7 +112,7 @@ class CommunityMajorCommentCell: UITableViewCell {
     var communityPostCommentModel : CommunityPostCommentModel? {
         didSet {
             iconButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostCommentModel?.avatar ?? "",size: kSize24x24Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
             titleLabel.text = communityPostCommentModel?.username
             contentLabel.text = communityPostCommentModel?.content
             timeLabel.text = communityPostCommentModel?.createdAt

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/View/CommunityReplyCommentCell.swift

@@ -118,7 +118,7 @@ class CommunityReplyCommentCell: UITableViewCell {
     var communityPostReplyModel: CommunityPostReplyModel? {
         didSet {
             iconButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostReplyModel?.avatar ?? "",size: kSize24x24Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
             
             titleLabel.text = communityPostReplyModel?.username
             

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoCoverCollectionCell.swift

@@ -850,10 +850,10 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
                 videoPlayView.assetURLString = self.videoItemMdl?.video
             }
             
-            beanLabel.text = "\(self.videoItemMdl?.willCollectBean ?? 0)U米待收获"
+            beanLabel.text = "\(self.videoItemMdl?.willCollectBean ?? 0) U米待收获"
             
             avatarButton.kf.setImage(with: kURLThumbnailsImage(name: self.videoItemMdl?.avatar ?? "", size: kSize30x30Image), for: .normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
 
             if self.videoItemMdl?.username?.count ?? 0 <= 12 {
                 personLabel.text = self.videoItemMdl?.username

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoMajorCommentCell.swift

@@ -167,7 +167,7 @@ class CommunityVideoMajorCommentCell: UITableViewCell {
     var communityPostCommentModel : CommunityPostCommentModel? {
         didSet {
             iconButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostCommentModel?.avatar ?? "", size: kSize24x24Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
             titleLabel.text = communityPostCommentModel?.username
             contentLabel.text = communityPostCommentModel?.content
             timeLabel.text = communityPostCommentModel?.createdAt

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoTopicView.swift

@@ -35,7 +35,7 @@ class CommunityVideoTopicView: BaseView {
     }()
     
     private lazy var collectionViewLayout: UICollectionViewFlowLayout = {
-        let collectionViewLayout = UICollectionViewLeftAlignedLayout.init()
+        let collectionViewLayout = UICollectionViewFlowLayout.init()
         collectionViewLayout.minimumLineSpacing = 10
         collectionViewLayout.minimumInteritemSpacing =  10
         collectionViewLayout.scrollDirection = UICollectionView.ScrollDirection.horizontal

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/ViewController/CommunityVideoListController.swift

@@ -84,12 +84,16 @@ class CommunityVideoListController: BaseViewController {
         
         observe = NotificationCenter.default.addObserver(forName: UIApplication.willEnterForegroundNotification, object: nil, queue: OperationQueue.main, using: {
             [weak self] (notification) in
-            self?.startPlay(self?.prePlayCell)
+            if self?.isViewLoaded ?? true && (self?.view.window) != nil {
+                self?.startPlay(self?.prePlayCell)
+            }
         })
         
         observe = NotificationCenter.default.addObserver(forName: UIApplication.didBecomeActiveNotification, object: nil, queue: OperationQueue.main, using: {
             [weak self] (notification) in
-            self?.startPlay(self?.prePlayCell)
+            if self?.isViewLoaded ?? true && (self?.view.window) != nil {
+                self?.startPlay(self?.prePlayCell)
+            }
         })
         
         // 子评论页面
@@ -393,7 +397,11 @@ extension CommunityVideoListController {
             if videoListMdl?.pagination?.currentPage == 1{
                 self?.videoItemList?.removeAll()
                 self?.collectionView.resetNoMoreData()
+            }
+            if self?.videoItemList?.isEmpty ?? true {
                 self?.videoItemList = videoListMdl?.data
+            }else {
+                self?.videoItemList = (self?.videoItemList)! + (videoListMdl?.data)!
             }
             if self?.videoItemList?.isEmpty ?? true {
                 self?.navBackBtn.isHidden = false
@@ -403,7 +411,6 @@ extension CommunityVideoListController {
                 self?.navBackBtn.isHidden = true
                 self?.blurEffectView.isHidden = true
                 self?.placeLabel.isHidden = true
-                self?.videoItemList = (self?.videoItemList)! + (videoListMdl?.data)!
             }
             self?.collectionView.reloadData()
             MJRefreshManager.mjRefreshManagerHiddenFooter(collectionView: self?.collectionView, pagination: videoListMdl?.pagination)

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

@@ -57,8 +57,13 @@ class H5CommonViewController: BaseJSWebBaseViewController {
         
         navigationBar.onClickLeftButton = {
             [weak self] in
-            NotificationCenter.default.post(name: NSNotification.Name("CommunityModulePlanetTop"), object: 1)
-            self?.navigationController?.popViewController(animated: true)
+            self?.wkWebView.stopLoading()
+            if (self?.wkWebView.canGoBack)! {
+                self?.goBack()
+            }else {
+                NotificationCenter.default.post(name: NSNotification.Name("CommunityModulePlanetTop"), object: 1)
+                self?.navigationController?.popViewController(animated: true)
+            }
         }
         
     }

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageList/View/MessageListTableCell.swift

@@ -198,7 +198,7 @@ class MessageListTableCell: UITableViewCell {
             }
             timeLabel.text = messageDataModel?.createdAt
             contentImageView.kf.setImage(with: kURLThumbnailsImage(name: messageDataModel?.param?.cover ?? "", size: kSize44x44Image), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
 
         }
     }

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetActivity/View/MessageActivityTableCell.swift

@@ -145,7 +145,7 @@ class MessageActivityTableCell: UITableViewCell {
             subLabel.text = "活动时间:\(messageDataModel?.param?.activityTime ?? "")"
             titleLabel.text = messageDataModel?.param?.title
             actImageView.kf.setImage(with: kURLThumbnailsImage(name: messageDataModel?.param?.cover ?? "", size: self.size), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
 
             if messageDataModel?.param?.activityTime == nil || messageDataModel?.param?.activityTime == "" {
                 titleLabel.snp.remakeConstraints { (make) in

RainbowPlanet/RainbowPlanet/Modules/MineModule/ModifyData/View/ModifyDataAvatarView.swift

@@ -79,7 +79,7 @@ class ModifyDataAvatarView: BaseView {
     var userDetailModel: UserDetailModel? {
         didSet {
             avatarButton.kf.setBackgroundImage(with: kURLThumbnailsImage(name: userDetailModel?.avatar ?? "",size: kSize80x80Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
 
         }
     }

RainbowPlanet/RainbowPlanet/Modules/MineModule/MyFollowAndFan/ViewController/MyFollowAndFanViewController.swift

@@ -212,26 +212,26 @@ extension MyFollowAndFanViewController: UITableViewDataSource, UITableViewDelega
             [weak self] in
             if self?.myfollowAndFanType == .follow {
                 if cell.userFollowModel?.isFollowStatus == 0 { //加关注
-                    self?.userFollow(followUid: cell.userFollowModel?.followUid ?? 0, completion: { (isFollow) -> Void in
-                        cell.userFollowModel?.isFollowStatus = isFollow
+                    self?.userFollow(followUid: cell.userFollowModel?.followUid ?? 0, completion: {[weak self,weak cell] (isFollow) -> Void in
+                        cell?.userFollowModel?.isFollowStatus = isFollow
                         self?.tableView.reloadRows(at: [indexPath], with: UITableView.RowAnimation.none)
                     })
                 }else { //取消关注
-                    self?.userCancelFollow(followUid: cell.userFollowModel?.followUid ?? 0, completion: { (isFollow) -> Void in
-                        cell.userFollowModel?.isFollowStatus = isFollow
+                    self?.userCancelFollow(followUid: cell.userFollowModel?.followUid ?? 0, completion: { [weak self,weak cell] (isFollow) -> Void in
+                        cell?.userFollowModel?.isFollowStatus = isFollow
                         self?.tableView.reloadRows(at: [indexPath], with: UITableView.RowAnimation.none)
                     })
                 }
 
             }else if self?.myfollowAndFanType == .fan {
                 if cell.userFanModel?.isFollowStatus == 0 {//加关注
-                    self?.userFollow(followUid: cell.userFanModel?.fanUid ?? 0, completion: { (isFollow) -> Void in
-                        cell.userFanModel?.isFollowStatus = isFollow
+                    self?.userFollow(followUid: cell.userFanModel?.fanUid ?? 0, completion: {[weak self,weak cell] (isFollow) -> Void in
+                        cell?.userFanModel?.isFollowStatus = isFollow
                         self?.tableView.reloadRows(at: [indexPath], with: UITableView.RowAnimation.none)
                     })
                 }else {//取消关注
-                    self?.userCancelFollow(followUid: cell.userFanModel?.fanUid ?? 0, completion: { (isFollow) -> Void in
-                        cell.userFanModel?.isFollowStatus = isFollow
+                    self?.userCancelFollow(followUid: cell.userFanModel?.fanUid ?? 0, completion: {[weak self,weak cell] (isFollow) -> Void in
+                        cell?.userFanModel?.isFollowStatus = isFollow
                         self?.tableView.reloadRows(at: [indexPath], with: UITableView.RowAnimation.none)
                     })
                 }

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

@@ -191,7 +191,7 @@ extension OtherPersonalCenterViewController {
             self?.otherHeaderView.userDetailModel = self?.userDetailModel
             self?.navigationBar.backgroundImageView.kf.setImage(with: kURLThumbnailsImage(name: self?.userDetailModel?.backgroundImg ?? "default_pic", size: (self?.navigationBar.backgroundImageView.size)!), placeholder: kImage(name: "default_pic"))
             self?.avatarButton.kf.setImage(with: kURLThumbnailsImage(name: self?.userDetailModel?.avatar ?? "", size: kSize20x20Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
 
             self?.nameButton.setTitle(self?.userDetailModel?.username, for: UIControl.State.normal)
             self?.cmsTemplateTitles = ["发布 \(self?.userDetailModel?.postCount ?? "0")","收藏 \(self?.userDetailModel?.collectCount ?? "0")","分享 \(self?.userDetailModel?.shareCount ?? "0")"]

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

@@ -181,14 +181,14 @@ class PersonViewUserAndOtherHeaderView: BaseView {
         followButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
             if self?.userDetailModel?.isFollowStatus == 0 {
-                self?.userFollow(followUid: self?.userDetailModel?.uid ?? 0, completion: { [weak followButton] (isFollowStatus) in
+                self?.userFollow(followUid: self?.userDetailModel?.uid ?? 0, completion: { [weak self,weak followButton] (isFollowStatus) in
                     self?.userDetailModel?.isFollowStatus = isFollowStatus
-                    CommunityFollowUserViewModel.setFollowType(followButton: followButton, followType: FollowType(rawValue: self?.userDetailModel?.isFollowStatus ?? 0))
+                    CommunityFollowUserViewModel.setMineFollowType(followButton: followButton!, followType: FollowType(rawValue: self?.userDetailModel?.isFollowStatus ?? 0)!)
                 })
             }else {
-                self?.userCancelFollow(followUid: self?.userDetailModel?.uid ?? 0, completion: { [weak followButton] (isFollowStatus) in
+                self?.userCancelFollow(followUid: self?.userDetailModel?.uid ?? 0, completion: { [weak self,weak followButton] (isFollowStatus) in
                     self?.userDetailModel?.isFollowStatus = isFollowStatus
-                    CommunityFollowUserViewModel.setFollowType(followButton: followButton, followType: FollowType(rawValue: self?.userDetailModel?.isFollowStatus ?? 0))
+                    CommunityFollowUserViewModel.setMineFollowType(followButton: followButton!, followType: FollowType(rawValue: self?.userDetailModel?.isFollowStatus ?? 0)!)
                 })
             }
         }).disposed(by: disposeBag)
@@ -228,9 +228,8 @@ class PersonViewUserAndOtherHeaderView: BaseView {
     
     var userDetailModel: UserDetailModel? {
         didSet {
-            CommunityFollowUserViewModel.setFollowType(followButton: followButton, followType: FollowType(rawValue: userDetailModel?.isFollowStatus ?? 0))
-            bgImageView.kf.setImage(with: kURLImage(name: userDetailModel?.backgroundImg ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            CommunityFollowUserViewModel.setMineFollowType(followButton: followButton, followType: FollowType(rawValue: userDetailModel?.isFollowStatus ?? 0)!)
+            bgImageView.kf.setImage(with: kURLImage(name: userDetailModel?.backgroundImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = userDetailModel?.username
             if userDetailModel?.signature == "" || userDetailModel?.signature == nil  {
                 if userDetailModel?.uid == UserModel.shared().getModel()?.uid {
@@ -244,7 +243,7 @@ class PersonViewUserAndOtherHeaderView: BaseView {
             followNumberButton.setTitle("\(userDetailModel?.followCount ?? "0") 关注", for: UIControl.State.normal)
             fanNumberButton.setTitle("\(userDetailModel?.fansCount ?? "0") 粉丝", for: UIControl.State.normal)
             avatarButton.kf.setBackgroundImage(with: kURLThumbnailsImage(name: userDetailModel?.avatar ?? "", size: kSize60x60Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
 
 
         }

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

@@ -110,7 +110,7 @@ class PersonViewUserAndOtherListCollectionViewCell: UICollectionViewCell {
     var postMyModel: PostMyModel? {
         didSet {
             iconImageView.kf.setImage(with: kURLThumbnailsImage(name: postMyModel?.img ?? "", size: self.size), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
 
             rainbowBeanNumberLabel.text = "\(postMyModel?.collectBean ?? 0)"
             if PostMyModelType(rawValue: postMyModel?.type ?? "") == .video {

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

@@ -309,7 +309,7 @@ extension UserPersonalCenterViewController {
             self?.userHeaderView.userDetailModel = self?.userDetailModel
             self?.navigationBar.backgroundImageView.kf.setImage(with: kURLThumbnailsImage(name: self?.userDetailModel?.backgroundImg ?? "default_pic", size: (self?.navigationBar.backgroundImageView.size)!), placeholder: kImage(name: "default_pic"))
                 self?.avatarButton.kf.setImage(with: kURLThumbnailsImage(name: self?.userDetailModel?.avatar ?? "", size: kSize60x60Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
             self?.nameButton.setTitle(self?.userDetailModel?.username, for: UIControl.State.normal)
             self?.cmsTemplateTitles = ["发布 \(self?.userDetailModel?.postCount ?? "0")","收藏 \(self?.userDetailModel?.collectCount ?? "0")","分享 \(self?.userDetailModel?.shareCount ?? "0")"]
             self?.reloadData()
@@ -324,7 +324,7 @@ extension UserPersonalCenterViewController {
             self?.userHeaderView.userDetailModel = self?.userDetailModel
             self?.navigationBar.backgroundImageView.kf.setImage(with: kURLThumbnailsImage(name: self?.userDetailModel?.backgroundImg ?? "default_pic", size: (self?.navigationBar.backgroundImageView.size)!), placeholder: kImage(name: "default_pic"))
             self?.avatarButton.kf.setImage(with: kURLThumbnailsImage(name: self?.userDetailModel?.avatar ?? "", size: kSize60x60Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
         }
     }
 

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailProductTableViewCell.swift

@@ -139,7 +139,7 @@ class OrderDetailProductTableViewCell: UITableViewCell {
     var orderModelDetailModel: OrderModelDetailModel? {
         didSet {
             productImageView.kf.setImage(with: kURLThumbnailsImage(name: orderModelDetailModel?.productImg ?? "default_pic", size: kSize92x92Image), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
             titleLabel.text = orderModelDetailModel?.productName
             timeLabel.text = "预计配送时间：\(orderModelDetailModel?.receiveTime ?? "")"
             skuLabel.text = "规格：\(orderModelDetailModel?.skuName ?? "")"

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/View/PublishTopicHeaderView.swift

@@ -48,7 +48,7 @@ class PublishTopicHeaderView: BaseView {
     }()
     
     private lazy var collectionViewLayout: UICollectionViewFlowLayout = {
-        let collectionViewLayout = UICollectionViewLeftAlignedLayout.init()
+        let collectionViewLayout = UICollectionViewFlowLayout.init()
         collectionViewLayout.minimumLineSpacing = 10
         collectionViewLayout.minimumInteritemSpacing =  10
         collectionViewLayout.scrollDirection = UICollectionView.ScrollDirection.horizontal

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/View/PublishTopicTypeItemCollectionCell.swift

@@ -18,7 +18,7 @@ class PublishTopicTypeItemCollectionCell: UICollectionViewCell {
         didSet {
             titleLabel.text = self.topicModel?.name
             picImageView.kf.setImage(with: kURLThumbnailsImage(name: self.topicModel?.img ?? "", size: self.size), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
 
         }
     }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/View/PublishEditAddImgCollectionCell.swift

@@ -35,7 +35,7 @@ class PublishEditAddImgCollectionCell: UICollectionViewCell {
     var productSearchModel: ProductSearchModel? {
         didSet {
             picImageView.kf.setImage(with: kURLThumbnailsImage(name: productSearchModel?.img ?? "default_pic", size: self.size), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
 
         }
     }

RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/Banner/RedemptionAreaFSPagerViewCell.swift

@@ -58,7 +58,7 @@ class RedemptionAreaFSPagerViewCell: FSPagerViewCell {
     var cmsRedemptionAreaRule : CMSRedemptionAreaRule? {
         didSet {
             bgImageView.kf.setImage(with: kURLThumbnailsImage(name: cmsRedemptionAreaRule?.url ?? "default_pic", size: self.size), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
 
         }
     }

RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/FloorCell/RedemptionAreaProductCollectionViewCell.swift

@@ -131,7 +131,7 @@ class RedemptionAreaProductCollectionViewCell: UICollectionViewCell {
     var cmsRedemptionAreaRule : CMSRedemptionAreaRule? {
         didSet {
             iconImageView.kf.setImage(with: kURLThumbnailsImage(name: cmsRedemptionAreaRule?.img ?? "", size: CGSize(width: self.width, height: (kScreenWidth-15)/2)), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
             titleLabel.text = cmsRedemptionAreaRule?.saleName
             detatileTitleLabel.text = cmsRedemptionAreaRule?.subtitle
             beanLabel.text = "\(cmsRedemptionAreaRule?.price ?? 0)"

RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/FloorHeader/FloorHeaderViewFloorHeaderView.swift

@@ -39,7 +39,7 @@ class FloorHeaderViewFloorHeaderView: BaseView {
     var cmsRedemptionAreaContent : CMSRedemptionAreaContent? {
         didSet {
             imageView.kf.setImage(with: kURLThumbnailsImage(name: cmsRedemptionAreaContent?.floorImg ?? "", size: CGSize(width: self.width-28, height: 78*kScaleWidth)), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
 
         }
     }

RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialCell/SpecialOneTypeCollectionViewCell.swift

@@ -59,7 +59,7 @@ class SpecialOneTypeCollectionViewCell: UICollectionViewCell {
     var cmsRedemptionAreaRule : CMSRedemptionAreaRule? {
         didSet {
             iconImageView.kf.setImage(with: kURLThumbnailsImage(name: cmsRedemptionAreaRule?.url ?? "", size: self.size), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
 
         }
     }

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/TopicSelection/View/TopicSelectionCollectionViewCell.swift

@@ -88,7 +88,7 @@ class TopicSelectionCollectionViewCell: UICollectionViewCell {
     var communityTopicModel: CommunityTopicModel? {
         didSet {
             iconImageView.kf.setImage(with: kURLThumbnailsImage(name: communityTopicModel?.img ?? "",size: self.size), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
 
             titleLabel.text = communityTopicModel?.name
             selectionButton.isSelected = communityTopicModel?.isSelected ?? false

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchContentList/View/SearchContentListCollectionCell.swift

@@ -252,7 +252,7 @@ class SearchContentListCollectionCell: UICollectionViewCell {
             }else {
                 pauseImageView.isHidden = true
             }
-            //ImageCache.default.clearMemoryCache()
+            
             
         }
     }

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchTopicList/View/SearchTopicListTableViewCell.swift

@@ -118,7 +118,7 @@ class SearchTopicListTableViewCell: UITableViewCell {
     var communityTopicDataModel: CommunityTopicDataModel? {
         didSet {
             iconButton.kf.setImage(with: kURLThumbnailsImage(name: communityTopicDataModel?.img ?? "",size: kSize70x70Image), for: UIControl.State.normal, placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
 
             titleLabel.text = communityTopicDataModel?.name
             subtitleLabel.text = "\(communityTopicDataModel?.followCount ?? "0")人参与"

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchUser/View/SearchUserLitTableViewCell.swift

@@ -86,10 +86,8 @@ class SearchUserLitTableViewCell: UITableViewCell {
     }
     
     func setupDatas() {
-        titleButton.rx.tap.subscribe(onNext: { (data) in
-            
-        }).disposed(by: disposeBag)
-        followButton.rx.tap.subscribe(onNext: {[weak self] (data) in
+        followButton.rx.tap.subscribe(onNext: {
+            [weak self] (data) in
             if let followButtonClosure = self?.followButtonClosure {
                 followButtonClosure()
             }
@@ -148,7 +146,6 @@ class SearchUserLitTableViewCell: UITableViewCell {
             CommunityFollowUserViewModel.setFollowListType(followButton: followButton, followType: FollowType(rawValue: userFollowModel?.isFollowStatus ?? 0))
 
             avatarButton.kf.setImage(with: kURLThumbnailsImage(name: userFollowModel?.followAvatar ?? "",size: kSize44x44Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
 
             titleButton.setTitle(userFollowModel?.followUsername, for: UIControl.State.normal)
             var followTopic = Array<String>()
@@ -172,7 +169,6 @@ class SearchUserLitTableViewCell: UITableViewCell {
             CommunityFollowUserViewModel.setFollowListType(followButton: followButton, followType: FollowType(rawValue: userFanModel?.isFollowStatus ?? 0))
 
             avatarButton.kf.setImage(with: kURLThumbnailsImage(name: userFanModel?.fanAvatar ?? "",size: kSize44x44Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
 
             titleButton.setTitle(userFanModel?.fanUsername, for: UIControl.State.normal)
             var followTopic = Array<String>()
@@ -196,7 +192,6 @@ class SearchUserLitTableViewCell: UITableViewCell {
             CommunityFollowUserViewModel.setFollowListType(followButton: followButton, followType: FollowType(rawValue: cmsMemberModel?.followStatus ?? 0))
 
             avatarButton.kf.setImage(with: kURLThumbnailsImage(name: cmsMemberModel?.avatar ?? "",size: kSize44x44Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
 
             titleButton.setTitle(cmsMemberModel?.username, for: UIControl.State.normal)
             var followTopic = Array<String>()
@@ -221,7 +216,7 @@ class SearchUserLitTableViewCell: UITableViewCell {
             CommunityFollowUserViewModel.setFollowListType(followButton: followButton, followType: FollowType(rawValue: searchMemberModel?.followStatus ?? 0))
 
             avatarButton.kf.setImage(with: kURLThumbnailsImage(name: searchMemberModel?.avatar ?? "",size: kSize40x40Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            //ImageCache.default.clearMemoryCache()
+            
 
             titleButton.setTitle(searchMemberModel?.username, for: UIControl.State.normal)
             var followTopic = Array<String>()

RainbowPlanet/RainbowPlanet/Modules/ShareModules/ShareCommunityModule/ShareCommunityContent/ShareCommunityContentView.swift

@@ -101,7 +101,8 @@ extension ShareCommunityContentView: UICollectionViewDelegateFlowLayout,UICollec
         case 0:
             if image != nil {
                 UMManager.shared.shareImage(to: UMSocialPlatformType.wechatSession, viewController: findViewController(), thumbImage: image as Any, shareImage: image as Any) {
-                    self.completion!()
+                    [weak self] in
+                    self?.completion!()
                 }
             }
             if imageUrl != nil {
@@ -113,7 +114,8 @@ extension ShareCommunityContentView: UICollectionViewDelegateFlowLayout,UICollec
         case 1:
             if image != nil {
                 UMManager.shared.shareImage(to: UMSocialPlatformType.wechatSession, viewController: findViewController(), thumbImage: image as Any, shareImage: image as Any) {
-                    self.completion!()
+                    [weak self] in
+                    self?.completion!()
                 }
             }
             if imageUrl != nil {
@@ -124,7 +126,8 @@ extension ShareCommunityContentView: UICollectionViewDelegateFlowLayout,UICollec
         case 2:
             if image != nil {
                 UMManager.shared.shareImage(to: UMSocialPlatformType.QQ, viewController: findViewController(), thumbImage: image as Any, shareImage: image as Any) {
-                    self.completion!()
+                    [weak self] in
+                    self?.completion!()
                 }
             }
             if imageUrl != nil {
@@ -137,7 +140,8 @@ extension ShareCommunityContentView: UICollectionViewDelegateFlowLayout,UICollec
         case 3:
             if image != nil {
                 UMManager.shared.shareImage(to: UMSocialPlatformType.sina, viewController: findViewController(), thumbImage: image as Any, shareImage: image as Any) {
-                    self.completion!()
+                    [weak self] in
+                    self?.completion!()
                 }
             }
             if imageUrl != nil {

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductMallRightSideleftPicture/ProductRightSideleftPictureCollectionViewCell.swift

@@ -154,7 +154,7 @@ class ProductRightSideleftPictureCollectionViewCell: UICollectionViewCell {
     var productModel : ProductModel? {
         didSet {
             iconImagView.kf.setImage(with: kURLThumbnailsImage(name: productModel?.img ?? "default_pic", size: kSize120x120Image), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
             titleLabel.text = productModel?.saleName
             detailTitleLabel.text = productModel?.subtitle
             sellNumberLabel.text = "已售\(productModel?.totalCount ?? 0)件"

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/View/ShoppingMallBanner/ShoppingMallBannerFSPagerViewCell.swift

@@ -60,7 +60,7 @@ class ShoppingMallBannerFSPagerViewCell: FSPagerViewCell {
     var cmsRuleModel : CMSRuleModel? {
         didSet {
             bgImageView.kf.setImage(with: kURLThumbnailsImage(name: cmsRuleModel?.rule?.url ?? "default_pic", size: CGSize(width: kScreenWidth-28, height: self.height)), placeholder: kImage(name: "default_pic"))
-            //ImageCache.default.clearMemoryCache()
+            
 
         }
     }

RainbowPlanet/RainbowPlanet/Tools/SwViewCapture/UIScrollView+SwCapture.swift

@@ -18,7 +18,7 @@ public extension UIScrollView {
         // Put a fake Cover of View
         let snapShotView = self.snapshotView(afterScreenUpdates: false)
         snapShotView?.frame = CGRect(x: self.frame.origin.x, y: self.frame.origin.y, width: (snapShotView?.frame.size.width)!, height: (snapShotView?.frame.size.height)!)
-        self.superview?.addSubview(snapShotView!)
+        self.superview?.addSubview(snapShotView ?? UIView())
         
         // Backup all properties of scrollview if needed
         let bakFrame     = self.frame

RainbowPlanet/RainbowPlanet/ViewModel/Community/CommunityFollowUserViewModel.swift

@@ -46,19 +46,20 @@ class CommunityFollowUserViewModel: NSObject {
             followButton?.setTitle("已关注", for: UIControl.State.normal)
             followButton?.setTitleColor(kThemeColor, for: UIControl.State.normal)
             followButton?.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-            UIView.animate(withDuration: 1) {
-                [weak followButton] in
-                followButton?.alpha = 0
-            }
+//            UIView.animate(withDuration: 1) {
+//                [weak followButton] in
+//            }
+            followButton?.alpha = 0
+
             break
         case .mutualFollow?:
             followButton?.setTitle("已互关", for: UIControl.State.normal)
             followButton?.setTitleColor(kThemeColor, for: UIControl.State.normal)
             followButton?.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-            UIView.animate(withDuration: 1) {
-                [weak followButton] in
+//            UIView.animate(withDuration: 1) {
+//                [weak followButton] in
                 followButton?.alpha = 0
-            }
+//            }
             break
         default:
             break
@@ -132,6 +133,7 @@ class CommunityFollowUserViewModel: NSObject {
         }
     }
     
+    
     /// 设置关注
     ///
     /// - Parameters:
@@ -146,7 +148,42 @@ class CommunityFollowUserViewModel: NSObject {
             followButton.layer.borderColor = kThemeColor.cgColor
             followButton.layer.borderWidth = 0.5
             followButton.setBackgroundImage(UIImage.imageWithColor(color: kThemeColor), for: UIControl.State.normal)
+            followButton.isHidden = false
+            break
+        case .alreadyFollow:
+            followButton.setTitle("已关注", for: UIControl.State.normal)
+            followButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+            followButton.layer.borderColor = kffffffColor.cgColor
+            followButton.layer.borderWidth = 0.5
+            followButton.setBackgroundImage(UIImage.imageWithColor(color: UIColor.clear), for: UIControl.State.normal)
+            followButton.isHidden = true
+            break
+        case .mutualFollow:
+            followButton.setTitle("已互关", for: UIControl.State.normal)
+            followButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+            followButton.setImage(nil, for: UIControl.State.normal)
+            followButton.layer.borderColor = kffffffColor.cgColor
+            followButton.layer.borderWidth = 0.5
+            followButton.setBackgroundImage(UIImage.imageWithColor(color: UIColor.clear), for: UIControl.State.normal)
+            followButton.isHidden = true
             
+            break
+        }
+    }
+        
+        /// 设置关注
+        ///
+        /// - Parameters:
+        ///   - followButton: 关注button
+        ///   - followType: 关注类型
+    class func setMineFollowType(followButton:UIButton,followType: FollowType) {
+        switch followType {
+        case .futureFollow:
+            followButton.setTitle("关注", for: UIControl.State.normal)
+            followButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+            followButton.layer.borderColor = kThemeColor.cgColor
+            followButton.layer.borderWidth = 0.5
+            followButton.setBackgroundImage(UIImage.imageWithColor(color: kThemeColor), for: UIControl.State.normal)
             break
         case .alreadyFollow:
             followButton.setTitle("已关注", for: UIControl.State.normal)
@@ -178,13 +215,13 @@ extension CommunityFollowUserViewModel {
         if communityPostDetailModel.isFollow == 0 {//加关注
             self.userFollow(followUid:  communityPostDetailModel.uid ?? 0, completion: { (isFollow) -> Void in
                 communityPostDetailModel.isFollow = isFollow
-                CommunityFollowUserViewModel.setFollowType(followButton: button, followType: FollowType(rawValue: communityPostDetailModel.isFollow ?? 0) ?? .futureFollow)
+                CommunityFollowUserViewModel.setFollowListType(followButton: button, followType: FollowType(rawValue: communityPostDetailModel.isFollow ?? 0) ?? .futureFollow)
 
             })
         }else {//取消关注
             self.userCancelFollow(followUid:  communityPostDetailModel.uid ?? 0, completion: { (isFollow) -> Void in
                 communityPostDetailModel.isFollow = isFollow
-                CommunityFollowUserViewModel.setFollowType(followButton: button, followType: FollowType(rawValue: communityPostDetailModel.isFollow ?? 0) ?? .futureFollow)
+                CommunityFollowUserViewModel.setFollowListType(followButton: button, followType: FollowType(rawValue: communityPostDetailModel.isFollow ?? 0) ?? .futureFollow)
 
             })
         }

RainbowPlanet/RainbowPlanet/ViewModel/Virus/VirusViewModel.swift

@@ -835,7 +835,7 @@ extension VirusViewModel {
 
 // MARK: - 发布
 extension VirusViewModel {
-    func publishVirueRecordAddApi(postId:Int?,postType:String?,title:String?,content:String?,postCover:String?) {
+    func publishVirueRecordAddApi(postId:Int?,postType:String?,title:String?,content:String?,postCover:String?,completion:@escaping ()->Void) {
         
         let virueRecordAddParameterModel = VirueRecordAddParameterModel()
         virueRecordAddParameterModel.behaviorId = (ConfigModel.shared.object()?.virus?.publish ?? "")
@@ -854,7 +854,7 @@ extension VirusViewModel {
         virueRecordAddParameterModel.postCover = postCover
         
         SwiftMoyaNetWorkServiceVirus.shared().virueRecordAddApi(virueRecordAddParameterModel: virueRecordAddParameterModel, completion: {(data) -> (Void) in
-            
+            completion()
         })
     }
 }