调整图片缩略图

RainbowPlanet/RainbowPlanet/Manager/ThumbnailsManager/ThumbnailsManager.swift

@@ -8,12 +8,32 @@
 
 import UIKit
 
+let kSize18x18Image = CGSize(width: 18, height: 18)
+
+let kSize20x20Image = CGSize(width: 20, height: 20)
+
+let kSize24x24Image = CGSize(width: 24, height: 24)
+
+let kSize28x28Image = CGSize(width: 28, height: 28)
+
+let kSize30x30Image = CGSize(width: 30, height: 30)
+
 let kSize40x40Image = CGSize(width: 40, height: 40)
 
+let kSize44x44Image = CGSize(width: 44, height: 44)
+
+let kSize54x54Image = CGSize(width: 54, height: 54)
+
 let kSize60x60Image = CGSize(width: 60, height: 60)
 
+let kSize70x70Image = CGSize(width: 70, height: 70)
+
 let kSize80x80Image = CGSize(width: 80, height: 80)
 
+let kSize92x92Image = CGSize(width: 92, height: 92)
+
+let kSize120x120Image = CGSize(width: 120, height: 120)
+
 
 class ThumbnailsManager: NSObject {
     

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

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

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

@@ -67,7 +67,7 @@ class CardContentPicVideoCollectionViewCell: UICollectionViewCell {
     
     var imgStr: String? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: imgStr ?? ""), placeholder: kImage(name: "default_pic"),options:[.fromMemoryCacheOrRefresh])
+            iconImageView.kf.setImage(with: kURLThumbnailsImage(name: imgStr ?? "",size: self.size), placeholder: kImage(name: "default_pic"),options:[.fromMemoryCacheOrRefresh])
         }
     }
     

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

