南鑫林 5 rokov pred
rodič
commit
060fc5f084
100 zmenil súbory, kde vykonal 328 pridanie a 69 odobranie
  1. 7 0
      RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift
  2. 6 0
      RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate.swift
  3. 1 0
      RainbowPlanet/RainbowPlanet/Base/BaseViewController/BaseViewController.swift
  4. 4 0
      RainbowPlanet/RainbowPlanet/Base/BaseWebViewController/BaseJSWebViewController.swift
  5. 4 0
      RainbowPlanet/RainbowPlanet/Modules/CommonModules/LocationModule/AddressPOI/ViewController/AddressPOIViewController.swift
  6. 4 0
      RainbowPlanet/RainbowPlanet/Modules/CommonModules/LocationModule/Location/ViewController/LocationViewController.swift
  7. 4 0
      RainbowPlanet/RainbowPlanet/Modules/CommonModules/LocationModule/SelfRecommendation/ViewController/SelfRecommendationViewController.swift
  8. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/Banner/CommunityBannerFSPagerViewCell.swift
  9. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/Comment/CardContentCommnetTableViewCell.swift
  10. 3 2
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/PicVideo/CardContentPicVideoCollectionViewCell.swift
  11. 2 2
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/User/CardContentUserTableViewCell.swift
  12. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/FeaturedTopics/FeaturedTopicsCollectionViewCell.swift
  13. 2 2
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/FollowStatus/CommunityFollowStatusTableViewCell.swift
  14. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/PopularVideo/PopularVideoCollectionViewCell.swift
  15. 2 2
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/RecommendFollow/CommunityRecommendFollowCollectionViewCell.swift
  16. 8 8
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift
  17. 8 0
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift
  18. 2 0
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendViewController.swift
  19. 5 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFeaturedTopics/ViewController/CommunityFeaturedTopicsViewController.swift
  20. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFindFriends/View/CommunityFindFriendsView.swift
  21. 4 0
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFindFriends/ViewController/CommunityFindFriendsViewController.swift
  22. 4 0
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityMyFollowTopic/ViewController/CommunityMyFollowTopicController.swift
  23. 10 3
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/Controller/CommunityRecommendController.swift
  24. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/AllCommentCell/RecommendMajorCommentCell.swift
  25. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/AllCommentCell/RecommendSubCommentTableViewCell.swift
  26. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/CommunityPostDetailFSPagerViewCell.swift
  27. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/HTMLCell/CommunityRecommendDetailHTMLTableViewCell.swift
  28. 2 2
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/RecommendNoneCommentCell.swift
  29. 5 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityShareActivity/CommunityShareActivityViewController.swift
  30. 5 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityShareContent/CommunityShareContentViewController.swift
  31. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/View/CommunityMajorCommentCell.swift
  32. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/View/CommunityReplyCommentCell.swift
  33. 4 0
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/ViewController/CommunitySubCommentController.swift
  34. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoCoverCollectionCell.swift
  35. 1 1
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoMajorCommentCell.swift
  36. 4 0
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/ViewController/CommunityVideoListController.swift
  37. 4 0
      RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoSubCommentController/CommunityVideoSubCommentController.swift
  38. 4 5
      RainbowPlanet/RainbowPlanet/Modules/H5Modules/H5Common/ViewController/H5CommonViewController.swift
  39. 1 1
      RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageList/View/MessageListTableCell.swift
  40. 4 1
      RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageList/ViewController/MessageListController.swift
  41. 3 1
      RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/ViewController/MessageMainViewController.swift
  42. 5 1
      RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetActivity/Controller/MessagePlanetActivityController.swift
  43. 1 1
      RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetActivity/View/MessageActivityTableCell.swift
  44. 4 0
      RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetNotification/Controller/MessagePlanetNotiController.swift
  45. 4 0
      RainbowPlanet/RainbowPlanet/Modules/MineModule/AccountSecurity/ViewController/AccountSecurityViewController.swift
  46. 4 0
      RainbowPlanet/RainbowPlanet/Modules/MineModule/AddressManager/ViewController/AddressManagerViewController.swift
  47. 4 0
      RainbowPlanet/RainbowPlanet/Modules/MineModule/EditExpressAddress/ViewController/EditExpressAddressViewController.swift
  48. 4 0
      RainbowPlanet/RainbowPlanet/Modules/MineModule/EditSelfMentionContacts/ViewController/EditSelfMentionContactsViewController.swift
  49. 4 0
      RainbowPlanet/RainbowPlanet/Modules/MineModule/ExpressAddressList/ViewController/ExpressAddressListViewController.swift
  50. 1 1
      RainbowPlanet/RainbowPlanet/Modules/MineModule/ModifyData/View/ModifyDataAvatarView.swift
  51. 4 0
      RainbowPlanet/RainbowPlanet/Modules/MineModule/ModifyData/ViewController/ModifyDataViewController.swift
  52. 6 2
      RainbowPlanet/RainbowPlanet/Modules/MineModule/MyFollowAndFan/ViewController/MyFollowAndFanViewController.swift
  53. 5 1
      RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/OtherPersonalCenter/ViewController/OtherPersonalCenterViewController.swift
  54. 1 1
      RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/PersonalCenterView/PersonViewUserAndOtherHeaderView.swift
  55. 1 1
      RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/PersonalCenterView/PersonViewUserAndOtherListCollectionViewCell.swift
  56. 6 2
      RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/ViewController/UserPersonalCenterViewController.swift
  57. 4 0
      RainbowPlanet/RainbowPlanet/Modules/MineModule/SelfMentionContactsList/ViewController/SelfMentionContactsListViewController.swift
  58. 4 0
      RainbowPlanet/RainbowPlanet/Modules/MineModule/Set/ViewController/SetViewController.swift
  59. 4 0
      RainbowPlanet/RainbowPlanet/Modules/MineModule/SetPassword/ViewController/SetPasswordViewController.swift
  60. 4 0
      RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/ViewController/OrderViewController.swift
  61. 4 0
      RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderApplyRefund/ViewController/OrderApplyRefundController.swift
  62. 4 0
      RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderComment/ViewController/OrderCommentController.swift
  63. 1 1
      RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailProductTableViewCell.swift
  64. 4 0
      RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/ViewController/OrderDetailViewController.swift
  65. 4 0
      RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderFinishPay/ViewController/OrderFinishPayController.swift
  66. 4 0
      RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderLogistics/ViewController/OrderLogisticsController.swift
  67. 4 0
      RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/ViewController/ShoppingCartPayOrderController.swift
  68. 4 0
      RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderRefunddetails/ViewController/OrderRefunddetailsViewController.swift
  69. 4 0
      RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddAddress/ViewController/PublishAddAddressController.swift
  70. 4 0
      RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/Controller/PublishAddTopicController.swift
  71. 1 1
      RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/View/PublishTopicTypeItemCollectionCell.swift
  72. 4 0
      RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/Controller/PublishEditController.swift
  73. 1 1
      RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/View/PublishEditAddImgCollectionCell.swift
  74. 4 0
      RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishMusicListController.swift
  75. 4 0
      RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishRecommendMusicController.swift
  76. 4 0
      RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishTakePhoto/PublishConfirmPhotoController.swift
  77. 4 0
      RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishTakePhoto/PublishTakePhotoController.swift
  78. 4 0
      RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishViewController.swift
  79. 4 0
      RainbowPlanet/RainbowPlanet/Modules/PublishModule/Unused/PublishTakeVideo/PublishVideoRecorderController.swift
  80. 2 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/Banner/RedemptionAreaBannerCollectionViewCell.swift
  81. 3 1
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/Banner/RedemptionAreaFSPagerViewCell.swift
  82. 4 4
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/FloorCell/RedemptionAreaProductCollectionViewCell.swift
  83. 1 1
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/FloorHeader/FloorHeaderViewFloorHeaderView.swift
  84. 2 1
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialCell/SpecialOneTypeCollectionViewCell.swift
  85. 2 0
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialCell/SpecialTwoTypeCollectionViewCell.swift
  86. 5 1
      RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/ViewController/RedemptionAreaViewController.swift
  87. 4 0
      RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/BindPhoneNumber/ViewController/BindPhoneNumberViewController.swift
  88. 4 0
      RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/GenderSelection/ViewController/GenderSelectionViewController.swift
  89. 4 0
      RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/MobileLogin/ViewController/MobileLoginViewController.swift
  90. 5 0
      RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/PasswordLogin/ViewController/PasswordLoginViewController.swift
  91. 4 0
      RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/PhoneCountryArea/ViewController/PhoneCountryAreaViewController.swift
  92. 4 0
      RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/RegisterLogin/ViewController/RegisterLoginViewController.swift
  93. 1 1
      RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/TopicSelection/View/TopicSelectionCollectionViewCell.swift
  94. 4 0
      RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/TopicSelection/ViewController/TopicSelectionViewController.swift
  95. 4 0
      RainbowPlanet/RainbowPlanet/Modules/SearchModule/Search/ViewController/SearchViewController.swift
  96. 1 1
      RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchContentList/View/SearchContentListCollectionCell.swift
  97. 4 0
      RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchResult/ViewController/SearchResultViewController.swift
  98. 1 1
      RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchTopicList/View/SearchTopicListTableViewCell.swift
  99. 3 0
      RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchTopicList/ViewController/SearchTopicListViewController.swift
  100. 0 0
      RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchUser/View/SearchUserLitTableViewCell.swift

