头像修复

RainbowPlanet/RainbowPlanet.xcodeproj/xcshareddata/xcschemes/RainbowPlanet.xcscheme

@@ -62,7 +62,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       disableMainThreadChecker = "YES"

RainbowPlanet/RainbowPlanet/Manager/UMManager/UMManager.swift

@@ -438,6 +438,11 @@ func getUserInfo(platformType: UMSocialPlatformType,currentViewController:UIView
                 UserModel.open_id = anOpenid
             }
             
+            if let anUnionId = resp?.unionId {
+                NXLLog(" unionId: \(anUnionId)")
+                UserModel.union_id = anUnionId
+            }
+            
             // 用户数据
             if let aName = resp?.name {
                 NXLLog(" name: \(aName)")

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

@@ -60,7 +60,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"))
+        avatarButton.kf.setImage(with: kURLImage(name: UserModel.shared().getModel()?.avatarurl ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
         KingfisherManager.shared.cache.clearMemoryCache()
 
         avatarButton.cornerRadius = 14

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

@@ -158,7 +158,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"))
+            avatarButton.kf.setImage(with: kURLImage(name: communityRecommendDataModel?.avatar ?? ""), 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
@@ -174,7 +174,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"))
+            avatarButton.kf.setImage(with: kURLImage(name: communityFollowDataModel?.relateData?.avatar ?? ""), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
             
             KingfisherManager.shared.cache.clearMemoryCache()
             titleButton.setTitle(communityFollowDataModel?.relateData?.username, for: UIControl.State.normal)

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

@@ -299,7 +299,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"))
+            avatarButton.kf.setImage(with: kURLImage(name: communityFollowDataModel?.followAvatar ?? ""), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
             titleButton.setTitle(communityFollowDataModel?.followUsername, for: UIControl.State.normal)
@@ -316,7 +316,7 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
             switch communityFollowType {
             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"))
+                avatarOtherButton.kf.setImage(with: kURLImage(name: communityFollowDataModel?.relateData?.avatar ?? ""), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
                 KingfisherManager.shared.cache.clearMemoryCache()
 
                 titleOtherButton.setTitle(communityFollowDataModel?.relateData?.username, for: UIControl.State.normal)

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

@@ -85,7 +85,7 @@ class PopularVideoCollectionViewCell: UICollectionViewCell {
     var communityRecommendTypeDataModel : CommunityRecommendTypeDataModel? {
         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"))
+            avatarImageView.kf.setImage(with: kURLImage(name: communityRecommendTypeDataModel?.avatar ?? ""), placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
             nameLabel.text = communityRecommendTypeDataModel?.userName

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

@@ -126,7 +126,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"))
+            avatarButton.kf.setImage(with: kURLImage(name: communityRecommendTypeDataModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
            
@@ -150,7 +150,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"))
+            avatarButton.kf.setImage(with: kURLImage(name: cmsMemberModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
 

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

@@ -305,7 +305,7 @@ extension CommunityFeaturedTopicsViewController {
             self?.communityTopicDetailModel = communityTopicDetailModel as? CommunityTopicDetailModel
             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"))
+            self?.bgImageView.kf.setImage(with: kURLImage(name: self?.communityTopicDetailModel?.img ?? ""), placeholder: kImage(name: "default_pic"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
             self?.navigationBar.barBackgroundImage = self?.bgImageView.image

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

@@ -357,7 +357,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"))
+            self?.avatarButton.kf.setImage(with: kURLImage(name: self?.communityPostDetailModel?.avatar ?? ""), 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 {

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

@@ -166,7 +166,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"))
+            iconButton.kf.setImage(with: kURLImage(name: communityPostCommentModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = communityPostCommentModel?.username
             contentLabel.text = communityPostCommentModel?.content

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

@@ -122,7 +122,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"))
+            iconButton.kf.setImage(with: kURLImage(name: communityPostReplyModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
             

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

@@ -273,7 +273,7 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
     var communityPostDetailModel : CommunityPostDetailModel? {
         didSet {
             
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostDetailModel?.avatar ?? "",size: kSize30x30Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: communityPostDetailModel?.avatar ?? ""), 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)

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

@@ -157,7 +157,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"))
+            iconButton.kf.setImage(with: kURLImage(name: UserModel.shared().getModel()?.avatarurl ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
         }
     }

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

@@ -139,7 +139,7 @@ class CommunityShareContentViewController: BaseViewController {
         QRCodeImageView.image = QRCode.createQRForString(qrString: H5UrlStr, qrImageName: "")
         scanLabel.text = "扫码查看内容 领取\(bean ?? 0)U米"
         
-        avatarImageView.kf.setImage(with: kURLThumbnailsImage(name: avatarStr ?? "",size: CGSize(width: 20*kScaleWidth, height: 20*kScaleWidth)), placeholder: kImage(name: "default_pic"),completionHandler:{ [weak self] (image, error, cacheType, url) in
+        avatarImageView.kf.setImage(with: kURLImage(name: avatarStr ?? ""), placeholder: kImage(name: "default_pic"),completionHandler:{ [weak self] (image, error, cacheType, url) in
             self?.bgImageView.kf.setImage(with: kURLThumbnailsImage(name: self?.imgUrl ?? "",size: CGSize(width: kScreenWidth, height: 481*kScaleWidth)), placeholder: kImage(name: "default_pic"),completionHandler: { [weak self] (image, error, cacheType, url) in
                 self?.scrollView.swContentCapture {
                     [weak self] (image) in

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

@@ -111,7 +111,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"))
+            iconButton.kf.setImage(with: kURLImage(name: communityPostCommentModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = communityPostCommentModel?.username
             contentLabel.text = communityPostCommentModel?.content

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

@@ -117,7 +117,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"))
+            iconButton.kf.setImage(with: kURLImage(name: communityPostReplyModel?.avatar ?? ""), 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

@@ -855,7 +855,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"))
+            avatarButton.kf.setImage(with: kURLImage(name: self.videoItemMdl?.avatar ?? ""), for: .normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
             if self.videoItemMdl?.username?.count ?? 0 <= 12 {

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

@@ -166,7 +166,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"))
+            iconButton.kf.setImage(with: kURLImage(name: communityPostCommentModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             titleLabel.text = communityPostCommentModel?.username
             contentLabel.text = communityPostCommentModel?.content

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

@@ -78,7 +78,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"))
+            avatarButton.kf.setBackgroundImage(with: kURLImage(name: userDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             
 
         }

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

@@ -185,8 +185,8 @@ extension OtherPersonalCenterViewController {
             [weak self] (userDetailModel) -> (Void) in
             self?.userDetailModel = userDetailModel as? UserDetailModel
             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"))
+            self?.navigationBar.backgroundImageView.kf.setImage(with: kURLImage(name: self?.userDetailModel?.backgroundImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
+            self?.avatarButton.kf.setImage(with: kURLImage(name: self?.userDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
             self?.nameButton.setTitle(self?.userDetailModel?.username, for: UIControl.State.normal)

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

@@ -242,7 +242,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"))
+            avatarButton.kf.setBackgroundImage(with: kURLImage(name: userDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
 

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

@@ -309,7 +309,7 @@ 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: kURLImage(name: self?.userDetailModel?.avatar ?? ""), 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")"]
@@ -324,7 +324,7 @@ 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: kURLImage(name: self?.userDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             
         }
     }

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

@@ -65,6 +65,7 @@ class PublishEditDescribeCell: UITableViewCell {
         cmtTextView.placeholderTextColor = kDDDDDDColor
         cmtTextView.delegate = self
         cmtTextView.tintColor = kThemeColor
+        cmtTextView.textContainerInset = UIEdgeInsets.zero
         return cmtTextView
     }()
     

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

@@ -232,7 +232,7 @@ class SearchContentListCollectionCell: UICollectionViewCell {
             }else {
                 titleLabel.text = "\(communityPostDataModel?.title?.replacingOccurrences(of: "\n", with: "").replacingOccurrences(of: "\r", with: "").prefix(20) ?? "")"
             }
-            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostDataModel?.avatar ?? "", size: kSize18x18Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLImage(name: communityPostDataModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
             nameButton.text = communityPostDataModel?.username
 

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

@@ -145,7 +145,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"))
+            avatarButton.kf.setImage(with: kURLImage(name: userFollowModel?.followAvatar ?? ""), 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>()
@@ -168,7 +168,7 @@ class SearchUserLitTableViewCell: UITableViewCell {
         didSet {
             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"))
+            avatarButton.kf.setImage(with: kURLImage(name: userFanModel?.fanAvatar ?? ""), 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>()
@@ -191,7 +191,7 @@ class SearchUserLitTableViewCell: UITableViewCell {
         didSet {
             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"))
+            avatarButton.kf.setImage(with: kURLImage(name: cmsMemberModel?.avatar ?? ""), 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>()
@@ -215,7 +215,7 @@ class SearchUserLitTableViewCell: UITableViewCell {
         didSet {
             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"))
+            avatarButton.kf.setImage(with: kURLImage(name: searchMemberModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             KingfisherManager.shared.cache.clearMemoryCache()
 
             titleButton.setTitle(searchMemberModel?.username, for: UIControl.State.normal)