图片不做缓存了,后期优化

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -339,6 +339,7 @@
 		A7B4E7582282897B0012914A /* ProductFloorLeftHeaderCollectionReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7B4E7572282897B0012914A /* ProductFloorLeftHeaderCollectionReusableView.swift */; };
 		A7B4E75A228289BB0012914A /* ProductFloorCenterHeaderCollectionReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7B4E759228289BB0012914A /* ProductFloorCenterHeaderCollectionReusableView.swift */; };
 		A7BA18FD230D5B6F00E3B969 /* RootViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7BA18FC230D5B6F00E3B969 /* RootViewController.swift */; };
+		A7BA1902230EA80000E3B969 /* TGCaculateNumberTool.m in Sources */ = {isa = PBXBuildFile; fileRef = A7BA1901230EA80000E3B969 /* TGCaculateNumberTool.m */; };
 		A7BB684F2268DCEC00AB07A2 /* SelfRecommendationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7BB684D2268DCEC00AB07A2 /* SelfRecommendationViewController.swift */; };
 		A7BB68552268DE8600AB07A2 /* SelfRecommendationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7BB68542268DE8600AB07A2 /* SelfRecommendationView.swift */; };
 		A7BB6857226965C100AB07A2 /* SelfRecommendationHeaderCollectionReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7BB6856226965C100AB07A2 /* SelfRecommendationHeaderCollectionReusableView.swift */; };
@@ -1070,6 +1071,8 @@
 		A7B4E7572282897B0012914A /* ProductFloorLeftHeaderCollectionReusableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductFloorLeftHeaderCollectionReusableView.swift; sourceTree = "<group>"; };
 		A7B4E759228289BB0012914A /* ProductFloorCenterHeaderCollectionReusableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductFloorCenterHeaderCollectionReusableView.swift; sourceTree = "<group>"; };
 		A7BA18FC230D5B6F00E3B969 /* RootViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootViewController.swift; sourceTree = "<group>"; };
+		A7BA1900230EA80000E3B969 /* TGCaculateNumberTool.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TGCaculateNumberTool.h; sourceTree = "<group>"; };
+		A7BA1901230EA80000E3B969 /* TGCaculateNumberTool.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TGCaculateNumberTool.m; sourceTree = "<group>"; };
 		A7BB684D2268DCEC00AB07A2 /* SelfRecommendationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfRecommendationViewController.swift; sourceTree = "<group>"; };
 		A7BB68542268DE8600AB07A2 /* SelfRecommendationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfRecommendationView.swift; sourceTree = "<group>"; };
 		A7BB6856226965C100AB07A2 /* SelfRecommendationHeaderCollectionReusableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfRecommendationHeaderCollectionReusableView.swift; sourceTree = "<group>"; };
@@ -3411,6 +3414,7 @@
 				A72A727722321DDF00B21995 /* Regex */,
 				A77F2CC422320627001BD3F6 /* WRNavigationBar */,
 				A72A729F22321DE000B21995 /* WKWebView */,
+				A7BA1903230EA80800E3B969 /* CaculateNumberTool */,
 			);
 			path = Tools;
 			sourceTree = "<group>";
@@ -3797,6 +3801,15 @@
 			path = RootViewController;
 			sourceTree = "<group>";
 		};