@@ -157,7 +157,7 @@ class CardContentUserTableViewCell: UITableViewCell {
     
     var communityRecommendDataModel: CommunityRecommendDataModel? {
         didSet {
-            avatarButton.kf.setImage(with: kURLImage(name: ThumbnailsManager.thumbnails(imgStr: communityRecommendDataModel?.avatar ?? "", size: avatarButton.size) ), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityRecommendDataModel?.avatar ?? "", size: avatarButton.size), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
 
             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: kURLImage(name: ThumbnailsManager.thumbnails(imgStr: communityFollowDataModel?.relateData?.avatar ?? "", size: avatarButton.size) ), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityFollowDataModel?.relateData?.avatar ?? "",size: avatarButton.size), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(communityFollowDataModel?.relateData?.username, for: UIControl.State.normal)
             timeLabel.text = communityFollowDataModel?.relateData?.createdAt
             

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

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

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

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

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

@@ -83,8 +83,8 @@ class PopularVideoCollectionViewCell: UICollectionViewCell {
     
     var communityRecommendTypeDataModel : CommunityRecommendTypeDataModel? {
         didSet {
-            picImageView.kf.setImage(with: kURLImage(name: communityRecommendTypeDataModel?.img ?? ""), placeholder: kImage(name: "default_pic"))
-            avatarImageView.kf.setImage(with: kURLImage(name: communityRecommendTypeDataModel?.avatar ?? ""), placeholder: kImage(name: "default_avatar"))
+            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"))
             nameLabel.text = communityRecommendTypeDataModel?.userName
         }
     }

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

@@ -145,7 +145,7 @@ class CommunityRecommendFollowCollectionViewCell: UICollectionViewCell {
     
     var cmsMemberModel : CMSMemberModel? {
         didSet {
-            avatarButton.kf.setImage(with: kURLImage(name: cmsMemberModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: cmsMemberModel?.avatar ?? "",size: kSize60x60Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(cmsMemberModel?.username, for: UIControl.State.normal)
             if cmsMemberModel?.topicName == "" || cmsMemberModel?.topicName == nil {
                 topicLabel.text = ""

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Planet/CommunityPlanet/CommunityPlanetViewController.swift

@@ -120,6 +120,7 @@ extension CommunityPlanetViewController : WKNavigationDelegate {
     
     //跳转失败的时候调用
     func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
+        
     }
     // 内容加载失败时候调用
     func webView(_ webView: WKWebView, didFailProvisionalNavigation navigation: WKNavigation!, withError error: Error) {

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

@@ -298,7 +298,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: kURLImage(name: self?.communityTopicDetailModel?.img ?? ""), placeholder: kImage(name: "default_pic"))
+            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?.navigationBar.barBackgroundImage = self?.bgImageView.image
             self?.communityFeaturedTopicsHeaderView.communityTopicDetailModel = self?.communityTopicDetailModel
             self?.tableView.tableHeaderView = self?.communityFeaturedTopicsHeaderView

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

@@ -45,7 +45,7 @@ class CommunityFindFriendsView: BaseView {
     lazy var picButton: UIButton = {
         let picButton = UIButton(type: UIButton.ButtonType.custom)
         let configModel = ConfigModel.shared.object()
-        picButton.kf.setBackgroundImage(with: kURLImage(name: configModel?.findFriendImg ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_pic"))
+        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"))
         picButton.cornerRadius = 5
         picButton.masksToBounds = true
         picButton.rx.tap.subscribe(onNext: { [weak self] _ in

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

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

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

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

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

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

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

@@ -55,7 +55,7 @@ class CommunityPostDetailFSPagerViewCell: FSPagerViewCell {
     
     var img : String? {
         didSet {
-            bgImageView.kf.setImage(with: kURLImage(name: img ?? ""), placeholder: kImage(name: "default_pic"))
+            bgImageView.kf.setImage(with: kURLThumbnailsImage(name: img ?? "", size: self.size), placeholder: kImage(name: "default_pic"))
 
         }
     }

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

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

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

@@ -156,7 +156,7 @@ class RecommendNoneCommentCell: UITableViewCell {
     
     var communityPostDetailModel : CommunityPostDetailModel? {
         didSet {
-            iconButton.kf.setImage(with: kURLImage(name: communityPostDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            iconButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostDetailModel?.avatar ?? "", size: kSize30x30Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
         }
     }
     

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

@@ -67,7 +67,7 @@ extension CommunityShareActivityViewController {
     func configPosterInviteApi() {
         SwiftMoyaNetWorkServiceConfig.shared().configPosterInviteApi {
              [weak self] (data) -> (Void) in
-            self?.bgImageView.kf.setImage(with: kURLImage(name: (data as! String)), placeholder: kImage(name: "default_pic"))
+            self?.bgImageView.kf.setImage(with: kURLThumbnailsImage(name: (data as! String),size: CGSize(width: kScreenWidth, height: 607*kScaleWidth)), placeholder: kImage(name: "default_pic"))
             self?.shareCommunityContentView.imageUrl = (data as! String)
         }
     }

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

@@ -119,10 +119,10 @@ class CommunityShareContentViewController: BaseViewController {
     }
     
     override func setupData() {
-        bgImageView.kf.setImage(with: kURLImage(name: imgUrl ?? ""), placeholder: kImage(name: "default_pic"))
+        bgImageView.kf.setImage(with: kURLThumbnailsImage(name: imgUrl ?? "",size: CGSize(width: kScreenWidth, height: 481*kScaleWidth)), placeholder: kImage(name: "default_pic"))
         topicLabel.text = "#\(topicStr)#"
         titleLabel.text = titleStr
-        avatarImageView.kf.setImage(with: kURLImage(name: avatarStr ?? ""), placeholder: kImage(name: "default_pic"))
+        avatarImageView.kf.setImage(with: kURLThumbnailsImage(name: avatarStr ?? "",size: CGSize(width: 20*kScaleWidth, height: 20*kScaleWidth)), placeholder: kImage(name: "default_pic"))
         nameLable.text = nameStr ?? ""
         
         if let tryImage = EFQRCode.generate(

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

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

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

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

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

@@ -851,7 +851,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
             
             beanLabel.text = "\(self.videoItemMdl?.willCollectBean ?? 0)U米待收获"
             
-            avatarButton.kf.setImage(with: kURLImage(name: self.videoItemMdl?.avatar ?? ""), for: .normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: self.videoItemMdl?.avatar ?? "", size: kSize30x30Image), for: .normal, placeholder: kImage(name: "default_avatar"))
             if self.videoItemMdl?.username?.count ?? 0 <= 12 {
                 personLabel.text = self.videoItemMdl?.username
             }else {

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

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

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

@@ -21,7 +21,6 @@ class H5CommonViewController: BaseJSWebBaseViewController {
         }
     }
     weak var observe : NSObjectProtocol?
-
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -76,8 +75,6 @@ extension H5CommonViewController : UIScrollViewDelegate {
 
 extension H5CommonViewController : WKNavigationDelegate  {
     
-    
-    
     //服务器开始请求的时候调用
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
         

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

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

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

@@ -143,7 +143,7 @@ class MessageActivityTableCell: UITableViewCell {
             timeLabel.text = " \(messageDataModel?.createdAt ?? "") "
             subLabel.text = "活动时间:\(messageDataModel?.param?.activityTime ?? "")"
             titleLabel.text = messageDataModel?.param?.title
-            actImageView.kf.setImage(with: kURLImage(name: messageDataModel?.param?.cover ?? ""), placeholder: kImage(name: "default_pic"))
+            actImageView.kf.setImage(with: kURLThumbnailsImage(name: messageDataModel?.param?.cover ?? "", size: self.size), placeholder: kImage(name: "default_pic"))
             if messageDataModel?.param?.activityTime == nil || messageDataModel?.param?.activityTime == "" {
                 titleLabel.snp.remakeConstraints { (make) in
                     make.bottom.equalTo(-14)

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

@@ -180,8 +180,8 @@ extension OtherPersonalCenterViewController {
             [weak self] (userDetailModel) -> (Void) in
             self?.userDetailModel = userDetailModel as? UserDetailModel
             self?.otherHeaderView.userDetailModel = self?.userDetailModel
-            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"))
+            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?.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()

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

@@ -243,7 +243,7 @@ class PersonViewUserAndOtherHeaderView: BaseView {
             }
             followNumberButton.setTitle("\(userDetailModel?.followCount ?? "0") 关注", for: UIControl.State.normal)
             fanNumberButton.setTitle("\(userDetailModel?.fansCount ?? "0") 粉丝", for: UIControl.State.normal)
-            avatarButton.kf.setBackgroundImage(with: kURLImage(name: userDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setBackgroundImage(with: kURLThumbnailsImage(name: userDetailModel?.avatar ?? "", size: kSize60x60Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
 
         }
     }

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

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

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

@@ -301,8 +301,8 @@ extension UserPersonalCenterViewController {
             [weak self] (userDetailModel) -> (Void) in
             self?.userDetailModel = userDetailModel as? UserDetailModel
             self?.userHeaderView.userDetailModel = self?.userDetailModel
-            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"))
+            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?.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()

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

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

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

@@ -16,7 +16,7 @@ class PublishTopicTypeItemCollectionCell: UICollectionViewCell {
     var topicModel: CommunityTopicModel? {
         didSet {
             titleLabel.text = self.topicModel?.name
-            picImageView.kf.setImage(with: kURLImage(name: self.topicModel?.img ?? ""), placeholder: kImage(name: "default_pic"))
+            picImageView.kf.setImage(with: kURLThumbnailsImage(name: self.topicModel?.img ?? "", size: self.size), placeholder: kImage(name: "default_pic"))
         }
     }
     

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

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

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishMusicChooseView.swift

@@ -41,8 +41,6 @@ class PublishMusicChooseView: BaseView {
     var categoryListMdlArr : Array<MusicCategoryItemModel>? {
         didSet {
             guard categoryListMdlArr?.isEmpty ?? true else {
-                categoryTitleArr.removeAll()
-                categoryTitleArr.append("推荐")
                 for categoryMdl in categoryListMdlArr! {
                     categoryTitleArr.append(categoryMdl.name!)
                 }
@@ -289,11 +287,7 @@ extension PublishMusicChooseView :JXSegmentedListContainerViewDataSource {
     func listContainerView(_ listContainerView: JXSegmentedListContainerView, initListAt index: Int) -> JXSegmentedListContainerViewListDelegate {
         let listVc = PublishMusicListController()
         listVc.curMusicUrl = self.curMusicUrl
-        if index == 0 {
-            listVc.isReccomendList = true
-        } else {
-            listVc.categoryItemMdl = categoryListMdlArr![index-1]
-        }
+        listVc.categoryItemMdl = categoryListMdlArr![index]
         listVc.playMusicClosure = {
             [weak self] (musicUrl) in
             if musicUrl == "" {

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishMusicListController.swift

@@ -25,13 +25,6 @@ class PublishMusicListController: BaseViewController {
     
     var curMusicUrl: String?
     
-    // 推荐下の音乐
-    var isReccomendList: Bool? {
-        didSet {
-            communityRecMusicListApi(page: 1)
-        }
-    }
-    
     // 分类下の音乐
     var categoryItemMdl: MusicCategoryItemModel? {
         didSet {

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishRecordMusicView.swift

@@ -37,8 +37,6 @@ class PublishRecordMusicView: BaseView {
     var categoryListMdlArr : Array<MusicCategoryItemModel>? {
         didSet {
             guard categoryListMdlArr?.isEmpty ?? true else {
-                categoryTitleArr.removeAll()
-                categoryTitleArr.append("推荐")
                 for categoryMdl in categoryListMdlArr! {
                     categoryTitleArr.append(categoryMdl.name!)
                 }
@@ -217,11 +215,7 @@ extension PublishRecordMusicView :JXSegmentedListContainerViewDataSource {
     func listContainerView(_ listContainerView: JXSegmentedListContainerView, initListAt index: Int) -> JXSegmentedListContainerViewListDelegate {
         let listVc = PublishMusicListController()
         listVc.curMusicUrl = self.curMusicUrl
-        if index == 0 {
-            listVc.isReccomendList = true
-        } else {
-            listVc.categoryItemMdl = categoryListMdlArr![index-1]
-        }
+        listVc.categoryItemMdl = categoryListMdlArr![index]
         listVc.playMusicClosure = {
             [weak self] (musicUrl) in
             if musicUrl == "" {

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

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

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

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

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

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

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

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

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/MobileLogin/View/MobileLoginView.swift

@@ -359,4 +359,3 @@ class MobileLoginView: BaseView {
     }()
     
 }
-

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

@@ -213,7 +213,7 @@ class SearchContentListCollectionCell: UICollectionViewCell {
             }else {
                 titleLabel.text = communityPostDataModel?.title?.replacingOccurrences(of: "\n", with: "").replacingOccurrences(of: "\r", with: "")
             }
-            avatarButton.kf.setImage(with: kURLImage(name: communityPostDataModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: communityPostDataModel?.avatar ?? "", size: kSize18x18Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             likeBtn.setTitle("\(communityPostDataModel?.praiseCount ?? 0)", for: UIControl.State.normal)
             if communityPostDataModel?.isLike == 0 {
                 likeBtn.isSelected = false

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

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

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

@@ -137,7 +137,7 @@ class SearchUserLitTableViewCell: UITableViewCell {
             
             CommunityFollowUserViewModel.setFollowType(followButton: followButton, followType: FollowType(rawValue: userFollowModel?.isFollowStatus ?? 0))
 
-            avatarButton.kf.setImage(with: kURLImage(name: userFollowModel?.followAvatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: userFollowModel?.followAvatar ?? "",size: kSize44x44Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(userFollowModel?.followUsername, for: UIControl.State.normal)
             var followTopic = Array<String>()
             if !(userFollowModel?.followTopic?.isEmpty ?? true) {
@@ -159,7 +159,7 @@ class SearchUserLitTableViewCell: UITableViewCell {
         didSet {
             CommunityFollowUserViewModel.setFollowType(followButton: followButton, followType: FollowType(rawValue: userFanModel?.isFollowStatus ?? 0))
 
-            avatarButton.kf.setImage(with: kURLImage(name: userFanModel?.fanAvatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: userFanModel?.fanAvatar ?? "",size: kSize44x44Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(userFanModel?.fanUsername, for: UIControl.State.normal)
             var followTopic = Array<String>()
             if !(userFanModel?.fanTopic?.isEmpty ?? true) {
@@ -181,7 +181,7 @@ class SearchUserLitTableViewCell: UITableViewCell {
         didSet {
             CommunityFollowUserViewModel.setFollowType(followButton: followButton, followType: FollowType(rawValue: cmsMemberModel?.followStatus ?? 0))
 
-            avatarButton.kf.setImage(with: kURLImage(name: cmsMemberModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: cmsMemberModel?.avatar ?? "",size: kSize44x44Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(cmsMemberModel?.username, for: UIControl.State.normal)
             var followTopic = Array<String>()
             if !(cmsMemberModel?.followTopic?.isEmpty ?? true) {
@@ -204,7 +204,7 @@ class SearchUserLitTableViewCell: UITableViewCell {
         didSet {
             CommunityFollowUserViewModel.setFollowType(followButton: followButton, followType: FollowType(rawValue: searchMemberModel?.followStatus ?? 0))
 
-            avatarButton.kf.setImage(with: kURLImage(name: searchMemberModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
+            avatarButton.kf.setImage(with: kURLThumbnailsImage(name: searchMemberModel?.avatar ?? "",size: kSize40x40Image), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(searchMemberModel?.username, for: UIControl.State.normal)
             var followTopic = Array<String>()
             if !(searchMemberModel?.followTopic?.isEmpty ?? true) {

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

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

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

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

RainbowPlanet/RainbowPlanet/Supporting Files/Info.plist

@@ -279,7 +279,6 @@
 	<string>App需要您的同意,才能访问提醒事项</string>
 	<key>UIBackgroundModes</key>
 	<array>
-		<string>location</string>
 		<string>remote-notification</string>
 	</array>
 	<key>UILaunchStoryboardName</key>

RainbowPlanet/RainbowPlanet/Tools/EmptyView/DIYEmptyView.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import WebKit
 
 /// 站位图
 ///
@@ -192,5 +193,21 @@ class DIYEmptyView: LYEmptyView {
         collectionView?.ly_emptyView = emptyView
         collectionView?.ly_startLoading()
     }
+    
+    
+    /// webView上的默认图 带button
+    ///
+    /// - Parameters:
+    ///   - wkWebView: wkWebView
+    ///   - imageStr: 图片默认图
+    ///   - detailStr: 标题
+    ///   - btnTitleStr: 按钮表示
+    ///   - btnClickBlock:
+    class func emptyNoDataActionWkWebView(wkWebView:WKWebView?,imageStr:DIYEmptyViewImageStr = .one,detailStr:DIYEmptyViewDetailString = .one,btnTitleStr:DIYEmptyViewActionBtnString = .one,btnClickBlock: @escaping LYActionTapBlock) {
+        let emptyView = DIYEmptyView.emptyActionView(withImageStr: imageStr.rawValue, titleStr: nil, detailStr: detailStr.rawValue, btnTitleStr: btnTitleStr.rawValue,btnClick: btnClickBlock)
+        emptyView?.autoShowEmptyView = true
+        wkWebView?.ly_emptyView = emptyView
+    }
+    
 
 }