+ 7 - 0
RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

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

+ 6 - 0
RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Kingfisher
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -19,4 +20,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         
         return true
     }
+    
+    func applicationDidReceiveMemoryWarning(_ application: UIApplication) {
+        KingfisherManager.shared.cache.clearDiskCache()
+        KingfisherManager.shared.cache.clearMemoryCache()
+    }
 }

+ 1 - 0
RainbowPlanet/RainbowPlanet/Base/BaseViewController/BaseViewController.swift

@@ -65,6 +65,7 @@ class BaseViewController: UIViewController {
     func setupData() {}
     
     override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
         KingfisherManager.shared.cache.clearDiskCache()
         KingfisherManager.shared.cache.clearMemoryCache()
     }

+ 4 - 0
RainbowPlanet/RainbowPlanet/Base/BaseWebViewController/BaseJSWebViewController.swift

@@ -12,6 +12,10 @@ import WebViewJavascriptBridge
 
 class BaseJSWebViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         removeWebView()
     }

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/CommonModules/LocationModule/AddressPOI/ViewController/AddressPOIViewController.swift

@@ -10,6 +10,10 @@ import UIKit
 
 class AddressPOIViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     typealias DidSelectBlock = (_ latitude:String,_ longitude:String,_ address:String) -> Void
     var didSelectBlock : DidSelectBlock?
     var locationAddress: String?

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/CommonModules/LocationModule/Location/ViewController/LocationViewController.swift