+		A7BA1903230EA80800E3B969 /* CaculateNumberTool */ = {
+			isa = PBXGroup;
+			children = (
+				A7BA1900230EA80000E3B969 /* TGCaculateNumberTool.h */,
+				A7BA1901230EA80000E3B969 /* TGCaculateNumberTool.m */,
+			);
+			path = CaculateNumberTool;
+			sourceTree = "<group>";
+		};
 		A7BB68512268DCF800AB07A2 /* SelfRecommendation */ = {
 			isa = PBXGroup;
 			children = (
@@ -6582,6 +6595,7 @@
 				BD09C84122955B480080D5A4 /* PopTopTriangleView.swift in Sources */,
 				BDA45BFF22E45EBC009DE548 /* PublishUploadProgressView.swift in Sources */,
 				A70B2C5A22886ADF00B2449F /* ShopViewController.swift in Sources */,
+				A7BA1902230EA80000E3B969 /* TGCaculateNumberTool.m in Sources */,
 				BDF862AE228E57E1000DEF84 /* OrderCommentDefaultCollectionCell.swift in Sources */,
 				BD61229722C3605C00D3F513 /* AliyunEffectPrestoreManager.m in Sources */,
 				A70B2C3E228825B100B2449F /* ProductDetailEvaluationTableViewCell.swift in Sources */,

RainbowPlanet/RainbowPlanet/Base/BaseViewController/BaseViewController.swift

@@ -15,6 +15,11 @@ class BaseViewController: UIViewController {
     let disposeBag = DisposeBag()
 
     lazy var navigationBar = WRCustomNavigationBar.CustomNavigationBar()
+    
+    deinit {
+        KingfisherManager.shared.cache.clearDiskCache()
+        KingfisherManager.shared.cache.clearMemoryCache()
+    }
 
     override func viewDidLoad() {
         super.viewDidLoad()

RainbowPlanet/RainbowPlanet/Macro/RainbowPlanet-Bridging-Header.h

@@ -18,6 +18,8 @@
 
 // mj刷新封装
 #import "UIScrollView+MJRefreshEX.h"
+
+#import "TGCaculateNumberTool.h"
 // 限制字符
 #import "TextLimitTool.h"
 //瀑布流

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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
 
         }
     }

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

@@ -63,13 +63,13 @@ class CardContentActionTableViewCell: UITableViewCell {
             make.height.equalTo(24)
         }
         shareButton.snp.makeConstraints { (make) in
-            make.centerY.equalToSuperview().offset(2)
-            make.right.equalTo(-17)
-            make.size.equalTo(22)
+            make.centerY.equalToSuperview().offset(1)
+            make.right.equalTo(-13)
+            make.size.equalTo(30)
         }
         collectButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.right.equalTo(shareButton.snp_left).offset(-21)
+            make.right.equalTo(shareButton.snp_left).offset(-17)
             make.size.equalTo(22)
         }
         collectAnimationView.snp.makeConstraints { (make) in

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"))
-        
+        KingfisherManager.shared.cache.clearMemoryCache()
 
         avatarButton.cornerRadius = 14
         avatarButton.masksToBounds = true

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

@@ -69,7 +69,7 @@ class CardContentPicVideoCollectionViewCell: UICollectionViewCell {
         didSet {
             let imageResource = ImageResource(downloadURL: kURLThumbnailsImage(name: imgStr ?? "",size: self.size)!)
             iconImageView.kf.setImage(with: imageResource, placeholder: kImage(name: "default_pic"))
-           
+           KingfisherManager.shared.cache.clearMemoryCache()
         }
     }
     

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

@@ -160,7 +160,7 @@ 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"))
-//            
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleButton.setTitle(communityRecommendDataModel?.username, for: UIControl.State.normal)
             timeLabel.text = communityRecommendDataModel?.createdAt
             if communityRecommendDataModel?.uid == UserModel.shared().getModel()?.uid {
@@ -177,7 +177,7 @@ class CardContentUserTableViewCell: UITableViewCell {
         didSet {
             avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityFollowDataModel?.relateData?.avatar ?? "",size: kSize40x40Image), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
             
-
+            KingfisherManager.shared.cache.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,8 @@ 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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
+
 
             topicLabel.text = communityRecommendTypeDataModel?.name
             numberPeopleLable.text = "\(communityRecommendTypeDataModel?.followCount ?? "0")人参与"

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

@@ -205,6 +205,7 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
         let titleOtherButton = UIButton(type: UIButton.ButtonType.custom)
         titleOtherButton.setTitle("其他用户昵称", for: UIControl.State.normal)
         titleOtherButton.setTitleColor(k333333Color, for: UIControl.State.normal)
+        titleOtherButton.contentHorizontalAlignment = .left
         titleOtherButton.titleLabel?.font = kMediumFont15
         titleOtherButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
@@ -299,7 +300,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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
 
             titleButton.setTitle(communityFollowDataModel?.followUsername, for: UIControl.State.normal)
             skittlesTitleLabel.text = "收获 \(communityFollowDataModel?.content?.beans ?? 0) U米"
@@ -316,7 +317,7 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
             case .follow?:
                 timeStatusLabel.text = "\(communityFollowDataModel?.createdAt ?? "") 关注了"
                 avatarOtherButton.kf.setImage(with: kURLThumbnailsImage(name: communityFollowDataModel?.relateData?.avatar ?? "",size: kSize40x40Image), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
-                
+                KingfisherManager.shared.cache.clearMemoryCache()
 
                 titleOtherButton.setTitle(communityFollowDataModel?.relateData?.username, for: UIControl.State.normal)
                 if communityFollowDataModel?.relateData?.uid == UserModel.shared().getModel()?.uid {
@@ -444,7 +445,7 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
     /// 内容详情页面
     @objc func contentDetail() {
         if PostType(rawValue: communityFollowDataModel?.relateData?.type ?? "video") == .video {
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityContentDetailClosure"), object: communityFollowDataModel?.relateId)
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityContentVideoClosure"), object: communityFollowDataModel?.relateId)
 
         }else {
             NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityContentDetailClosure"), object: communityFollowDataModel?.relateId)

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"))
-            
+            KingfisherManager.shared.cache.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"))
-            
+            KingfisherManager.shared.cache.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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
 
 
             titleButton.setTitle(cmsMemberModel?.username, for: UIControl.State.normal)

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Header/CommunityCommonSectionHeaderView.swift

@@ -56,7 +56,11 @@ class CommunityCommonSectionHeaderView: BaseView {
             [weak self] (data) in
             switch self?.communityCommonSectionHeaderViewType {
             case .recommendFollow?:
-                NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityFindFriends"), object: nil)
+                if UserModel.isTokenNil() {
+                    kAppDelegate.setLogin()
+                }else {
+                    NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityFindFriends"), object: nil)
+                }
                 break
             case .featuredTopics?:
 

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

@@ -108,6 +108,7 @@ class CommunityViewController: BaseViewController {
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityFindFriends"), object: nil, queue: OperationQueue.main) { [weak self] (notification) in
             let vc = CommunityFindFriendsViewController()
             self?.navigationController?.pushViewController(vc, animated: true)
+    
         }
         
         // 推荐分享

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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
 
             self?.navigationBar.barBackgroundImage = self?.bgImageView.image
             self?.communityFeaturedTopicsHeaderView.communityTopicDetailModel = self?.communityTopicDetailModel

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

@@ -123,7 +123,7 @@ class CommunityRecommendController: BaseViewController {
         followButton.cornerRadius = 12
         followButton.masksToBounds = true
         followButton.layer.borderWidth = 0.5
-        followButton.isHidden = true
+        followButton.alpha = 0
         return followButton
     }()
     
@@ -356,12 +356,13 @@ extension CommunityRecommendController {
                 self?.navigationController?.popToRootViewController(animated: true)
             })
             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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
             self?.nameButton.setTitle(self?.communityPostDetailModel?.username, for: UIControl.State.normal)
             if self?.communityPostDetailModel?.uid == UserModel.shared().getModel()?.uid {
-                self?.followButton.isHidden = true
+                self?.followButton.alpha = 0
             }else {
                 CommunityFollowUserViewModel.setFollowListType(followButton: self?.followButton, followType: FollowType(rawValue: self?.communityPostDetailModel?.isFollow ?? 0) ?? .futureFollow)
             }
@@ -369,9 +370,9 @@ extension CommunityRecommendController {
             self?.count = self?.communityPostDetailModel?.commentCount ?? 0
             
             if PostType(rawValue: self?.communityPostDetailModel?.type ?? "html") == .html {
-                self?.avatarButton.isHidden = true
-                self?.nameButton.isHidden = true
-                self?.followButton.isHidden = true
+                self?.avatarButton.alpha = 0
+                self?.nameButton.alpha = 0
+                self?.followButton.alpha = 0
             }else {
                 self?.communityPostDetailTableViewHeaderView.frame = CGRect(x: 0, y: 0, width: kScreenWidth, height: kScreenWidth)
 
@@ -385,6 +386,7 @@ extension CommunityRecommendController {
                 
                 self?.communityPostDetailTableViewHeaderView.communityPostDetailModel = self?.communityPostDetailModel
             }
+
             self?.setupLayouts()
             self?.tableView.reloadData()
             self?.readVirueRecordAddApi()
@@ -804,6 +806,28 @@ extension CommunityRecommendController: UITableViewDataSource, UITableViewDelega
 
 // MARK: - scrollView
 extension CommunityRecommendController {
+    
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+
+        if PostType(rawValue: communityPostDetailModel?.type ?? "html") == .html {
+            let offsetY = scrollView.contentOffset.y
+            if (offsetY > kSafeStatusBarHeight) {
+                let alpha = (offsetY - kSafeStatusBarHeight) / CGFloat(kNavBarTotalHeight)
+                self.avatarButton.alpha = alpha
+                self.nameButton.alpha = alpha
+                if self.communityPostDetailModel?.uid == UserModel.shared().getModel()?.uid {
+                    self.followButton.alpha = 0
+                }else {
+                    self.followButton.alpha = alpha
+                }
+            } else {
+                self.avatarButton.alpha = 0
+                self.nameButton.alpha = 0
+                self.followButton.alpha = 0
+            }
+        }
+    }
+    
     func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
         lastContentOffset = scrollView.contentOffset.y
     }

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"))
-            
+            KingfisherManager.shared.cache.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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
 
             
             titleLabel.text = communityPostReplyModel?.username

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

@@ -57,7 +57,7 @@ class CommunityPostDetailFSPagerViewCell: FSPagerViewCell {
     var img : String? {
         didSet {
             bgImageView.kf.setImage(with: kURLThumbnailsPadImage(name: img ?? "", size: self.size), placeholder: kImage(name: "default_pic"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
 
         }
     }

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

@@ -272,7 +272,7 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
         didSet {
             
             avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostDetailModel?.avatar ?? "",size: kSize30x30Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
             nameButton.setTitle(communityPostDetailModel?.username, for: UIControl.State.normal)
             CommunityFollowUserViewModel.setFollowListType(followButton: followButton, followType: FollowType(rawValue: communityPostDetailModel?.isFollow ?? 0) ?? .futureFollow)
             beanLabel.text = "\(communityPostDetailModel?.availableBean ?? 0) U米待收获"

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

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

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

@@ -74,6 +74,7 @@ extension CommunityShareActivityViewController {
         SwiftMoyaNetWorkServiceConfig.shared().configPosterInviteApi {
              [weak self] (data) -> (Void) in
             self?.bgImageView.kf.setImage(with: kURLImage(name: (data as! String)), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             self?.shareCommunityContentView.imageUrl = (data as! String)
         }
     }

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"))
-            
+            KingfisherManager.shared.cache.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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
             
             titleLabel.text = communityPostReplyModel?.username
             

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

@@ -811,6 +811,11 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         videoPlayView.pause()
     }
     
+    func pauseWillDisappear() {
+        playStatusImageView.isHidden = true
+        videoPlayView.pause()
+    }
+    
     var videoItemMdl: CommunityVideoItemModel? {
         didSet {
             // 数据不存在
@@ -853,7 +858,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
             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"))
-            
+            KingfisherManager.shared.cache.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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = communityPostCommentModel?.username
             contentLabel.text = communityPostCommentModel?.content
             timeLabel.text = communityPostCommentModel?.createdAt

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

@@ -72,7 +72,7 @@ class CommunityVideoListController: BaseViewController {
     }
     
     override func viewWillDisappear(_ animated: Bool) {
-        pauseCurrentVideo()
+        pauseWillDisappear()
         UIApplication.shared.isIdleTimerDisabled = false
     }
     
@@ -322,6 +322,12 @@ extension CommunityVideoListController {
         }
     }
     
+    func pauseWillDisappear() {
+        if prePlayCell != nil {
+            prePlayCell?.pauseWillDisappear()
+        }
+    }
+    
     func playFirstVideoWhenViewDidAppeared() {
         DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Double(Int64(0.4 * Double(NSEC_PER_SEC))) / Double(NSEC_PER_SEC)) { () -> Void in
             let showCells = self.collectionView.visibleCells

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

@@ -197,8 +197,8 @@ class MessageListTableCell: UITableViewCell {
                 
             }
             timeLabel.text = messageDataModel?.createdAt
-            contentImageView.kf.setImage(with: kURLThumbnailsImage(name: messageDataModel?.param?.cover ?? "", size: kSize44x44Image), placeholder: kImage(name: "default_pic"))
-            
+            contentImageView.kf.setImage(with: kURLThumbnailsImage(name: messageDataModel?.param?.cover ?? "", size: kSize120x120Image), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
 
             if messageDataModel?.param?.activityTime == nil || messageDataModel?.param?.activityTime == "" {
                 titleLabel.snp.remakeConstraints { (make) in

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetNotification/View/MessagePlanetNotiTableCell.swift

@@ -129,7 +129,7 @@ class MessagePlanetNotiTableCell: UITableViewCell {
     
     private lazy var organizerLabel: UILabel = {
         let organizerLabel = UILabel()
-        organizerLabel.text = "彩虹星球"
+        organizerLabel.text = "由你"
         organizerLabel.textColor = k333333Color
         organizerLabel.font = kRegularFont14
         organizerLabel.textAlignment = .left

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"))
-            
+            KingfisherManager.shared.cache.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

@@ -243,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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
 
 
         }

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

@@ -111,7 +111,7 @@ class PersonViewUserAndOtherListCollectionViewCell: UICollectionViewCell {
         didSet {
             iconImageView.kf.setImage(with: kURLThumbnailsImage(name: postMyModel?.img ?? "", size: self.size), placeholder: kImage(name: "default_pic"))
             
-
+            KingfisherManager.shared.cache.clearMemoryCache()
             rainbowBeanNumberLabel.text = "\(postMyModel?.collectBean ?? 0)"
             if PostMyModelType(rawValue: postMyModel?.type ?? "") == .video {
                 videoImageView.isHidden = false

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

@@ -308,8 +308,8 @@ extension UserPersonalCenterViewController {
             self?.userDetailModel = userDetailModel as? UserDetailModel
             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"))
-            
+            self?.avatarButton.kf.setImage(with: kURLThumbnailsImage(name: self?.userDetailModel?.avatar ?? "", size: kSize60x60Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            KingfisherManager.shared.cache.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,6 +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"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             
         }
     }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/View/OrderProductTableViewCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Kingfisher
 
 class OrderProductTableViewCell: UITableViewCell {
 
@@ -136,8 +137,8 @@ class OrderProductTableViewCell: UITableViewCell {
     
     var orderModelDetailModel: OrderModelDetailModel? {
         didSet {
-            productImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            productImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = orderModelDetailModel?.productName
             timeLabel.text = "预计配送时间：\(orderModelDetailModel?.receiveTime ?? "")"
             skuLabel.text = "规格：\(orderModelDetailModel?.skuName ?? "")"

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderApplyRefund/View/OrderApplyRefundProductCell.swift

@@ -9,6 +9,7 @@
 import UIKit
 import RxSwift
 import RxCocoa
+import Kingfisher
 
 class OrderApplyRefundProductCell: UITableViewCell {
     
@@ -170,8 +171,8 @@ class OrderApplyRefundProductCell: UITableViewCell {
             let selStatus = orderModelDetailModel?.isSelect == 1 ? true : false
             selectBtn.isSelected = selStatus
             
-            productImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            productImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = orderModelDetailModel?.productName
             timeLabel.text = "预计配送时间：\(orderModelDetailModel?.receiveTime ?? "")"
             skuLabel.text = "规格：\(orderModelDetailModel?.skuName ?? "")"

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderComment/View/OrderCommentAddImgCollectionCell.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import RxSwift
+import Kingfisher
 
 class OrderCommentAddImgCollectionCell: UICollectionViewCell {
     
@@ -23,8 +24,8 @@ class OrderCommentAddImgCollectionCell: UICollectionViewCell {
     
     var productSearchModel: ProductSearchModel? {
         didSet {
-            picImageView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)            
+            picImageView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderComment/View/OrderCommentTableViewCell.swift

@@ -9,6 +9,7 @@
 import UIKit
 import RxSwift
 import IQKeyboardManagerSwift
+import Kingfisher
 
 class OrderCommentTableViewCell: UITableViewCell {
     
@@ -38,8 +39,8 @@ class OrderCommentTableViewCell: UITableViewCell {
     var orderModelDetailModel: OrderModelDetailModel? {
         didSet {
             // 商品图片
-            iconImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            iconImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             starView.value = CGFloat(self.orderModelDetailModel?.starValue ?? 5)
         }
     }

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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = orderModelDetailModel?.productName
             timeLabel.text = "预计配送时间：\(orderModelDetailModel?.receiveTime ?? "")"
             skuLabel.text = "规格：\(orderModelDetailModel?.skuName ?? "")"

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/View/ShoppingCartPayOrderItemCell.swift

@@ -7,14 +7,15 @@
 //  订单支付--商品列表Cell
 
 import UIKit
+import Kingfisher
 
 class ShoppingCartPayOrderItemCell: UITableViewCell {
     
     var productMdl : ProductModel? {
         didSet {
             // 商品图片
-            iconImageView.kf.setImage(with: kURLImage(name: productMdl?.productImg ?? ""), placeholder: kImage(name: "default_pic")           
-)
+            iconImageView.kf.setImage(with: kURLImage(name: productMdl?.productImg ?? ""), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             // 商品名称
             titleLabel.text = productMdl?.productName
             // 预计配送时间

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/ResourceManager/Views/AliyunEffectFilterCell.m

@@ -32,7 +32,7 @@
     [super awakeFromNib];
     _imageView.layer.cornerRadius = 25;
     _imageView.layer.masksToBounds = YES;
-    _imageView.layer.borderColor = AlivcOxRGB(0x62CC74).CGColor;
+    _imageView.layer.borderColor = AlivcOxRGB(0x25E0CD).CGColor;
 }
 
 - (void)cellModel:(AliyunEffectInfo *)effectInfo {

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoCrop/View/AliyunCropThumbnailView.m

@@ -77,6 +77,9 @@
     _progressView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"video_edit_progressbar"]];
     _progressView.bounds = CGRectMake(0, 0, 4, 80);
     _progressView.center = CGPointMake(0, CGRectGetMidY(self.bounds) + 19);
+    _progressView.layer.cornerRadius = 3;
+    _progressView.layer.masksToBounds = YES;
+    _progressView.clipsToBounds = YES;
     [self addSubview:_progressView];
     
     _durationLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, ScreenWidth - 200, 18)];
@@ -178,28 +181,15 @@
 
 - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
     UICollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"cell" forIndexPath:indexPath];
+    cell.layer.cornerRadius = 3;
+    cell.layer.masksToBounds = YES;
+    cell.clipsToBounds = YES;
     UIImage *image = _imagesArray[indexPath.row];
     UIImageView *imageView = [[UIImageView alloc] initWithImage:image];
     imageView.frame = cell.contentView.bounds;
     imageView.contentMode = UIViewContentModeScaleAspectFill;
     imageView.clipsToBounds = YES;
     [cell.contentView addSubview:imageView];
-    if (indexPath.row == 0){
-        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:imageView.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopLeft cornerRadii:CGSizeMake(3, 3)];
-        CAShapeLayer *maskLayer = [CAShapeLayer new];
-        maskLayer.frame = imageView.bounds;
-
-        maskLayer.path = maskPath.CGPath;
-        imageView.layer.mask = maskLayer;
-    }
-    if (indexPath.row == _imagesArray.count - 1){
-        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:imageView.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopLeft cornerRadii:CGSizeMake(3, 3)];
-        CAShapeLayer *maskLayer = [CAShapeLayer new];
-        maskLayer.frame = imageView.bounds;
-        
-        maskLayer.path = maskPath.CGPath;
-        imageView.layer.mask = maskLayer;
-    }
     return cell;
 }
 

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/Config/AlivcMacro.h

@@ -109,3 +109,4 @@
 
 
 /* AlivcMacro_h */
+

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"))
-            
+            KingfisherManager.shared.cache.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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
 
         }
     }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMediaPicker/KSExtension.swift

@@ -154,7 +154,7 @@ extension UIColor {
     public static let ks_wordMain = UIColor(red: 44/255.0, green: 41/255.0, blue: 84/255.0, alpha: 1)
     public static let ks_wordMain_2 = UIColor(red: 44/255.0, green: 41/255.0, blue: 84/255.0, alpha: 0.5)
     public static let ks_background = UIColor(red: 248/255.0, green: 248/255.0, blue: 248/255.0, alpha: 1)
-    public static let ks_main = UIColor(red: 98/255.0, green: 204/255.0, blue: 116/255.0, alpha: 1)
+    public static let ks_main = kThemeColor
     public static let ks_white = UIColor.white
     public static let ks_black = UIColor.black
 }

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishMusicVolumnView.swift

@@ -213,6 +213,17 @@ class PublishMusicVolumnView: FWPopupView {
         NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ChangeAudioVolumnNoti"), object: paraDic)
     }
     
+    override func tapGesClick(tap: UITapGestureRecognizer) {
+        super.tapGesClick(tap: tap)
+        var paraDic = Dictionary<String, Any>()
+        paraDic.updateValue(originVolumn!, forKey: "origin")
+        paraDic.updateValue(backVolumn!, forKey: "back")
+        NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ChangeAudioVolumnNoti"), object: paraDic)
+    }
+    
+
+    
+    
     /// 初始化View
     @objc class func publishMusicVolumnView(attachedView:UIView, oriVolumn:CGFloat, backVolumn:CGFloat) -> PublishMusicVolumnView {
         let view = PublishMusicVolumnView()

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishViewController.swift

@@ -15,6 +15,7 @@ class PublishViewController: BaseViewController {
         super.didReceiveMemoryWarning()
     }
     
+
     deinit {
         NXLLog("deinit")
     }
@@ -123,7 +124,7 @@ class PublishViewController: BaseViewController {
     //3.初始化指示器indicator
     private lazy var indicator: JXSegmentedIndicatorRainbowLineView = {
         let indicator = JXSegmentedIndicatorRainbowLineView()
-        indicator.indicatorColors = [k62CC74Color,.white,.white]
+        indicator.indicatorColors = [kThemeColor,.white,.white]
         indicator.indicatorHeight = 3
         indicator.indicatorWidth = 20
         indicator.verticalOffset = 8

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

@@ -59,7 +59,7 @@ class RedemptionAreaBannerTableViewCell: UITableViewCell {
         
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("userMemberGetTotalBean"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in
             let totalBeanModel = notification.object as? TotalBeanModel
-            self?.beanNumberLabel.fn_setNumber(NSNumber(integerLiteral: totalBeanModel?.totalBean ?? 0))
+            self?.beanNumberLabel.text = TGCaculateNumberTool.string(fromNumber: Double(totalBeanModel?.totalBean ?? 0), toFixedCount: 1, roundingMode: TGCNRoundingMode.onlyDown)
            
         }
         UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApi()
@@ -153,7 +153,7 @@ class RedemptionAreaBannerTableViewCell: UITableViewCell {
     
     lazy var beanNumberLabel: UILabel = {
         let beanNumberLabel = UILabel()
-        beanNumberLabel.text = "88888"
+        beanNumberLabel.text = "0"
         beanNumberLabel.textColor = k333333Color
         beanNumberLabel.font = kMediumFont26
         beanNumberLabel.adjustsFontSizeToFitWidth = true

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"))
-            
+            KingfisherManager.shared.cache.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"))
-            
+            KingfisherManager.shared.cache.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"))
-            
+            KingfisherManager.shared.cache.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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
 
         }
     }

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

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Kingfisher
 
 class SpecialTwoTypeCollectionViewCell: UICollectionViewCell {
     class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> SpecialTwoTypeCollectionViewCell {
@@ -56,8 +57,8 @@ class SpecialTwoTypeCollectionViewCell: UICollectionViewCell {
     
     var cmsRedemptionAreaRule : CMSRedemptionAreaRule? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: cmsRedemptionAreaRule?.url ?? ""), placeholder: kImage(name: "default_pic")           
-)
+            iconImageView.kf.setImage(with: kURLImage(name: cmsRedemptionAreaRule?.url ?? ""), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
 
             titleLabel.text = communityTopicModel?.name
             selectionButton.isSelected = communityTopicModel?.isSelected ?? false

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

@@ -66,6 +66,7 @@ class SearchContentListCollectionCell: UICollectionViewCell {
         addSubview(avatarButton)
         addSubview(nameButton)
         addSubview(likeBtn)
+        addSubview(likeLabel)
         contentImageView.addSubview(pauseImageView)
         likeBtn.imageView?.addSubview(praiseAnimationView)
 
@@ -85,20 +86,29 @@ class SearchContentListCollectionCell: UICollectionViewCell {
             make.left.equalToSuperview().offset(10)
             make.size.equalTo(18)
         }
+        
+        nameButton.snp.makeConstraints { (make) in
+            make.centerY.equalTo(avatarButton)
+            make.left.equalTo(avatarButton.snp_right).offset(5)
+            make.height.equalTo(18)
+            make.right.equalTo(likeBtn.snp_left).offset(-5)
+        }
 
-        likeBtn.snp.remakeConstraints { (make) in
+        
+        likeLabel.snp.makeConstraints { (make) in
             make.centerY.equalTo(avatarButton)
             make.right.equalTo(-13)
-            make.height.equalTo(18)
+            make.left.equalTo(likeBtn.snp.right)
         }
-        likeBtn.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
         
-        nameButton.snp.remakeConstraints { (make) in
+        likeBtn.snp.makeConstraints { (make) in
             make.centerY.equalTo(avatarButton)
-            make.left.equalTo(avatarButton.snp_right).offset(5)
-            make.height.equalTo(18)
-            make.right.equalTo(likeBtn.snp_left).offset(-5)
+            make.right.equalTo(likeLabel.snp.left).offset(-3)
+            make.size.equalTo(18)
         }
+        
+        
+ 
         praiseAnimationView.snp.makeConstraints { (make) in
             make.edges.equalToSuperview()
         }
@@ -111,27 +121,10 @@ class SearchContentListCollectionCell: UICollectionViewCell {
     func setupdata() {
         avatarButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
-            if UserModel.isTokenNil() {
-                kAppDelegate.setLogin()
-            }else {
-                if let userClosure = self?.userClosure {
-                    userClosure()
-                }
-            }
+            self?.nameButtonAction()
             
         }).disposed(by: disposeBag)
         
-        nameButton.rx.tap.subscribe(onNext: {
-            [weak self] (data) in
-            if UserModel.isTokenNil() {
-                kAppDelegate.setLogin()
-            }else {
-                if let userClosure = self?.userClosure {
-                    userClosure()
-                }
-            }
-        }).disposed(by: disposeBag)
-        
         likeBtn.rx.tap.subscribe(onNext: { [weak self] (data) in
             if UserModel.isTokenNil() {
                 kAppDelegate.setLogin()
@@ -177,27 +170,41 @@ class SearchContentListCollectionCell: UICollectionViewCell {
     }()
     
     
-    private lazy var nameButton: UIButton = {
-        let nameButton = UIButton(type: UIButton.ButtonType.custom)
-        nameButton.setTitle("昵称", for: UIControl.State.normal)
-        nameButton.setTitleColor(k262626Color, for: UIControl.State.normal)
-        nameButton.titleLabel?.font = kRegularFont12
-        nameButton.contentHorizontalAlignment = .left
-        nameButton.titleLabel?.lineBreakMode = .byTruncatingTail
-        
+    private lazy var nameButton: UILabel = {
+        let nameButton = UILabel()
+        nameButton.text = "昵称"
+        nameButton.textColor = k262626Color
+        nameButton.font = kRegularFont12
+        nameButton.textAlignment = .left
+        nameButton.addTapGesture(1, target: self, action: #selector(nameButtonAction))
         return nameButton
     }()
     
+    @objc func nameButtonAction() {
+        if UserModel.isTokenNil() {
+            kAppDelegate.setLogin()
+        }else {
+            if let userClosure = self.userClosure {
+                userClosure()
+            }
+        }
+    }
+    
     lazy var likeBtn: UIButton = {
         let likeBtn = UIButton(type: UIButton.ButtonType.custom)
-        likeBtn.setTitleColor(k999999Color, for: UIControl.State.normal)
         likeBtn.setImage(kImage(name: "btn_praise"), for: UIControl.State.normal)
         likeBtn.setImage(kImage(name: "btn_praise_pre_36px"), for: UIControl.State.selected)
-        likeBtn.titleLabel?.font = kRegularFont12
         
         return likeBtn
     }()
     
+    lazy var likeLabel: UILabel = {
+        let likeLabel = UILabel()
+        likeLabel.textColor = k999999Color
+        likeLabel.font = kRegularFont12
+        return likeLabel
+    }()
+    
     private lazy var praiseAnimationView: AnimationView = {
         let praiseAnimationView = AnimationView()
         let animation = Animation.named("verywell")
@@ -216,8 +223,7 @@ class SearchContentListCollectionCell: UICollectionViewCell {
     
     var communityPostDataModel : CommunityPostDataModel? {
         didSet {
-            contentImageView.kf.setImage(with: kURLImage(name: communityPostDataModel?.img ?? ""), placeholder: kImage(name: "default_pic")           
-)
+            contentImageView.kf.setImage(with: kURLImage(name: communityPostDataModel?.img ?? ""), placeholder: kImage(name: "default_pic"))
             titleLabel.text = communityPostDataModel?.title
             if communityPostDataModel?.title == "" || communityPostDataModel?.title == nil {
                 titleLabel.text = communityPostDataModel?.content?.replacingOccurrences(of: "\n", with: "").replacingOccurrences(of: "\r", with: "")
@@ -225,32 +231,38 @@ class SearchContentListCollectionCell: UICollectionViewCell {
                 titleLabel.text = communityPostDataModel?.title?.replacingOccurrences(of: "\n", with: "").replacingOccurrences(of: "\r", with: "")
             }
             avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostDataModel?.avatar ?? "", size: kSize18x18Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            KingfisherManager.shared.cache.clearMemoryCache()
+            nameButton.text = communityPostDataModel?.username
 
-            likeBtn.setTitle("\(communityPostDataModel?.praiseCount ?? 0)", for: UIControl.State.normal)
+            likeLabel.text = "\(communityPostDataModel?.praiseCount ?? 0)"
             if communityPostDataModel?.isLike == 0 {
                 likeBtn.isSelected = false
             }else {
                 likeBtn.isSelected = true
             }
-
+            if PostType(rawValue: communityPostDataModel?.type ?? "video") == .video  {
+                pauseImageView.isHidden = false
+            }else {
+                pauseImageView.isHidden = true
+            }
             
-            nameButton.setTitle(communityPostDataModel?.username, for: UIControl.State.normal)
             nameButton.snp.remakeConstraints { (make) in
                 make.centerY.equalTo(avatarButton)
                 make.left.equalTo(avatarButton.snp_right).offset(5)
                 make.height.equalTo(18)
-                make.right.lessThanOrEqualTo(likeBtn.snp_left).offset(-5)
+                make.right.equalTo(likeBtn.snp_left).offset(-5)
             }
-            likeBtn.snp.remakeConstraints { (make) in
+            
+            likeLabel.snp.remakeConstraints { (make) in
                 make.centerY.equalTo(avatarButton)
                 make.right.equalTo(-13)
-                make.height.equalTo(18)
+                make.left.equalTo(likeBtn.snp.right)
             }
-            likeBtn.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
-            if PostType(rawValue: communityPostDataModel?.type ?? "video") == .video  {
-                pauseImageView.isHidden = false
-            }else {
-                pauseImageView.isHidden = true
+            
+            likeBtn.snp.remakeConstraints { (make) in
+                make.centerY.equalTo(avatarButton)
+                make.right.equalTo(likeLabel.snp.left).offset(-3)
+                make.size.equalTo(18)
             }
             
             

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchResult/View/SearchResultNavigationbarView.swift

@@ -14,6 +14,8 @@ class SearchResultNavigationbarView: BaseView {
         
     deinit {
         NXLLog("deinit")
+        searchTextField.delegate = nil
+
     }
 
     

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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
 
             titleLabel.text = communityTopicDataModel?.name
             subtitleLabel.text = "\(communityTopicDataModel?.followCount ?? "0")人参与"

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

@@ -146,7 +146,7 @@ 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"))
-
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleButton.setTitle(userFollowModel?.followUsername, for: UIControl.State.normal)
             var followTopic = Array<String>()
             if !(userFollowModel?.followTopic?.isEmpty ?? true) {
@@ -169,7 +169,7 @@ 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"))
-
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleButton.setTitle(userFanModel?.fanUsername, for: UIControl.State.normal)
             var followTopic = Array<String>()
             if !(userFanModel?.fanTopic?.isEmpty ?? true) {
@@ -192,7 +192,7 @@ 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"))
-
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleButton.setTitle(cmsMemberModel?.username, for: UIControl.State.normal)
             var followTopic = Array<String>()
             if !(cmsMemberModel?.followTopic?.isEmpty ?? true) {
@@ -216,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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
 
             titleButton.setTitle(searchMemberModel?.username, for: UIControl.State.normal)
             var followTopic = Array<String>()

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductAllComment/View/ProductDetailEvaluationImageCollectionViewCell.swift

@@ -7,13 +7,14 @@
 //
 
 import UIKit
+import Kingfisher
 
 class ProductDetailEvaluationImageCollectionViewCell: UICollectionViewCell {
     
     var imageUrl: String? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: imageUrl ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            iconImageView.kf.setImage(with: kURLImage(name: imageUrl ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductAllComment/View/ProductDetailEvaluationListTableViewCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Kingfisher
 
 class ProductDetailEvaluationListTableViewCell: UITableViewCell {
     
@@ -159,8 +160,8 @@ class ProductDetailEvaluationListTableViewCell: UITableViewCell {
     
     var productCommentModel: ProductCommentModel? {
         didSet {
-            avatarImagView.kf.setImage(with: kURLImage(name: productCommentModel?.avatar ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            avatarImagView.kf.setImage(with: kURLImage(name: productCommentModel?.avatar ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             nameLabel.text = productCommentModel?.username
             timeLabel.text = productCommentModel?.createdAt
             let attributeString = NSMutableAttributedString(string:productCommentModel?.content ?? "")

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/View/Cell/ProductDetailEvaluation/ProductDetailEvaluationTableViewCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Kingfisher
 
 class ProductDetailEvaluationTableViewCell: UITableViewCell {
     
@@ -110,8 +111,8 @@ class ProductDetailEvaluationTableViewCell: UITableViewCell {
     
     var productCommentModel : ProductCommentModel? {
         didSet {
-            avatarImageView.kf.setImage(with: kURLImage(name: productCommentModel?.avatar ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            avatarImageView.kf.setImage(with: kURLImage(name: productCommentModel?.avatar ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             nickNameLabel.text = productCommentModel?.username
             let attributeString = NSMutableAttributedString(string:productCommentModel?.content ?? "")
             attributeString.changeAllLineSpacing(2)

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/View/Cell/ProductDetailProductLabel/ProductDetailProductLabelIconCollectionViewCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Kingfisher
 
 class ProductDetailProductLabelIconCollectionViewCell: UICollectionViewCell {
     class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> ProductDetailProductLabelIconCollectionViewCell {
@@ -65,8 +66,8 @@ class ProductDetailProductLabelIconCollectionViewCell: UICollectionViewCell {
     
     var label : ProductDetailLabelModel? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: label?.img ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            iconImageView.kf.setImage(with: kURLImage(name: label?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = label?.name
         }
     }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/View/Cell/ProductDetailShop/ProductDetailShopTableViewCell.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import RxSwift
+import Kingfisher
 
 class ProductDetailShopTableViewCell: UITableViewCell {
     
@@ -105,8 +106,8 @@ class ProductDetailShopTableViewCell: UITableViewCell {
     
     var productDetailModel : ProductDetailModel? {
         didSet {
-            shopImageView.kf.setImage(with: kURLImage(name: productDetailModel?.logoImg ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            shopImageView.kf.setImage(with: kURLImage(name: productDetailModel?.logoImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             shopNameLabel.text = productDetailModel?.shopName
             
         }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/View/ProductDetailHeader/ProductDetailFSPagerViewCell.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import FSPagerView
+import Kingfisher
 class ProductDetailFSPagerViewCell: FSPagerViewCell {
     class func cellWith(collectionView:FSPagerView,index:Int) -> ProductDetailFSPagerViewCell {
         let ID = "ProductDetailFSPagerViewCell"
@@ -55,8 +56,8 @@ class ProductDetailFSPagerViewCell: FSPagerViewCell {
     
     var imageNames: Array<String>?{
         didSet {
-            productImageView.kf.setImage(with: kURLImage(name: imageNames?[index ?? 0] ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            productImageView.kf.setImage(with: kURLImage(name: imageNames?[index ?? 0] ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/View/ProductDetailSkuView/ProductDetailSkuView.swift

@@ -10,6 +10,7 @@ import UIKit
 import FWPopupView
 import RxSwift
 import RxCocoa
+import Kingfisher
 
 enum ProductDetailSkuViewType {
     case selectSku
@@ -353,8 +354,8 @@ class ProductDetailSkuView: FWPopupView {
     var productDetailModel : ProductDetailModel? {
         didSet {
             productImageView.kf.setImage(with: kURLImage(name: productDetailModel?.img ?? "default_pic")
-                , placeholder: kImage(name: "default_pic")           
-)
+                , placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             if productDetailModel?.limitNumber ?? 0 <= 0 {
                 limitLabel.isHidden = true
             }else {

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductDetailHotSell/ProductDetailHotSellCollectionViewCell.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-
+import Kingfisher
 import RxSwift
 
 class ProductDetailHotSellCollectionViewCell: UICollectionViewCell {
@@ -149,8 +149,8 @@ class ProductDetailHotSellCollectionViewCell: UICollectionViewCell {
     
     var productSearchModel : ProductSearchModel? {
         didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = productSearchModel?.saleName
             detailTitleLabel.text = productSearchModel?.subtitle
             sellPriceLabel.text = priceConversion(price: productSearchModel?.price ?? 0)

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductMallBarChart/ProductMallBarChartCollectionViewCell.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import RxSwift
+import Kingfisher
 
 class ProductMallBarChartCollectionViewCell: UICollectionViewCell {
     
@@ -173,8 +174,8 @@ class ProductMallBarChartCollectionViewCell: UICollectionViewCell {
     
     var productModel : ProductModel? {
         didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productModel?.bigImg ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            iconImagView.kf.setImage(with: kURLImage(name: productModel?.bigImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = productModel?.saleName
             detailTitleLabel.text = productModel?.subtitle
             sellNumberLabel.text = "已售\(productModel?.totalCount ?? 0)件"

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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = productModel?.saleName
             detailTitleLabel.text = productModel?.subtitle
             sellNumberLabel.text = "已售\(productModel?.totalCount ?? 0)件"

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductMallSlidingLeftRight/ProductSlidingLeftRightCollectionViewCell.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import RxSwift
+import Kingfisher
 
 class ProductSlidingLeftRightCollectionViewCell: UICollectionViewCell {
     let disposeBag = DisposeBag()
@@ -143,8 +144,8 @@ class ProductSlidingLeftRightCollectionViewCell: UICollectionViewCell {
     
     var productModel : ProductModel? {
         didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            iconImagView.kf.setImage(with: kURLImage(name: productModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = productModel?.saleName
             detailTitleLabel.text = productModel?.subtitle
             sellPriceLabel.text = priceConversion(price: productModel?.price ?? 0)
@@ -159,6 +160,7 @@ class ProductSlidingLeftRightCollectionViewCell: UICollectionViewCell {
     var productSearchModel : ProductSearchModel? {
         didSet {
             iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = productSearchModel?.saleName
             detailTitleLabel.text = productSearchModel?.subtitle
             sellPriceLabel.text = priceConversion(price: productSearchModel?.price ?? 0)

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductSlidingTopBottom/ProductSlidingTopBottomCollectionViewCell.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import RxSwift
+import Kingfisher
 
 class ProductSlidingTopBottomCollectionViewCell: UICollectionViewCell {
     
@@ -142,8 +143,8 @@ class ProductSlidingTopBottomCollectionViewCell: UICollectionViewCell {
     
     var productSearchModel: ProductSearchModel? {
         didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = productSearchModel?.saleName
             sellNumberLabel.text = "已售\(productSearchModel?.totalCount ?? 0)件"
             sellPriceLabel.text = priceConversion(price: productSearchModel?.price ?? 0)

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/TableViewCell/ProductHBigTableViewCell.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import RxSwift
+import Kingfisher
 
 class ProductHBigTableViewCell: UITableViewCell {
     
@@ -159,8 +160,8 @@ class ProductHBigTableViewCell: UITableViewCell {
     
     var productSearchModel: ProductSearchModel? {
         didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = productSearchModel?.saleName
             detailTitleLabel.text = productSearchModel?.subtitle
             sellNumberLabel.text = "已售\(productSearchModel?.totalCount ?? 0)件"

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/TableViewCell/ProductHSmallTableViewCell.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import RxSwift
+import Kingfisher
 
 class ProductHSmallTableViewCell: UITableViewCell {
     
@@ -147,8 +148,8 @@ class ProductHSmallTableViewCell: UITableViewCell {
     
     var productSearchModel: ProductSearchModel? {
         didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = productSearchModel?.saleName
             detailTitleLabel.text = productSearchModel?.subtitle
             sellNumberLabel.text = "已售\(productSearchModel?.totalCount ?? 0)件"

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Shop/View/ShopViewShopInfoTableViewCell.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import RxSwift
+import Kingfisher
 
 class ShopViewShopInfoTableViewCell: UITableViewCell {
     
@@ -161,8 +162,8 @@ class ShopViewShopInfoTableViewCell: UITableViewCell {
             lookButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.right, imageTitleSpace: 4)
 
             
-            shopIconImageView.kf.setImage(with: kURLImage(name: shopModel?.logoImg ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            shopIconImageView.kf.setImage(with: kURLImage(name: shopModel?.logoImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
              shopNameLabel.text = shopModel?.shopName
 
             

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingCart/View/ShoppingCartList/ShoppingCartListTableViewCell.swift

@@ -9,6 +9,7 @@
 import UIKit
 import RxSwift
 import RxCocoa
+import Kingfisher
 
 class ShoppingCartListTableViewCell: UITableViewCell {
     
@@ -43,8 +44,8 @@ class ShoppingCartListTableViewCell: UITableViewCell {
             let selStatus = productMdl?.isSelect == 1 ? true : false
             selectedButton.isSelected = selStatus
             // 商品图片
-            iconImageView.kf.setImage(with: kURLImage(name: productMdl?.productImg ?? ""), placeholder: kImage(name: "default_pic")           
-)
+            iconImageView.kf.setImage(with: kURLImage(name: productMdl?.productImg ?? ""), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             // 商品名称
             titleLabel.text = productMdl?.productName
             // 预计配送时间            

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"))
-            
+            KingfisherManager.shared.cache.clearMemoryCache()
 
         }
     }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/View/ShoppingMallCategory/ShoppingMallCategoryCollectionViewCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Kingfisher
 
 class ShoppingMallCategoryCollectionViewCell: UICollectionViewCell {
     class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> ShoppingMallCategoryCollectionViewCell {
@@ -66,8 +67,8 @@ class ShoppingMallCategoryCollectionViewCell: UICollectionViewCell {
     
     var cmsRuleModel : CMSRuleModel? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: cmsRuleModel?.rule?.url ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            iconImageView.kf.setImage(with: kURLImage(name: cmsRuleModel?.rule?.url ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = cmsRuleModel?.rule?.title ?? ""
         }
     }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/View/ShoppingMallSepcial/ShoppingMallSepcialCollectionViewCell.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Kingfisher
 
 class ShoppingMallSepcialCollectionViewCell: UICollectionViewCell {
     class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> ShoppingMallSepcialCollectionViewCell {
@@ -57,8 +58,8 @@ class ShoppingMallSepcialCollectionViewCell: UICollectionViewCell {
     
     var cmsRuleModel : CMSRuleModel? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: cmsRuleModel?.rule?.url ?? "default_pic"), placeholder: kImage(name: "default_pic")           
-)
+            iconImageView.kf.setImage(with: kURLImage(name: cmsRuleModel?.rule?.url ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Special/View/SpecialBannerView.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Kingfisher
 
 class SpecialBannerView: BaseView {
     
@@ -34,8 +35,8 @@ class SpecialBannerView: BaseView {
     
     var cmsRuleModel : CMSRuleModel? {
         didSet {
-            bannerButton.kf.setImage(with: kURLImage(name: cmsRuleModel?.url ?? "default_pic"), for: UIControl.State.normal, placeholder: kImage(name: "default_pic")           
-)
+            bannerButton.kf.setImage(with: kURLImage(name: cmsRuleModel?.url ?? "default_pic"), for: UIControl.State.normal, placeholder: kImage(name: "default_pic"))
+            KingfisherManager.shared.cache.clearMemoryCache()
         }
     }
 }

RainbowPlanet/RainbowPlanet/Tools/BrowsePictures/ViewController/BrowsePicturesViewController.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Kingfisher
 
 class BrowsePicturesViewController: BaseViewController {
     
@@ -193,8 +194,8 @@ UICollectionViewDelegateFlowLayout{
         -> UICollectionViewCell {
             let cell = BrowsePicturesPagerViewCell.cellWith(collectionView: collectionView, indexPath: indexPath)
             if !(imageStrs.isEmpty){
-                cell.iconImageView.kf.setImage(with: kURLImage(name: imageStrs[indexPath.row]), placeholder: kImage(name: "")           
-)
+                cell.iconImageView.kf.setImage(with: kURLImage(name: imageStrs[indexPath.row]), placeholder: kImage(name: ""))
+                KingfisherManager.shared.cache.clearMemoryCache()
             }
             if !(images.isEmpty){
                 cell.iconImageView.image = images[indexPath.row]

RainbowPlanet/RainbowPlanet/Tools/CaculateNumberTool/TGCaculateNumberTool.h

@@ -0,0 +1,31 @@
+//
+//  CaculateNumberTool.h
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/8/22.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSInteger, TGCNRoundingMode) {
+    TGCNRoundingModeUpAndDown = 0,  ///< 四舍五入
+    TGCNRoundingModeOnlyUp,         ///< 只入不舍
+    TGCNRoundingModeOnlyDown,       ///< 不四舍五入
+};
+
+@interface TGCaculateNumberTool : NSObject
+/**
+ 返回数字描述
+ 
+ @param number 数字
+ @param toFixed 保留小数位数
+ @param roundingMode 是否四舍五入
+ */
++ (NSString *)stringFromNumber:(double)number toFixedCount:(NSInteger)toFixed roundingMode:(TGCNRoundingMode)roundingMode;
+@end
+
+
+NS_ASSUME_NONNULL_END

RainbowPlanet/RainbowPlanet/Tools/CaculateNumberTool/TGCaculateNumberTool.m

@@ -0,0 +1,113 @@
+//
+//  TGCaculateNumberTool.m
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/8/22.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+#import "TGCaculateNumberTool.h"
+
+@implementation TGCaculateNumberTool
+
+static NSNumberFormatter *formater;
+static NSDictionary *configDict;
+
++ (void)initialize {
+    if (self == [TGCaculateNumberTool class]) {
+        formater = [[NSNumberFormatter alloc] init];
+        // 可自行扩展
+        configDict = @{
+                       @"wan": @{
+                               @"unit": @"w",
+                               @"dividend": @(10000.0)
+                               }
+//                       @"yi": @{
+//                               @"unit": @"亿",
+//                               @"dividend": @(100000000.0)
+//                               },
+//                       @"wanYi": @{
+//                               @"unit": @"万亿",
+//                               @"dividend": @(1000000000000.0)
+//                               }
+                       };
+    }
+}
+
++ (NSString *)stringFromNumber:(double)number toFixedCount:(NSInteger)toFixed roundingMode:(TGCNRoundingMode)roundingMode {
+    NSString *output;
+    
+    formater.maximumFractionDigits = toFixed;
+    
+    if (roundingMode == TGCNRoundingModeUpAndDown) {
+        formater.roundingMode = NSNumberFormatterRoundHalfEven;  // 四舍五入
+    } else if (roundingMode == TGCNRoundingModeOnlyUp) {
+        formater.roundingMode = NSNumberFormatterRoundCeiling;  // 只入不舍
+    } else if (roundingMode == TGCNRoundingModeOnlyDown) {
+        formater.roundingMode = NSNumberFormatterRoundFloor;     // 不四舍五入
+    } else {                                                     // 默认
+        formater.roundingMode = NSNumberFormatterRoundHalfEven;  // 四舍五入
+    }
+    
+    // 如果要五入恰好传入临界值，则h对该值加1，换单位，避免出现10000万这样情况
+    if (formater.roundingMode == NSNumberFormatterRoundHalfEven || formater.roundingMode == NSNumberFormatterRoundCeiling) {
+        if (number == 9999 || number == 99999999 || number == 999999999999) {
+            number = number + 1;
+        }
+    }
+    
+    if (number <= 0) {
+        output = @"0";
+    } else if (number <= 9999) {
+        output = [NSString stringWithFormat:@"%@", [formater stringFromNumber:@(number)]];
+    } else {  // 9999999
+        double value = (double)number / [configDict[@"wan"][@"dividend"] doubleValue];
+        output = [NSString stringWithFormat:@"%@%@", [formater stringFromNumber:@(value)], configDict[@"wan"][@"unit"]];
+    }
+    
+    
+//    if (number <= 0) {
+//        output = @"0";
+//    } else if (number <= 9999) {
+//        output = [NSString stringWithFormat:@"%@", [formater stringFromNumber:@(number)]];
+//    } else if (number <= 99999999) {  // 9999999
+//        double value = (double)number / [configDict[@"wan"][@"dividend"] doubleValue];
+//        output = [NSString stringWithFormat:@"%@%@", [formater stringFromNumber:@(value)], configDict[@"wan"][@"unit"]];
+//    } else if (number <= 999999999999) {  // 999999999999
+//        double value = (double)number / [configDict[@"yi"][@"dividend"] doubleValue];
+//        output = [NSString stringWithFormat:@"%@%@", [formater stringFromNumber:@(value)], configDict[@"yi"][@"unit"]];
+//    } else {
+//        double value = (double)number / [configDict[@"wanYi"][@"dividend"] doubleValue];
+//        output = [NSString stringWithFormat:@"%@%@", [formater stringFromNumber:@(value)], configDict[@"wanYi"][@"unit"]];
+//    }
+    return output;
+}
+
+/**
+ 计算特定小数位数
+ 
+ @param input 输入数字
+ @param toFixed 保留小数位数
+ @param isRounded 是否四舍五入
+ */
+//+ (double)roundFloat:(double)input toFixedCount:(NSInteger)toFixed rounded:(BOOL)isRounded {
+//
+//    double scale = 1;
+//    if (toFixed == 0) {
+//        scale = 1;
+//    } else if (toFixed == 1) {
+//        scale = 10;
+//    } else if (toFixed == 2) {
+//        scale = 100;
+//    } else if (toFixed == 3) {
+//        scale = 1000;
+//    } else if (toFixed == 4) {
+//        scale = 10000;
+//    }
+//    if (isRounded) {
+//        return (floorf(input * scale + 0.5)) / scale;
+//    } else {
+//        return (floorf(input * scale - 0.5)) / scale;
+//    }
+//}
+@end

RainbowPlanet/RainbowPlanet/ViewModel/Virus/VirusViewModel.swift

@@ -762,7 +762,7 @@ extension VirusViewModel {
 
                 cell?.likeBtn.isSelected = true
                 let praiseCount = (communityPostDataModel.praiseCount ?? 0) + 1
-                cell?.likeBtn.setTitle("\(praiseCount)", for: UIControl.State.normal)
+                cell?.likeLabel.text = "\(praiseCount)"
                 communityPostDataModel.praiseCount = praiseCount
                 
             }else {
@@ -771,7 +771,7 @@ extension VirusViewModel {
                 cell?.likeBtn.isSelected = false
                 let praiseCount = (communityPostDataModel.praiseCount ?? 0) - 1
                 
-                cell?.likeBtn.setTitle("\(praiseCount)", for: UIControl.State.normal)
+                cell?.likeLabel.text = "\(praiseCount)"
                 communityPostDataModel.praiseCount = praiseCount
                 
             }