@@ -9,6 +9,10 @@
 import UIKit
 
 class LocationViewController: BaseViewController {
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
 
     override func viewDidLoad() {
         super.viewDidLoad()

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/CommonModules/LocationModule/SelfRecommendation/ViewController/SelfRecommendationViewController.swift

@@ -9,6 +9,10 @@
 import UIKit
 
 class SelfRecommendationViewController: BaseViewController {
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
 
     /// 纬度
     var latitude : String = LocationModel.shared().object()?.latitude ?? "34.20840377740726"

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
 
         }
     }

+ 1 - 1
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()
+        //ImageCache.default.clearMemoryCache()
 
         avatarButton.cornerRadius = 14
         avatarButton.masksToBounds = true

+ 3 - 2
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/PicVideo/CardContentPicVideoCollectionViewCell.swift

@@ -69,8 +69,8 @@ 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.clearMemoryCache()
+//            ImageCache.default.cleanExpiredDiskCache()
            
         }
     }
@@ -95,4 +95,5 @@ class CardContentPicVideoCollectionViewCell: UICollectionViewCell {
             }
         }
     }
+    
 }

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

@@ -159,7 +159,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"))
-            ImageCache.default.clearMemoryCache()
+//            //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))
@@ -176,7 +176,7 @@ class CardContentUserTableViewCell: UITableViewCell {
     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()
+            //ImageCache.default.clearMemoryCache()
 
             titleButton.setTitle(communityFollowDataModel?.relateData?.username, for: UIControl.State.normal)
             timeLabel.text = communityFollowDataModel?.relateData?.createdAt

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
 
             topicLabel.text = communityRecommendTypeDataModel?.name
             numberPeopleLable.text = "\(communityRecommendTypeDataModel?.followCount ?? "0")人参与"

+ 2 - 2
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()
+            //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()
+                //ImageCache.default.clearMemoryCache()
 
                 titleOtherButton.setTitle(communityFollowDataModel?.relateData?.username, for: UIControl.State.normal)
                 if communityFollowDataModel?.relateData?.uid == UserModel.shared().getModel()?.uid {

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
 
             nameLabel.text = communityRecommendTypeDataModel?.userName
         }

+ 2 - 2
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()
+            //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()
+            //ImageCache.default.clearMemoryCache()
 
 
             titleButton.setTitle(cmsMemberModel?.username, for: UIControl.State.normal)

+ 8 - 8
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift

@@ -10,7 +10,11 @@ import UIKit
 import JXSegmentedView
 import Kingfisher
 
-class CommunityFollowViewController: UIViewController {
+class CommunityFollowViewController: BaseViewController {
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
     
     deinit {
         NXLLog("deinit")
@@ -32,12 +36,12 @@ class CommunityFollowViewController: UIViewController {
         setupData()
     }
     
-    func setupViews() {
+    override func setupViews() {
         view.backgroundColor = kf7f8faColor
         view.addSubview(tableView)
     }
     
-    func setupLayouts() {
+    override func setupLayouts() {
         tableView.snp.makeConstraints { (make) in
             make.top.left.right.equalToSuperview()
             make.height.equalTo(kScreenHeight-48-kNavBarTotalHeight-kTabBarTotalHeight)
@@ -63,7 +67,7 @@ class CommunityFollowViewController: UIViewController {
         return followLoginTableHeaderView
     }()
     
-    func setupData() {
+    override func setupData() {
         //下拉刷新
         tableView.addHeader(withBeginRefresh: true, animation: true) {
             [weak self] (page) in
@@ -176,10 +180,6 @@ class CommunityFollowViewController: UIViewController {
         }
     }
     
-    override func didReceiveMemoryWarning() {
-        KingfisherManager.shared.cache.clearDiskCache()
-        KingfisherManager.shared.cache.clearMemoryCache()
-    }
 }
 
 extension CommunityFollowViewController {

+ 8 - 0
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -9,6 +9,7 @@
 import UIKit
 import JXSegmentedView
 import SwiftyMediator
+import Kingfisher
 
 enum CommunityModuleTopType : String {
     case communityModuleFollowTop = "CommunityModuleFollowTop"
@@ -20,6 +21,9 @@ var communityModuleTopType :CommunityModuleTopType?
 
 class CommunityViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
     
     deinit {
         NXLLog("deinit")
@@ -403,6 +407,10 @@ class CommunityViewController: BaseViewController {
     
     var index : Int?
     
+//    override func didReceiveMemoryWarning() {
+//        super.didReceiveMemoryWarning()
+//    }
+    
 }
 
 extension CommunityViewController : JXSegmentedViewDelegate {

+ 2 - 0
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendViewController.swift

@@ -159,7 +159,9 @@ class CommunityRecommnendViewController: UIViewController {
         }
     }
     
+    
     override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
         KingfisherManager.shared.cache.clearDiskCache()
         KingfisherManager.shared.cache.clearMemoryCache()
     }

+ 5 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFeaturedTopics/ViewController/CommunityFeaturedTopicsViewController.swift

@@ -11,6 +11,10 @@ import Kingfisher
 
 class CommunityFeaturedTopicsViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         NXLLog("deinit")
         if observe != nil {
@@ -302,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()
+            //ImageCache.default.clearMemoryCache()
 
             self?.navigationBar.barBackgroundImage = self?.bgImageView.image
             self?.communityFeaturedTopicsHeaderView.communityTopicDetailModel = self?.communityTopicDetailModel

+ 1 - 1
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()
+        //ImageCache.default.clearMemoryCache()
         picButton.cornerRadius = 5
         picButton.masksToBounds = true
         picButton.rx.tap.subscribe(onNext: { [weak self] _ in

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFindFriends/ViewController/CommunityFindFriendsViewController.swift

@@ -10,6 +10,10 @@ import UIKit
 
 class CommunityFindFriendsViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         NXLLog("deinit")
         if observe != nil {

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityMyFollowTopic/ViewController/CommunityMyFollowTopicController.swift

@@ -10,6 +10,10 @@ import UIKit
 import SwiftyMediator
 
 class CommunityMyFollowTopicController: BaseViewController {
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
         
     var communityMemberFollowTopicListDataModels = Array<CommunityMemberFollowTopicListDataModel>()
     

+ 10 - 3
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/Controller/CommunityRecommendController.swift

@@ -11,14 +11,16 @@ import Kingfisher
 
 class CommunityRecommendController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         NXLLog("deinit")
         self.view = nil
         if observe != nil {
             NotificationCenter.default.removeObserver(observe!)
         }
-        KingfisherManager.shared.cache.clearDiskCache()
-        KingfisherManager.shared.cache.clearMemoryCache()
     }
     weak var observe : NSObjectProtocol?
 
@@ -359,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()
+            //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
@@ -403,6 +405,11 @@ extension CommunityRecommendController {
                     self?.tabBarController?.selectedIndex = 0
                     self?.navigationController?.popToRootViewController(animated: true)
                 })
+                self?.tableView.reloadData()
+                MJRefreshManager.mjRefreshManager(tableView: self?.tableView)
+                if self?.tableView.mj_footer != nil {
+                    self?.tableView.isHiddenFooter(true)
+                }
             }else {
                 MJRefreshManager.mjRefreshManagerLoadingStatus(tableView: self?.tableView,loadingStatus: loadingStatus)
             }

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
             titleLabel.text = communityPostCommentModel?.username
             contentLabel.text = communityPostCommentModel?.content
             timeLabel.text = communityPostCommentModel?.createdAt

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
 
             
             titleLabel.text = communityPostReplyModel?.username

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/CommunityPostDetailFSPagerViewCell.swift

@@ -57,7 +57,7 @@ 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()
+            //ImageCache.default.clearMemoryCache()
 
         }
     }

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/HTMLCell/CommunityRecommendDetailHTMLTableViewCell.swift

@@ -249,7 +249,7 @@ 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()
+            //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米待收获"

+ 2 - 2
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/RecommendNoneCommentCell.swift

@@ -131,7 +131,7 @@ class RecommendNoneCommentCell: UITableViewCell {
     
     private lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
-        titleLabel.text = "“终于等到你来留言了”"
+        titleLabel.text = "“消灭0回复,U米赚不停!”"
         titleLabel.textColor = k333333Color
         titleLabel.font = kRegularFont14
         titleLabel.textAlignment = .left
@@ -158,7 +158,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()
+            //ImageCache.default.clearMemoryCache()
 
         }
     }

+ 5 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityShareActivity/CommunityShareActivityViewController.swift

@@ -11,6 +11,10 @@ import Kingfisher
 
 class CommunityShareActivityViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
@@ -69,7 +73,7 @@ extension CommunityShareActivityViewController {
         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()
+            //ImageCache.default.clearMemoryCache()
 
             self?.shareCommunityContentView.imageUrl = (data as! String)
         }

+ 5 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityShareContent/CommunityShareContentViewController.swift

@@ -12,6 +12,10 @@ import Kingfisher
 
 class CommunityShareContentViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var imgUrl : String?
     var topicStr : String = ""
     var titleStr : String = ""
@@ -124,7 +128,7 @@ class CommunityShareContentViewController: BaseViewController {
         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()
+        //ImageCache.default.clearMemoryCache()
 
         nameLable.text = nameStr ?? ""
         

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
             titleLabel.text = communityPostCommentModel?.username
             contentLabel.text = communityPostCommentModel?.content
             timeLabel.text = communityPostCommentModel?.createdAt

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
             
             titleLabel.text = communityPostReplyModel?.username
             

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/ViewController/CommunitySubCommentController.swift

@@ -11,6 +11,10 @@ import IQKeyboardManagerSwift
 
 class CommunitySubCommentController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var communityPostDetailModel : CommunityPostDetailModel?
     var communityPostCommentModel : CommunityPostCommentModel?
     

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoCoverCollectionCell.swift

@@ -853,7 +853,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"))
-            ImageCache.default.clearMemoryCache()
+            //ImageCache.default.clearMemoryCache()
 
             if self.videoItemMdl?.username?.count ?? 0 <= 12 {
                 personLabel.text = self.videoItemMdl?.username

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
             titleLabel.text = communityPostCommentModel?.username
             contentLabel.text = communityPostCommentModel?.content
             timeLabel.text = communityPostCommentModel?.createdAt

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/ViewController/CommunityVideoListController.swift

@@ -17,6 +17,10 @@ public enum DepartureVCType{
 
 class CommunityVideoListController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     // 内容Id
     var contentId: Int?
     // 来源Vc

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoSubCommentController/CommunityVideoSubCommentController.swift

@@ -11,6 +11,10 @@ import IQKeyboardManagerSwift
 
 class CommunityVideoSubCommentController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var communityVideoItemModel : CommunityVideoItemModel?
     var communityPostCommentModel : CommunityPostCommentModel?
     

+ 4 - 5
RainbowPlanet/RainbowPlanet/Modules/H5Modules/H5Common/ViewController/H5CommonViewController.swift

@@ -14,6 +14,10 @@ import SwiftyMediator
 
 class H5CommonViewController: BaseJSWebBaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         NXLLog("deinit")
         if observe != nil {
@@ -28,11 +32,6 @@ class H5CommonViewController: BaseJSWebBaseViewController {
         setupData()
     }
     
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-        // Dispose of any resources that can be recreated.
-    }
-    
     //MARK: - view
     override func setupViews() {
         super.setupViews()

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
 
         }
     }

+ 4 - 1
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageList/ViewController/MessageListController.swift

@@ -22,6 +22,9 @@ enum MessageListVCType {
 }
 
 class MessageListController: BaseViewController {
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
     
     var messageShowTypes : String = ""
     var cellHeightsDictionary = Dictionary<IndexPath, Any>()
@@ -141,7 +144,7 @@ extension MessageListController: UITableViewDataSource, UITableViewDelegate {
         switch messageVCType {
         case .comment?,.praise?:
             if messageDataModel.param?.postTypeEnum == .video {
-                Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(messageDataModel.param?.postId ?? 0)", departType: .others, topicId: 0))
+                Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(messageDataModel.param?.postId ?? 0)", departType: .personal, topicId: 0))
             }else {
                 Mediator.push(CommunityRouterModuleType.pushPostDetailContent(postId: "\(messageDataModel.param?.postId ?? 0)"))
             }

+ 3 - 1
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/ViewController/MessageMainViewController.swift

@@ -11,7 +11,9 @@ import Lottie
 import ESTabBarController_swift
 
 class MessageMainViewController: BaseViewController {
-    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
     deinit {
         NXLLog("deinit")
         if observe != nil {

+ 5 - 1
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetActivity/Controller/MessagePlanetActivityController.swift

@@ -15,6 +15,10 @@ class MessagePlanetActivityController: BaseViewController {
         NXLLog("deinit")
     }
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var messageShowTypes : String = ""
     var messageDataModels = Array<MessageDataModel>()
     
@@ -110,7 +114,7 @@ extension MessagePlanetActivityController: UITableViewDataSource, UITableViewDel
             break
         case .post?:
             if messageDataModel.param?.postTypeEnum == .video {
-                Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(messageDataModel.param?.activityUrl ?? "")", departType: .others, topicId: 0))
+                Mediator.push(CommunityRouterModuleType.pushPostDetailVoide(postId: "\(messageDataModel.param?.activityUrl ?? "")", departType: .personal, topicId: 0))
             }else {
                 Mediator.push(CommunityRouterModuleType.pushPostDetailContent(postId: "\(messageDataModel.param?.activityUrl ?? "")"))
             }

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
 
             if messageDataModel?.param?.activityTime == nil || messageDataModel?.param?.activityTime == "" {
                 titleLabel.snp.remakeConstraints { (make) in

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetNotification/Controller/MessagePlanetNotiController.swift

@@ -8,6 +8,10 @@
 
 class MessagePlanetNotiController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var messageShowTypes : String = ""
     var cellHeightsDictionary = Dictionary<IndexPath, Any>()
     var messageDataModels = Array<MessageDataModel>()

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/MineModule/AccountSecurity/ViewController/AccountSecurityViewController.swift

@@ -10,6 +10,10 @@ import UIKit
 import SwiftyMediator
 
 class AccountSecurityViewController: BaseViewController {
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
 
     override func viewDidLoad() {
         super.viewDidLoad()

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/MineModule/AddressManager/ViewController/AddressManagerViewController.swift

@@ -10,6 +10,10 @@ import UIKit
 
 class AddressManagerViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         NotificationCenter.default.removeObserver(observe!)
     }

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/MineModule/EditExpressAddress/ViewController/EditExpressAddressViewController.swift

@@ -10,6 +10,10 @@ import UIKit
 
 class EditExpressAddressViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var expressAddresModel: ExpressAddresModel?
     
     typealias SaveAddressClosure = () -> Void

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/MineModule/EditSelfMentionContacts/ViewController/EditSelfMentionContactsViewController.swift

@@ -10,6 +10,10 @@ import UIKit
 
 class EditSelfMentionContactsViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     typealias SaveClosure = () -> Void
     var saveClosure : SaveClosure?
     

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/MineModule/ExpressAddressList/ViewController/ExpressAddressListViewController.swift

@@ -9,6 +9,10 @@
 import UIKit
 
 class ExpressAddressListViewController: BaseViewController {
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
 
     deinit {
         NotificationCenter.default.removeObserver(observe!)

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
 
         }
     }

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/MineModule/ModifyData/ViewController/ModifyDataViewController.swift

@@ -10,6 +10,10 @@ import UIKit
 
 class ModifyDataViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var userDetailModel: UserDetailModel? {
         didSet {
             avatar = userDetailModel?.avatar

+ 6 - 2
RainbowPlanet/RainbowPlanet/Modules/MineModule/MyFollowAndFan/ViewController/MyFollowAndFanViewController.swift

@@ -15,6 +15,10 @@ enum MyFollowAndFanType {
 }
 
 class MyFollowAndFanViewController: BaseViewController {
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
 
     /// 类型
     var myfollowAndFanType : MyFollowAndFanType?
@@ -113,7 +117,7 @@ extension MyFollowAndFanViewController {
                 self?.tableView.resetNoMoreData()
             }
             self?.userFollowModels = (self?.userFollowModels)! + (userFollowsModel?.data!)!
-            if !(self?.userFanModels.isEmpty ?? true) {
+            if !(self?.userFollowModels.isEmpty ?? true) {
                 self?.tableView.tableHeaderView = self?.followHeaderView
             }
             self?.tableView.reloadData()
@@ -150,7 +154,7 @@ extension MyFollowAndFanViewController {
             }
             self?.userFanModels = (self?.userFanModels)! + (userFansModel?.data!)!
             if !(self?.userFanModels.isEmpty ?? true) {
-                self?.tableView.tableHeaderView = self?.followHeaderView
+                self?.tableView.tableHeaderView = self?.fanHeaderView
             }
             self?.tableView.reloadData()
             MJRefreshManager.mjRefreshManagerPaginationNoHiddenFooter(tableView: self?.tableView, pagination: userFansModel?.pagination)

+ 5 - 1
RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/OtherPersonalCenter/ViewController/OtherPersonalCenterViewController.swift

@@ -16,6 +16,10 @@ class OtherPersonalCenterViewController: BaseViewController {
     deinit {
         NXLLog("deinit")
     }
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
 
     let JXTableHeaderViewHeight: Int = Int(140 + kNavBarTotalHeight)
     let JXheightForHeaderInSection: Int = 44
@@ -187,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()
+            //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")"]

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/PersonalCenterView/PersonViewUserAndOtherHeaderView.swift

@@ -244,7 +244,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()
+            //ImageCache.default.clearMemoryCache()
 
 
         }

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
 
             rainbowBeanNumberLabel.text = "\(postMyModel?.collectBean ?? 0)"
             if PostMyModelType(rawValue: postMyModel?.type ?? "") == .video {

+ 6 - 2
RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/ViewController/UserPersonalCenterViewController.swift

@@ -21,6 +21,10 @@ class UserPersonalCenterViewController: BaseViewController {
             NotificationCenter.default.removeObserver(observe!)
         }
     }
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
     weak var observe : NSObjectProtocol?
     
     let JXTableHeaderViewHeight: Int = Int(140 + kNavBarTotalHeight + 109)
@@ -305,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()
+            //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()
@@ -320,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()
+            //ImageCache.default.clearMemoryCache()
         }
     }
 

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/MineModule/SelfMentionContactsList/ViewController/SelfMentionContactsListViewController.swift

@@ -10,6 +10,10 @@ import UIKit
 
 class SelfMentionContactsListViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var selfMentionContactsModels : Array<SelfMentionContactsModel>?
     
     // 是否由支付订单页面进入

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/MineModule/Set/ViewController/SetViewController.swift

@@ -11,6 +11,10 @@ import SwiftyMediator
 
 class SetViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/MineModule/SetPassword/ViewController/SetPasswordViewController.swift

@@ -9,6 +9,10 @@
 import UIKit
 
 class SetPasswordViewController: BaseViewController {
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
 
     deinit {
         //记得移除通知监听

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/ViewController/OrderViewController.swift

@@ -29,6 +29,10 @@ enum OrderVCType : Int {
 
 class OrderViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         NotificationCenter.default.removeObserver(observe!)
     }

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderApplyRefund/ViewController/OrderApplyRefundController.swift

@@ -13,6 +13,10 @@ import Photos
 
 class OrderApplyRefundController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var orderDetailModel: OrderModel? {
         didSet {
             self.productArr = self.orderDetailModel?.detail

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderComment/ViewController/OrderCommentController.swift

@@ -13,6 +13,10 @@ import Photos
 
 class OrderCommentController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     typealias CommentSuccessedBlock = () -> Void
     var commentSuccessedBlock : CommentSuccessedBlock?
     

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
             titleLabel.text = orderModelDetailModel?.productName
             timeLabel.text = "预计配送时间:\(orderModelDetailModel?.receiveTime ?? "")"
             skuLabel.text = "规格:\(orderModelDetailModel?.skuName ?? "")"

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/ViewController/OrderDetailViewController.swift

@@ -10,6 +10,10 @@ import UIKit
 
 class OrderDetailViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var orderModel : OrderModel?
     
     var orderDetailModel : OrderModel?

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderFinishPay/ViewController/OrderFinishPayController.swift

@@ -25,6 +25,10 @@ enum OrderFinishPayVCType {
 
 class OrderFinishPayController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var payStatus: Bool? = true {
         didSet {
             if payStatus ?? true {

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderLogistics/ViewController/OrderLogisticsController.swift

@@ -11,6 +11,10 @@ import RxSwift
 
 class OrderLogisticsController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var orderNumber: String? {
         didSet {
             numLbl.text = self.orderNumber

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/ViewController/ShoppingCartPayOrderController.swift

@@ -25,6 +25,10 @@ enum ShoppingCartPayOrderVCType {
 
 class ShoppingCartPayOrderController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     // 已选商品ModelArr
     var selListModelArr : Array<CartProductListModel>?
 

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderRefunddetails/ViewController/OrderRefunddetailsViewController.swift

@@ -16,6 +16,10 @@ enum OrderRefunddetailsVCType {
 
 class OrderRefunddetailsViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var titles = ["退款编号","申请时间","订单状态","退款原因","退款金额"]
     var contents = ["","","","",""]
     

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddAddress/ViewController/PublishAddAddressController.swift

@@ -10,6 +10,10 @@ import UIKit
 
 class PublishAddAddressController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         NXLLog("deinit")
     }

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/Controller/PublishAddTopicController.swift

@@ -13,6 +13,10 @@ import Photos
 
 class PublishAddTopicController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     // 话题组のModelArr
     var communityTopicModels : Array<CommunityTopicModel>?
     

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
 
         }
     }

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEdit/Controller/PublishEditController.swift

@@ -19,6 +19,10 @@ enum PublishMediaType: Int {
 
 class PublishEditController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     @objc var mediaType: PublishMediaType = .image
     @objc var videoPath: String = ""
     @objc var coverImagePath: String = ""

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
 
         }
     }

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishMusicListController.swift

@@ -12,6 +12,10 @@ import JXSegmentedView
 
 class PublishMusicListController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var listViewDidScrollCallback: ((UIScrollView) -> ())?
     deinit {
         listViewDidScrollCallback = nil

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishRecommendMusicController.swift

@@ -12,6 +12,10 @@ import SwiftyMediator
 
 class PublishRecommendMusicController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     override func viewDidLoad() {
         
         super.viewDidLoad()

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishTakePhoto/PublishConfirmPhotoController.swift

@@ -12,6 +12,10 @@ import Photos
 
 class PublishConfirmPhotoController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var photoImg: UIImage? {
         didSet {
             photoImageView.image = self.photoImg

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishTakePhoto/PublishTakePhotoController.swift

@@ -19,6 +19,10 @@ enum FlashType : Int {
 
 class PublishTakePhotoController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     typealias DismissClosure = () -> Void
     var dismissClosure: DismissClosure?
     

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishViewController.swift

@@ -11,6 +11,10 @@ import JXSegmentedView
 
 class PublishViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         NXLLog("deinit")
     }

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/PublishModule/Unused/PublishTakeVideo/PublishVideoRecorderController.swift

@@ -13,6 +13,10 @@ import CoreMotion
 
 class PublishVideoRecorderController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     typealias DismissClosure = () -> Void
     var dismissClosure: DismissClosure?
     

+ 2 - 0
RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/Banner/RedemptionAreaBannerCollectionViewCell.swift

@@ -60,6 +60,8 @@ class RedemptionAreaBannerCollectionViewCell: UICollectionViewCell {
     private lazy var iconImageView: UIImageView = {
         let iconImageView = UIImageView()
         iconImageView.isUserInteractionEnabled = true
+        iconImageView.contentMode =  .scaleAspectFill
+
         return iconImageView
     }()
     

+ 3 - 1
RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/Banner/RedemptionAreaFSPagerViewCell.swift

@@ -50,13 +50,15 @@ class RedemptionAreaFSPagerViewCell: FSPagerViewCell {
     private lazy var bgImageView: UIImageView = {
         let bgImageView = UIImageView()
         bgImageView.isUserInteractionEnabled = true
+        bgImageView.contentMode =  .scaleAspectFill
+
         return bgImageView
     }()
     
     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()
+            //ImageCache.default.clearMemoryCache()
 
         }
     }

+ 4 - 4
RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/FloorCell/RedemptionAreaProductCollectionViewCell.swift

@@ -108,15 +108,15 @@ class RedemptionAreaProductCollectionViewCell: UICollectionViewCell {
     
     lazy var beanLabel: UILabel = {
         let beanLabel = UILabel()
-        beanLabel.textColor = kFFA42FColor
+        beanLabel.textColor = k333333Color
         beanLabel.font = kMediumFont20
         return beanLabel
     }()
     
     lazy var beanNameLabel: UILabel = {
         let beanNameLabel = UILabel()
-        beanNameLabel.textColor = kFFA42FColor
-        beanNameLabel.font = kRegularFont12
+        beanNameLabel.textColor = k333333Color
+        beanNameLabel.font = kRegularFont10
         beanNameLabel.text = "U米"
         return beanNameLabel
     }()
@@ -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()
+            //ImageCache.default.clearMemoryCache()
             titleLabel.text = cmsRedemptionAreaRule?.saleName
             detatileTitleLabel.text = cmsRedemptionAreaRule?.subtitle
             beanLabel.text = "\(cmsRedemptionAreaRule?.price ?? 0)"

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
 
         }
     }

+ 2 - 1
RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialCell/SpecialOneTypeCollectionViewCell.swift

@@ -52,13 +52,14 @@ class SpecialOneTypeCollectionViewCell: UICollectionViewCell {
         let iconImageView = UIImageView()
         iconImageView.image = kImage(name: "default_pic")
         iconImageView.isUserInteractionEnabled = true
+        iconImageView.contentMode =  .scaleAspectFill
         return iconImageView
     }()
     
     var cmsRedemptionAreaRule : CMSRedemptionAreaRule? {
         didSet {
             iconImageView.kf.setImage(with: kURLThumbnailsImage(name: cmsRedemptionAreaRule?.url ?? "", size: self.size), placeholder: kImage(name: "default_pic"))
-            ImageCache.default.clearMemoryCache()
+            //ImageCache.default.clearMemoryCache()
 
         }
     }

+ 2 - 0
RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/View/SpecialCell/SpecialTwoTypeCollectionViewCell.swift

@@ -49,6 +49,8 @@ class SpecialTwoTypeCollectionViewCell: UICollectionViewCell {
         let iconImageView = UIImageView()
         iconImageView.image = kImage(name: "default_pic")
         iconImageView.isUserInteractionEnabled = true
+        iconImageView.contentMode =  .scaleAspectFill
+
         return iconImageView
     }()
     

+ 5 - 1
RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/RedemptionArea/ViewController/RedemptionAreaViewController.swift

@@ -11,6 +11,10 @@ import SwiftyMediator
 
 class RedemptionAreaViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         NXLLog("deinit")
         if observe != nil {
@@ -30,7 +34,7 @@ class RedemptionAreaViewController: BaseViewController {
     }
     
     override func setupViews() {
-        navigationBar.title = "兑换商城"
+        navigationBar.title = "兑换专区"
         navigationBar.wr_setRightButton(image: kImage(name: "navbar_class_black")!)
         view.addSubview(tableView)
         view.insertSubview(navigationBar, aboveSubview: tableView)

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/BindPhoneNumber/ViewController/BindPhoneNumberViewController.swift

@@ -23,6 +23,10 @@ public enum BindPhoneNumberVCType {
 
 class BindPhoneNumberViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         NXLLog("deinit")
     }

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/GenderSelection/ViewController/GenderSelectionViewController.swift

@@ -10,6 +10,10 @@ import UIKit
 
 class GenderSelectionViewController: BaseViewController {
 
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/MobileLogin/ViewController/MobileLoginViewController.swift

@@ -11,6 +11,10 @@ import RxSwift
 import RxCocoa
 class MobileLoginViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         NXLLog("deinit")
     }

+ 5 - 0
RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/PasswordLogin/ViewController/PasswordLoginViewController.swift

@@ -9,6 +9,11 @@
 import UIKit
 
 class PasswordLoginViewController: BaseViewController {
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/PhoneCountryArea/ViewController/PhoneCountryAreaViewController.swift

@@ -10,6 +10,10 @@ import UIKit
 import SwiftyJSON
 
 class PhoneCountryAreaViewController: BaseViewController {
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
 
     typealias PhoneCountryAreaVCCloSure = (_ phoneCountryAreaMdoel : PhoneCountryAreaMdoel) -> Void
     var phoneCountryAreaVCCloSure : PhoneCountryAreaVCCloSure?

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/RegisterLogin/ViewController/RegisterLoginViewController.swift

@@ -12,6 +12,10 @@ import SwiftyJSON
 
 class RegisterLoginViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         NXLLog("deinit")
         NotificationCenter.default.removeObserver(self)

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
 
             titleLabel.text = communityTopicModel?.name
             selectionButton.isSelected = communityTopicModel?.isSelected ?? false

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/TopicSelection/ViewController/TopicSelectionViewController.swift

@@ -10,6 +10,10 @@ import UIKit
 
 class TopicSelectionViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     var indexPathDict = Dictionary<Int, Any>()
     
     var communityTopicModels = Array<CommunityTopicModel>()

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/SearchModule/Search/ViewController/SearchViewController.swift

@@ -10,6 +10,10 @@ import UIKit
 
 class SearchViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         NXLLog("deinit")
     }

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchContentList/View/SearchContentListCollectionCell.swift

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

+ 4 - 0
RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchResult/ViewController/SearchResultViewController.swift

@@ -11,6 +11,10 @@ import JXSegmentedView
 
 class SearchResultViewController: BaseViewController {
     
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
+    
     deinit {
         NXLLog("deinit")
         if observe != nil {

+ 1 - 1
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()
+            //ImageCache.default.clearMemoryCache()
 
             titleLabel.text = communityTopicDataModel?.name
             subtitleLabel.text = "\(communityTopicDataModel?.followCount ?? "0")人参与"

+ 3 - 0
RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchTopicList/ViewController/SearchTopicListViewController.swift

@@ -14,6 +14,9 @@ class SearchTopicListViewController: BaseViewController {
     var keyWord : String = ""
     var communityTopicModels = Array<CommunityTopicDataModel>()
 
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+    }
     
     override func viewDidLoad() {
         super.viewDidLoad()

+ 0 - 0
RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchUser/View/SearchUserLitTableViewCell.swift


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov