消息缺省页面调试完成,下拉刷新动调整

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -218,7 +218,6 @@
 		A76068E922E4922F008DF18F /* Skittles.json in Resources */ = {isa = PBXBuildFile; fileRef = A76068E822E4922F008DF18F /* Skittles.json */; };
 		A76068EB22E49BC1008DF18F /* collect.json in Resources */ = {isa = PBXBuildFile; fileRef = A76068EA22E49BC0008DF18F /* collect.json */; };
 		A76068ED22E4A2B4008DF18F /* verywell.json in Resources */ = {isa = PBXBuildFile; fileRef = A76068EC22E4A2B4008DF18F /* verywell.json */; };
-		A76068F022E4AE91008DF18F /* loading.gif in Resources */ = {isa = PBXBuildFile; fileRef = A76068EF22E4AE91008DF18F /* loading.gif */; };
 		A76068F322E4B11B008DF18F /* UIImage+Gif.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76068F222E4B11B008DF18F /* UIImage+Gif.swift */; };
 		A76068F522E4BCF4008DF18F /* MJDIYHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76068F422E4BCF4008DF18F /* MJDIYHeader.swift */; };
 		A76068F722E4C401008DF18F /* MJDIYAutoFooter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76068F622E4C401008DF18F /* MJDIYAutoFooter.swift */; };
@@ -933,7 +932,6 @@
 		A76068E822E4922F008DF18F /* Skittles.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Skittles.json; sourceTree = "<group>"; };
 		A76068EA22E49BC0008DF18F /* collect.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = collect.json; sourceTree = "<group>"; };
 		A76068EC22E4A2B4008DF18F /* verywell.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = verywell.json; sourceTree = "<group>"; };
-		A76068EF22E4AE91008DF18F /* loading.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = loading.gif; sourceTree = "<group>"; };
 		A76068F222E4B11B008DF18F /* UIImage+Gif.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+Gif.swift"; sourceTree = "<group>"; };
 		A76068F422E4BCF4008DF18F /* MJDIYHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MJDIYHeader.swift; sourceTree = "<group>"; };
 		A76068F622E4C401008DF18F /* MJDIYAutoFooter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MJDIYAutoFooter.swift; sourceTree = "<group>"; };
@@ -2520,7 +2518,6 @@
 			isa = PBXGroup;
 			children = (
 				A763BE7A22F28376000CE594 /* Video */,
-				A76068EE22E4AE65008DF18F /* Gif */,
 				A75B787522E079BC007B986A /* AnimationJSON */,
 				A75B783422DFFDFE007B986A /* json */,
 			);
@@ -2781,14 +2778,6 @@
 			path = AnimationJSON;
 			sourceTree = "<group>";
 		};
-		A76068EE22E4AE65008DF18F /* Gif */ = {
-			isa = PBXGroup;
-			children = (
-				A76068EF22E4AE91008DF18F /* loading.gif */,
-			);
-			path = Gif;
-			sourceTree = "<group>";
-		};
 		A76068F122E4B0ED008DF18F /* UImage+Gif */ = {
 			isa = PBXGroup;
 			children = (
@@ -5900,7 +5889,6 @@
 				BD108C9A22A60C3300837DAB /* HGImage.xcassets in Resources */,
 				A7F3069922E1C72D00DC7917 /* json_Image_1.png in Resources */,
 				A76068ED22E4A2B4008DF18F /* verywell.json in Resources */,
-				A76068F022E4AE91008DF18F /* loading.gif in Resources */,
 				A729B5AA2266F6FD004AE098 /* Launch Screen.storyboard in Resources */,
 				BD24FABB22B509CF00C7AA3B /* PublishModule.xcassets in Resources */,
 			);

RainbowPlanet/RainbowPlanet/Manager/MJRefreshManager/MJRefreshManager.swift

@@ -10,38 +10,43 @@ import Foundation
 
 class MJRefreshManager: NSObject {
 
+    //MARK: - collectionView
     class func hiddenHeaderWithFooter(tableView : UITableView?) {
-        DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(1)) {
-            tableView?.endHeaderRefresh()
-        }
+        tableView?.endHeaderRefresh()
         tableView?.endFooterRefresh()
-
+        tableView?.ly_endLoading()
     }
     
+    class func hiddenFooterNoMoreData(tableView : UITableView?) {
+        tableView?.endFooterNoMoreData()
+        tableView?.ly_endLoading()
+    }
+    
+    
     class func hiddenHeaderWithFooter(tableView : UITableView?,currentPage:Int?,totalPages:Int?) {
-        DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(1)) {
-            tableView?.endHeaderRefresh()
-        }
+        
+        tableView?.endHeaderRefresh()
         tableView?.endFooterRefresh()
+
         if totalPages == 1 && currentPage == 1 {
             tableView?.endFooterNoMoreData()
         }
         if  currentPage ?? 1  >= totalPages ?? 1 {
             tableView?.endFooterNoMoreData()
         }
+        
+        tableView?.ly_endLoading()
     }
     
+    
+    //MARK: - collectionView
     class func hiddenHeaderWithFooter(collectionView : UICollectionView?) {
-        DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(1)) {
-            collectionView?.endHeaderRefresh()
-        }
+        collectionView?.endHeaderRefresh()
         collectionView?.endFooterRefresh()
     }
     
     class func hiddenHeaderWithFooter(collectionView : UICollectionView?,currentPage:Int?,totalPages:Int?) {
-        DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(1)) {
-            collectionView?.endHeaderRefresh()
-        }
+        collectionView?.endHeaderRefresh()
         collectionView?.endFooterRefresh()
         if  currentPage ?? 1  >= totalPages ?? 1 {
             collectionView?.endFooterNoMoreData()

RainbowPlanet/RainbowPlanet/Manager/WebViewJavascriptBridgeManager/WebViewJavascriptBridgeManager.swift

@@ -56,6 +56,32 @@ class WebViewJavascriptBridgeManager: NSObject {
         if wvjbModel?.modelType  == .copy {
             commonCopy(string: wvjbModel!.params!.content!)
         }
+        
+        // 跳转原生
+        if wvjbModel?.modelType  == .follow {
+            let followStatusModel = FollowStatusModel()
+            followStatusModel.uid = wvjbModel!.params?.uid ?? 0
+            followStatusModel.isFollowStatus = wvjbModel!.params?.status ?? 0
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "followApi"), object: followStatusModel, userInfo: ["isPlanet":true])
+        }
+        
+        // 跳转预览图
+        if wvjbModel?.modelType  == .preview {
+            if !(wvjbModel!.params?.list?.isEmpty ?? true) {
+                Mediator.push(BrowsePictureRouterModuleType.pushBrowsePictureImageStrs(imageStrs: (wvjbModel!.params?.list)!, index: wvjbModel!.params?.current ?? 0))
+            }
+        }
+        
+        // 返回
+        if wvjbModel?.modelType  == .back {
+            viewController?.navigationController?.popViewController(animated: true)
+        }
+        
+        // 刷新U米
+        if wvjbModel?.modelType  == .bean {
+            UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApi()
+        }
+        
         // 跳转原生
         if wvjbModel?.modelType  == .view {
             // 发布
@@ -106,19 +132,6 @@ class WebViewJavascriptBridgeManager: NSObject {
             }
             
         }
-        // 跳转原生
-        if wvjbModel?.modelType  == .follow {
-            let followStatusModel = FollowStatusModel()
-            followStatusModel.uid = wvjbModel!.params?.uid ?? 0
-            followStatusModel.isFollowStatus = wvjbModel!.params?.status ?? 0
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "followApi"), object: followStatusModel, userInfo: ["isPlanet":true])
-        }
         
-        // 跳转预览图
-        if wvjbModel?.modelType  == .preview {
-            if !(wvjbModel!.params?.list?.isEmpty ?? true) {
-                Mediator.push(BrowsePictureRouterModuleType.pushBrowsePictureImageStrs(imageStrs: (wvjbModel!.params?.list)!, index: wvjbModel!.params?.current ?? 0))
-            }
-        }
     }
 }

RainbowPlanet/RainbowPlanet/Model/WVJBModel/WVJBModel.swift

@@ -24,6 +24,7 @@ enum WVJBModelType : String {
     case bean = "bean"
     case preview = "preview"
     case follow = "follow"
+    case back = "back"
 }
 /// WebViewJavascriptBridgeModel 简写 WVJBModel
 class WVJBModel:NSObject,Mappable{

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

@@ -49,13 +49,13 @@ class CommunityBannerFSPagerViewCell: FSPagerViewCell {
     private lazy var bgImageView: UIImageView = {
         let bgImageView = UIImageView()
         bgImageView.isUserInteractionEnabled = true
-        bgImageView.image = kImage(name: "pic_preload")
+        bgImageView.image = kImage(name: "default_pic")
         return bgImageView
     }()
     
     var communityRecommendTypeDataModel : CommunityRecommendTypeDataModel? {
         didSet {
-            bgImageView.kf.setImage(with: kURLImage(name: communityRecommendTypeDataModel?.image ?? ""), placeholder: kImage(name: "pic_preload"))
+            bgImageView.kf.setImage(with: kURLImage(name: communityRecommendTypeDataModel?.image ?? ""), placeholder: kImage(name: "default_pic"))
         }
     }
 }

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

@@ -52,7 +52,7 @@ class CardContentPicVideoCollectionViewCell: UICollectionViewCell {
     }
     
     private lazy var iconImageView: UIImageView = {
-        let iconImageView = UIImageView.init(image: kImage(name: "pic_preload"))
+        let iconImageView = UIImageView.init(image: kImage(name: "default_pic"))
         iconImageView.contentMode = .scaleAspectFill
         iconImageView.isUserInteractionEnabled = true
         return iconImageView
@@ -66,7 +66,7 @@ class CardContentPicVideoCollectionViewCell: UICollectionViewCell {
     
     var imgStr: String? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: imgStr ?? ""), placeholder: kImage(name: "pic_preload"))
+            iconImageView.kf.setImage(with: kURLImage(name: imgStr ?? ""), placeholder: kImage(name: "default_pic"))
         }
     }
     

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

@@ -85,7 +85,7 @@ class CardContentUserTableViewCell: UITableViewCell {
     
     private lazy var avatarButton: UIButton = {
         let avatarButton = UIButton(type: UIButton.ButtonType.custom)
-        avatarButton.setImage(kImage(name: "pic_preload"), for: UIControl.State.normal)
+        avatarButton.setImage(kImage(name: "default_pic"), for: UIControl.State.normal)
         avatarButton.imageView?.contentMode = .scaleAspectFill
         avatarButton.cornerRadius = 20
         avatarButton.masksToBounds = true

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

@@ -66,7 +66,7 @@ class FeaturedTopicsCollectionViewCell: UICollectionViewCell {
     
     private lazy var picImageView : UIImageView = {
         let picImageView = UIImageView()
-        picImageView.image = kImage(name: "pic_preload")
+        picImageView.image = kImage(name: "default_pic")
         picImageView.cornerRadius = 4
         picImageView.masksToBounds = true
         return picImageView
@@ -96,7 +96,7 @@ class FeaturedTopicsCollectionViewCell: UICollectionViewCell {
     
     var communityRecommendTypeDataModel : CommunityRecommendTypeDataModel? {
         didSet {
-            picImageView.kf.setImage(with: kURLImage(name: communityRecommendTypeDataModel?.img ?? ""), placeholder: kImage(name: "pic_preload"))
+            picImageView.kf.setImage(with: kURLImage(name: communityRecommendTypeDataModel?.img ?? ""), placeholder: kImage(name: "default_pic"))
             topicLabel.text = communityRecommendTypeDataModel?.name
             numberPeopleLable.text = "\(communityRecommendTypeDataModel?.followCount ?? "0")人参与"
         }

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

@@ -186,7 +186,7 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
     
     private lazy var avatarOtherButton: UIButton = {
         let avatarOtherButton = UIButton(type: UIButton.ButtonType.custom)
-        avatarOtherButton.setImage(kImage(name: "pic_preload"), for: UIControl.State.normal)
+        avatarOtherButton.setImage(kImage(name: "default_pic"), for: UIControl.State.normal)
         avatarOtherButton.imageView?.contentMode = .scaleAspectFill
         avatarOtherButton.cornerRadius = 20
         avatarOtherButton.masksToBounds = true

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

@@ -59,7 +59,7 @@ class PopularVideoCollectionViewCell: UICollectionViewCell {
     
     private lazy var picImageView : UIImageView = {
         let picImageView = UIImageView()
-        picImageView.image = kImage(name: "pic_preload")
+        picImageView.image = kImage(name: "default_pic")
         picImageView.cornerRadius = 4
         picImageView.masksToBounds = true
         return picImageView
@@ -83,7 +83,7 @@ class PopularVideoCollectionViewCell: UICollectionViewCell {
     
     var communityRecommendTypeDataModel : CommunityRecommendTypeDataModel? {
         didSet {
-            picImageView.kf.setImage(with: kURLImage(name: communityRecommendTypeDataModel?.img ?? ""), placeholder: kImage(name: "pic_preload"))
+            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"))
             nameLabel.text = communityRecommendTypeDataModel?.userName
         }

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

@@ -83,7 +83,7 @@ class CommunityRecommendFollowCollectionViewCell: UICollectionViewCell {
     
     private lazy var avatarButton: UIButton = {
         let avatarButton = UIButton(type: UIButton.ButtonType.custom)
-        avatarButton.setImage(kImage(name: "pic_preload"), for: UIControl.State.normal)
+        avatarButton.setImage(kImage(name: "default_pic"), for: UIControl.State.normal)
         avatarButton.imageView?.contentMode = .scaleAspectFill
         avatarButton.cornerRadius = 30
         avatarButton.masksToBounds = true

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: "pic_preload"))
+        picButton.kf.setBackgroundImage(with: kURLImage(name: configModel?.findFriendImg ?? ""), 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/View/CommunityPostDetailFSPagerViewCell.swift

@@ -48,14 +48,14 @@ class CommunityPostDetailFSPagerViewCell: FSPagerViewCell {
     private lazy var bgImageView: UIImageView = {
         let bgImageView = UIImageView()
         bgImageView.isUserInteractionEnabled = true
-        bgImageView.image = kImage(name: "pic_preload")
+        bgImageView.image = kImage(name: "default_pic")
         bgImageView.contentMode = .scaleAspectFill
         return bgImageView
     }()
     
     var img : String? {
         didSet {
-            bgImageView.kf.setImage(with: kURLImage(name: img ?? ""), placeholder: kImage(name: "pic_preload"))
+            bgImageView.kf.setImage(with: kURLImage(name: img ?? ""), placeholder: kImage(name: "default_pic"))
 
         }
     }

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: "pic_preload"))
+            self?.bgImageView.kf.setImage(with: kURLImage(name: (data as! String)), placeholder: kImage(name: "default_pic"))
             self?.shareCommunityContentView.imageUrl = (data as! String)
         }
     }

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

@@ -118,10 +118,10 @@ class CommunityShareContentViewController: BaseViewController {
     }
     
     override func setupData() {
-        bgImageView.kf.setImage(with: kURLImage(name: imgUrl ?? ""), placeholder: kImage(name: "pic_preload"))
+        bgImageView.kf.setImage(with: kURLImage(name: imgUrl ?? ""), placeholder: kImage(name: "default_pic"))
         topicLabel.text = "#\(topicStr)#"
         titleLabel.text = titleStr
-        avatarImageView.kf.setImage(with: kURLImage(name: avatarStr ?? ""), placeholder: kImage(name: "pic_preload"))
+        avatarImageView.kf.setImage(with: kURLImage(name: avatarStr ?? ""), placeholder: kImage(name: "default_pic"))
         nameLable.text = nameStr ?? ""
         
         if let tryImage = EFQRCode.generate(

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

@@ -117,7 +117,7 @@ class MessageListTableCell: UITableViewCell {
     
     lazy var contentImageView : UIImageView = {
         let contentImageView = UIImageView()
-        contentImageView.image = kImage(name: "pic_preload")
+        contentImageView.image = kImage(name: "default_pic")
         contentImageView.cornerRadius = 4
         contentImageView.masksToBounds = true
         contentImageView.contentMode = .scaleAspectFill
@@ -197,7 +197,7 @@ class MessageListTableCell: UITableViewCell {
                 
             }
             timeLabel.text = messageDataModel?.createdAt
-            contentImageView.kf.setImage(with: kURLImage(name: messageDataModel?.param?.cover ?? ""), placeholder: kImage(name: "pic_preload"))
+            contentImageView.kf.setImage(with: kURLImage(name: messageDataModel?.param?.cover ?? ""), placeholder: kImage(name: "default_pic"))
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageList/ViewController/MessageListController.swift

@@ -50,12 +50,13 @@ class MessageListController: BaseViewController {
         }
         view.backgroundColor = kf7f8faColor
         view.addSubview(tableView)
-        DIYEmptyView.emptyTableView(tableView: tableView)
+        view.insertSubview(navigationBar, aboveSubview: (tableView))
+
         
     }
     
     override func setupData() {
-        tableView.addHeader(withBeginRefresh: true, animation: false) {
+        tableView.addHeader(withBeginRefresh: true, animation: true) {
             [weak self] (page) in
             self?.userMemberMessageList(page: page)
         }
@@ -81,23 +82,46 @@ extension MessageListController {
     ///
     /// - Parameter page: 分页
     func userMemberMessageList(page:Int) {
-        SwiftMoyaNetWorkServiceUser.shared().userMemberMessageListApi(messageShowTypes: self.messageShowTypes, page: page) {
+        SwiftMoyaNetWorkServiceUser.shared().userMemberMessageListApi(messageShowTypes: self.messageShowTypes, page: page, completion: {
             [weak self] (messageListModel) -> (Void) in
+            
+            switch self?.messageVCType {
+            case .comment?,.praise?:
+                DIYEmptyView.emptyNoDataTableView(tableView: self?.tableView,imageStr: .nine,detailStr: .nine)
+                break
+            case .follow?:
+                DIYEmptyView.emptyNoDataActionTableView(tableView: self?.tableView, imageStr: .seven, detailStr: .seven, btnTitleStr: .four, btnClickBlock: {
+                    let pickVc = PublishViewController()
+                    let nav = BaseNavigationViewController.init(rootViewController: pickVc)
+                    self?.tabBarController?.present(nav, animated: true, completion: {
+                        self?.navigationController?.popToRootViewController(animated: false)
+                    })
+                })
+                break
+            default:
+                break
+            }
+            
             let messageListModel = messageListModel as? MessageListModel
             if messageListModel?.pagination?.currentPage ?? 1  <= messageListModel?.pagination?.totalPages ?? 1 {
                 if messageListModel?.pagination?.currentPage == 1{
                     self?.messageDataModels.removeAll()
                     self?.tableView.resetNoMoreData()
-
                 }
                 self?.messageDataModels = (self?.messageDataModels)! + (messageListModel?.data!)!
                 self?.tableView.reloadData()
-                if  self?.messageDataModels.count ?? 0 >= messageListModel?.pagination?.total ?? 0 {
-                    self?.tableView.endFooterNoMoreData()
-                }
+                MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView, currentPage: messageListModel?.pagination?.currentPage, totalPages: messageListModel?.pagination?.totalPages)
+                
             }else {
-                self?.tableView.endFooterNoMoreData()
+                MJRefreshManager.hiddenFooterNoMoreData(tableView: self?.tableView)
             }
+        }) {
+            [weak self] (loadingStatus) in
+            DIYEmptyView.emptyNoDataActionTableView(tableView: self?.tableView, btnClickBlock: {
+                [weak self] in
+                self?.tableView.mj_header.beginRefreshing()
+            })
+            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/View/MessageHomeTwoCollectionViewCell.swift

@@ -11,7 +11,7 @@ import UIKit
 class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
     
     var images = ["news_notice","news_activity"]
-    var titles = ["星球通知","星球活动"]
+    var titles = ["由你通知","由你活动"]
     
     class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> MessageHomeTwoCollectionViewCell {
         let ID = "MessageHomeTwoCollectionViewCell"

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/ViewController/MessageMainViewController.swift

@@ -43,7 +43,7 @@ class MessageMainViewController: BaseViewController {
             self?.collectionView.reloadData()
             self?.setTabBarItemBadge()
         }
-        collectionView.addHeader(withBeginRefresh: true, animation: false) {
+        collectionView.addHeader(withBeginRefresh: true, animation: true) {
             [weak self] (page) in
             self?.userMemberMessageIndexApi()
         }

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetActivity/Controller/MessagePlanetActivityController.swift

@@ -26,10 +26,10 @@ class MessagePlanetActivityController: BaseViewController {
     }
     
     override func setupViews() {
-        navigationBar.title = "星球活动"
+        navigationBar.title = "由你活动"
         view.backgroundColor = kf7f8faColor
         view.addSubview(tableView)
-        DIYEmptyView.emptyTableView(tableView: tableView)
+        view.insertSubview(navigationBar, aboveSubview: tableView)
 
     }
     
@@ -41,7 +41,7 @@ class MessagePlanetActivityController: BaseViewController {
     }
     
     override func setupData() {
-        tableView.addHeader(withBeginRefresh: true, animation: false) {
+        tableView.addHeader(withBeginRefresh: true, animation: true) {
             [weak self] (page) in
             self?.userMemberMessageList(page: page)
         }
@@ -70,25 +70,25 @@ extension MessagePlanetActivityController {
     ///
     /// - Parameter page: 分页
     func userMemberMessageList(page:Int) {
-        SwiftMoyaNetWorkServiceUser.shared().userMemberMessageListApi(messageShowTypes: self.messageShowTypes, page: page) {
+        SwiftMoyaNetWorkServiceUser.shared().userMemberMessageListApi(messageShowTypes: self.messageShowTypes, page: page, completion: {
             [weak self] (messageListModel) -> (Void) in
-            
-            
+            DIYEmptyView.emptyNoDataTableView(tableView: (self?.tableView)!)
             let messageListModel = messageListModel as? MessageListModel
             if messageListModel?.pagination?.currentPage ?? 1  <= messageListModel?.pagination?.totalPages ?? 1 {
                 if messageListModel?.pagination?.currentPage == 1{
                     self?.messageDataModels.removeAll()
                     self?.tableView.resetNoMoreData()
-
                 }
                 self?.messageDataModels = (self?.messageDataModels)! + (messageListModel?.data!)!
-                if  messageListModel?.pagination?.currentPage ?? 1 >= messageListModel?.pagination?.totalPages ?? 1 {
-                    self?.tableView.endFooterNoMoreData()
-                }
                 self?.tableView.reloadData()
+                MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView, currentPage: messageListModel?.pagination?.currentPage, totalPages: messageListModel?.pagination?.totalPages)
+                
             }else {
-                self?.tableView.endFooterNoMoreData()
+                MJRefreshManager.hiddenFooterNoMoreData(tableView: self?.tableView)
             }
+        }) {
+            [weak self] (loadingStatus) in
+            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
         }
     }
 }

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

@@ -99,7 +99,7 @@ class MessageActivityTableCell: UITableViewCell {
     
     lazy var actImageView : UIImageView = {
         let actImageView = UIImageView()
-        actImageView.image = kImage(name: "pic_preload")
+        actImageView.image = kImage(name: "default_pic")
         actImageView.isUserInteractionEnabled = true
         actImageView.contentMode = .scaleAspectFill
         return actImageView
@@ -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: "pic_preload"))
+            actImageView.kf.setImage(with: kURLImage(name: messageDataModel?.param?.cover ?? ""), 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/MessageModule/MessagePlanetNotification/Controller/MessagePlanetNotiController.swift

@@ -21,10 +21,10 @@ class MessagePlanetNotiController: BaseViewController {
     }
     
     override func setupViews() {
-        navigationBar.title = "星球通知"
+        navigationBar.title = "由你通知"
         view.backgroundColor = kf7f8faColor
         view.addSubview(tableView)
-        DIYEmptyView.emptyTableView(tableView: tableView)
+        view.insertSubview(navigationBar, aboveSubview: tableView)
 
     }
     
@@ -36,7 +36,7 @@ class MessagePlanetNotiController: BaseViewController {
     }
     
     override func setupData() {
-        tableView.addHeader(withBeginRefresh: true, animation: false) {
+        tableView.addHeader(withBeginRefresh: true, animation: true) {
             [weak self] (page) in
             self?.userMemberMessageList(page: page)
         }
@@ -62,24 +62,31 @@ extension MessagePlanetNotiController {
     ///
     /// - Parameter page: 分页
     func userMemberMessageList(page:Int) {
-        SwiftMoyaNetWorkServiceUser.shared().userMemberMessageListApi(messageShowTypes: self.messageShowTypes, page: page) {
+        SwiftMoyaNetWorkServiceUser.shared().userMemberMessageListApi(messageShowTypes: self.messageShowTypes, page: page, completion: {
             [weak self] (messageListModel) -> (Void) in
+            
+            DIYEmptyView.emptyNoDataTableView(tableView: self?.tableView,imageStr: .ten,detailStr: .ten)
+            
             let messageListModel = messageListModel as? MessageListModel
             if messageListModel?.pagination?.currentPage ?? 1  <= messageListModel?.pagination?.totalPages ?? 1 {
                 if messageListModel?.pagination?.currentPage == 1{
                     self?.messageDataModels.removeAll()
                     self?.tableView.resetNoMoreData()
-
                 }
                 self?.messageDataModels = (self?.messageDataModels)! + (messageListModel?.data!)!
-                if  messageListModel?.pagination?.currentPage ?? 1 >= messageListModel?.pagination?.totalPages ?? 1 {
-                    self?.tableView.endFooterNoMoreData()
-                }
                 self?.tableView.reloadData()
+                MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView, currentPage: messageListModel?.pagination?.currentPage, totalPages: messageListModel?.pagination?.totalPages)
                 
             }else {
-                self?.tableView.endFooterNoMoreData()
+                MJRefreshManager.hiddenFooterNoMoreData(tableView: self?.tableView)
             }
+        }) {
+            [weak self] (loadingStatus) in
+            DIYEmptyView.emptyNoDataActionTableView(tableView: self?.tableView, btnClickBlock: {
+                [weak self] in
+                self?.tableView.mj_header.beginRefreshing()
+            })
+            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
         }
     }
 }

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

@@ -46,7 +46,7 @@ class OtherPersonalCenterViewController: BaseViewController {
         navigationBar.backgroundImageView.contentMode = .scaleAspectFill
         navigationBar.layer.masksToBounds = true
         // 设置导航栏显示图片
-        navigationBar.barBackgroundImage = UIImage(named: "pic_preload")
+        navigationBar.barBackgroundImage = UIImage(named: "default_pic")
         // 设置初始导航栏透明度
         navigationBar.wr_setBackgroundAlpha(alpha: 0)
         // 设置状态栏style
@@ -180,7 +180,7 @@ 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 ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            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?.nameButton.setTitle(self?.userDetailModel?.username, for: UIControl.State.normal)
             self?.cmsTemplateTitles = ["发布 \(self?.userDetailModel?.postCount ?? "0")","收藏 \(self?.userDetailModel?.collectCount ?? "0")","分享 \(self?.userDetailModel?.shareCount ?? "0")"]

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

@@ -86,7 +86,7 @@ class PersonViewUserAndOtherHeaderView: BaseView {
     
     private lazy var bgImageView: UIImageView = {
         let bgImageView = UIImageView(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: 140 + kNavBarTotalHeight))
-        bgImageView.image = kImage(name: "pic_preload")
+        bgImageView.image = kImage(name: "default_pic")
         bgImageView.contentMode = .scaleAspectFill
         bgImageView.layer.masksToBounds = true
         return bgImageView
@@ -229,7 +229,7 @@ class PersonViewUserAndOtherHeaderView: BaseView {
     var userDetailModel: UserDetailModel? {
         didSet {
             followType = FollowType(rawValue: userDetailModel?.isFollowStatus ?? 0)
-            bgImageView.kf.setImage(with: kURLImage(name: userDetailModel?.backgroundImg ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            bgImageView.kf.setImage(with: kURLImage(name: userDetailModel?.backgroundImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = userDetailModel?.username
             if userDetailModel?.signature == "" || userDetailModel?.signature == nil  {
                 if userDetailModel?.uid == UserModel.shared().getModel()?.uid {

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

@@ -66,7 +66,7 @@ class PersonViewUserAndOtherListCollectionViewCell: UICollectionViewCell {
     
     private lazy var iconImageView: UIImageView = {
         let iconImageView = UIImageView()
-        iconImageView.image = kImage(name: "pic_preload")
+        iconImageView.image = kImage(name: "default_pic")
         iconImageView.contentMode = .scaleAspectFill
         return iconImageView
     }()
@@ -108,7 +108,7 @@ class PersonViewUserAndOtherListCollectionViewCell: UICollectionViewCell {
     
     var postMyModel: PostMyModel? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: postMyModel?.img ?? ""), placeholder: kImage(name: "pic_preload"))
+            iconImageView.kf.setImage(with: kURLImage(name: postMyModel?.img ?? ""), 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

@@ -60,7 +60,7 @@ class UserPersonalCenterViewController: BaseViewController {
         }
         navigationBar.wr_setRightButton(image: kImage(name: "center_share")!)
         // 设置导航栏显示图片
-        navigationBar.barBackgroundImage = UIImage(named: "pic_preload")
+        navigationBar.barBackgroundImage = UIImage(named: "default_pic")
         // 设置初始导航栏透明度
         navigationBar.wr_setBackgroundAlpha(alpha: 0)
         // 设置状态栏style
@@ -139,8 +139,10 @@ class UserPersonalCenterViewController: BaseViewController {
             self?.reloadData()
         }
         
-        
-  
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("userMemberGetTotalBean"), object: nil, queue: OperationQueue.main, using: {
+            [weak self] (notification) in
+            self?.userMemberDetailApi()
+        })
     }
     
     // 设置Badge
@@ -294,7 +296,7 @@ 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 ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            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?.nameButton.setTitle(self?.userDetailModel?.username, for: UIControl.State.normal)
             self?.cmsTemplateTitles = ["发布 \(self?.userDetailModel?.postCount ?? "0")","收藏 \(self?.userDetailModel?.collectCount ?? "0")","分享 \(self?.userDetailModel?.shareCount ?? "0")"]

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

@@ -87,7 +87,7 @@ class OrderProductTableViewCell: UITableViewCell {
     
     private lazy var productImageView: UIImageView = {
         let productImageView = UIImageView()
-        productImageView.image = kImage(name: "pic_preload")
+        productImageView.image = kImage(name: "default_pic")
         productImageView.contentMode = .scaleAspectFill
         productImageView.masksToBounds = true
         return productImageView
@@ -136,7 +136,7 @@ class OrderProductTableViewCell: UITableViewCell {
     
     var orderModelDetailModel: OrderModelDetailModel? {
         didSet {
-            productImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            productImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = orderModelDetailModel?.productName
             timeLabel.text = "预计配送时间：\(orderModelDetailModel?.receiveTime ?? "")"
             skuLabel.text = "规格：\(orderModelDetailModel?.skuName ?? "")"

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

@@ -116,7 +116,7 @@ class OrderApplyRefundProductCell: UITableViewCell {
     
     private lazy var productImageView: UIImageView = {
         let productImageView = UIImageView()
-        productImageView.image = kImage(name: "pic_preload")
+        productImageView.image = kImage(name: "default_pic")
         productImageView.contentMode = .scaleAspectFill
         productImageView.masksToBounds = true
         return productImageView
@@ -170,7 +170,7 @@ class OrderApplyRefundProductCell: UITableViewCell {
             let selStatus = orderModelDetailModel?.isSelect == 1 ? true : false
             selectBtn.isSelected = selStatus
             
-            productImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            productImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = orderModelDetailModel?.productName
             timeLabel.text = "预计配送时间：\(orderModelDetailModel?.receiveTime ?? "")"
             skuLabel.text = "规格：\(orderModelDetailModel?.skuName ?? "")"

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

@@ -23,7 +23,7 @@ class OrderCommentAddImgCollectionCell: UICollectionViewCell {
     
     var productSearchModel: ProductSearchModel? {
         didSet {
-            picImageView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))            
+            picImageView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))            
         }
     }
     

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

@@ -38,7 +38,7 @@ class OrderCommentTableViewCell: UITableViewCell {
     var orderModelDetailModel: OrderModelDetailModel? {
         didSet {
             // 商品图片
-            iconImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            iconImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             starView.value = CGFloat(self.orderModelDetailModel?.starValue ?? 5)
         }
     }

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

@@ -90,7 +90,7 @@ class OrderDetailProductTableViewCell: UITableViewCell {
         let productImageView = UIImageView()
         productImageView.contentMode = .scaleAspectFill
         productImageView.masksToBounds = true
-        productImageView.image = kImage(name: "pic_preload")
+        productImageView.image = kImage(name: "default_pic")
         return productImageView
     }()
     
@@ -137,7 +137,7 @@ class OrderDetailProductTableViewCell: UITableViewCell {
     
     var orderModelDetailModel: OrderModelDetailModel? {
         didSet {
-            productImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            productImageView.kf.setImage(with: kURLImage(name: orderModelDetailModel?.productImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = orderModelDetailModel?.productName
             timeLabel.text = "预计配送时间：\(orderModelDetailModel?.receiveTime ?? "")"
             skuLabel.text = "规格：\(orderModelDetailModel?.skuName ?? "")"

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

@@ -13,7 +13,7 @@ class ShoppingCartPayOrderItemCell: UITableViewCell {
     var productMdl : ProductModel? {
         didSet {
             // 商品图片
-            iconImageView.kf.setImage(with: kURLImage(name: productMdl?.productImg ?? ""), placeholder: kImage(name: "pic_preload"))
+            iconImageView.kf.setImage(with: kURLImage(name: productMdl?.productImg ?? ""), placeholder: kImage(name: "default_pic"))
             // 商品名称
             titleLabel.text = productMdl?.productName
             // 预计配送时间

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: "pic_preload"))
+            picImageView.kf.setImage(with: kURLImage(name: self.topicModel?.img ?? ""), placeholder: kImage(name: "default_pic"))
         }
     }
     

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

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

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishManager/PublishUploadProgressView.swift

@@ -99,7 +99,7 @@ class PublishUploadProgressView: FWPopupView {
     
     lazy var imageView: UIImageView = {
         let imageView = UIImageView()
-        imageView.image = kImage(name: "pic_preload")
+        imageView.image = kImage(name: "default_pic")
         imageView.contentMode =  .scaleAspectFill
         imageView.clipsToBounds = true
         return imageView

RainbowPlanet/RainbowPlanet/Modules/PublishModule/Unused/PublishSuccess/PublishSuccessController.swift

@@ -125,10 +125,10 @@ class PublishSuccessController: BaseViewController {
     }
     
     override func setupData() {
-        bgImageView.kf.setImage(with: kURLImage(name: imgUrl ?? ""), placeholder: kImage(name: "pic_preload"))
+        bgImageView.kf.setImage(with: kURLImage(name: imgUrl ?? ""), placeholder: kImage(name: "default_pic"))
         topicLabel.text = "#\(topicStr)#"
         titleLabel.text = titleStr
-        avatarImageView.kf.setImage(with: kURLImage(name: avatarStr ?? ""), placeholder: kImage(name: "pic_preload"))
+        avatarImageView.kf.setImage(with: kURLImage(name: avatarStr ?? ""), placeholder: kImage(name: "default_pic"))
         nameLable.text = nameStr ?? ""
         
         if let tryImage = EFQRCode.generate(

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

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

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

@@ -86,7 +86,7 @@ class RedemptionAreaProductCollectionViewCell: UICollectionViewCell {
     
     lazy var iconImageView: UIImageView = {
         let iconImageView = UIImageView()
-        iconImageView.image = kImage(name: "pic_preload")
+        iconImageView.image = kImage(name: "default_pic")
         return iconImageView
     }()
     
@@ -128,7 +128,7 @@ class RedemptionAreaProductCollectionViewCell: UICollectionViewCell {
     
     var cmsRedemptionAreaRule : CMSRedemptionAreaRule? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: cmsRedemptionAreaRule?.img ?? ""), placeholder: kImage(name: "pic_preload"))
+            iconImageView.kf.setImage(with: kURLImage(name: cmsRedemptionAreaRule?.img ?? ""), placeholder: kImage(name: "default_pic"))
             titleLabel.text = cmsRedemptionAreaRule?.saleName
             detatileTitleLabel.text = cmsRedemptionAreaRule?.subtitle
             beanLabel.text = "\(cmsRedemptionAreaRule?.price ?? 0)"

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

@@ -28,7 +28,7 @@ class FloorHeaderViewFloorHeaderView: BaseView {
     
     lazy var imageView: UIImageView = {
         let imageView = UIImageView()
-        imageView.image = kImage(name: "pic_preload")
+        imageView.image = kImage(name: "default_pic")
         imageView.contentMode =  .scaleAspectFill
         imageView.clipsToBounds = true
         imageView.isUserInteractionEnabled = true
@@ -37,7 +37,7 @@ class FloorHeaderViewFloorHeaderView: BaseView {
     
     var cmsRedemptionAreaContent : CMSRedemptionAreaContent? {
         didSet {
-            imageView.kf.setImage(with: kURLImage(name: cmsRedemptionAreaContent?.floorImg ?? ""), placeholder: kImage(name: "pic_preload"))
+            imageView.kf.setImage(with: kURLImage(name: cmsRedemptionAreaContent?.floorImg ?? ""), placeholder: kImage(name: "default_pic"))
         }
     }
     

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

@@ -49,14 +49,14 @@ class SpecialOneTypeCollectionViewCell: UICollectionViewCell {
     
     lazy var iconImageView : UIImageView = {
         let iconImageView = UIImageView()
-        iconImageView.image = kImage(name: "pic_preload")
+        iconImageView.image = kImage(name: "default_pic")
         iconImageView.isUserInteractionEnabled = true
         return iconImageView
     }()
     
     var cmsRedemptionAreaRule : CMSRedemptionAreaRule? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: cmsRedemptionAreaRule?.url ?? ""), placeholder: kImage(name: "pic_preload"))
+            iconImageView.kf.setImage(with: kURLImage(name: cmsRedemptionAreaRule?.url ?? ""), placeholder: kImage(name: "default_pic"))
         }
     }
 }

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

@@ -47,14 +47,14 @@ class SpecialTwoTypeCollectionViewCell: UICollectionViewCell {
     
     lazy var iconImageView : UIImageView = {
         let iconImageView = UIImageView()
-        iconImageView.image = kImage(name: "pic_preload")
+        iconImageView.image = kImage(name: "default_pic")
         iconImageView.isUserInteractionEnabled = true
         return iconImageView
     }()
     
     var cmsRedemptionAreaRule : CMSRedemptionAreaRule? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: cmsRedemptionAreaRule?.url ?? ""), placeholder: kImage(name: "pic_preload"))
+            iconImageView.kf.setImage(with: kURLImage(name: cmsRedemptionAreaRule?.url ?? ""), placeholder: kImage(name: "default_pic"))
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/ViewController/RedemptionAreaViewController.swift

@@ -65,6 +65,11 @@ class RedemptionAreaViewController: BaseViewController {
             }
         })
         
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("userMemberGetTotalBean"), object: nil, queue: OperationQueue.main, using: {
+            [weak self] (notification) in
+            self?.cmsTemplateExchangeApi()
+        })
+        
     }
     
 }

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

@@ -60,7 +60,7 @@ class TopicSelectionCollectionViewCell: UICollectionViewCell {
         let bgLayer1 = CAGradientLayer()
         bgLayer1.frame = iconImageView.bounds
         bgLayer1.rainbowLayer(gradientColors: [UIColor(hexString: "000000", alpha: 0).cgColor,UIColor(hexString: "000000", alpha: 0.4).cgColor], gradientLocations: [0,1], gradientDisplayType: .vertical, startPoint: CGPoint(x: 0.5, y: 0), endPoint: CGPoint(x: 1, y: 1))
-        iconImageView.image = kImage(name: "pic_preload")
+        iconImageView.image = kImage(name: "default_pic")
         iconImageView.layer.addSublayer(bgLayer1)
         iconImageView.contentMode = .scaleAspectFill
         iconImageView.isUserInteractionEnabled = true
@@ -86,7 +86,7 @@ class TopicSelectionCollectionViewCell: UICollectionViewCell {
     
     var communityTopicModel: CommunityTopicModel? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: communityTopicModel?.img ?? ""), placeholder: kImage(name: "pic_preload"))
+            iconImageView.kf.setImage(with: kURLImage(name: communityTopicModel?.img ?? ""), placeholder: kImage(name: "default_pic"))
             titleLabel.text = communityTopicModel?.name
             selectionButton.isSelected = communityTopicModel?.isSelected ?? false
         }

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

@@ -105,7 +105,7 @@ class SearchContentListCollectionCell: UICollectionViewCell {
     
     private lazy var contentImageView: UIImageView = {
         let contentImageView = UIImageView()
-        contentImageView.image = kImage(name: "pic_preload")
+        contentImageView.image = kImage(name: "default_pic")
         contentImageView.contentMode = .scaleAspectFill
         contentImageView.clipsToBounds = true
         return contentImageView
@@ -203,7 +203,7 @@ class SearchContentListCollectionCell: UICollectionViewCell {
     
     var communityPostDataModel : CommunityPostDataModel? {
         didSet {
-            contentImageView.kf.setImage(with: kURLImage(name: communityPostDataModel?.img ?? ""), placeholder: kImage(name: "pic_preload"))
+            contentImageView.kf.setImage(with: kURLImage(name: communityPostDataModel?.img ?? ""), placeholder: kImage(name: "default_pic"))
             titleLabel.text = communityPostDataModel?.title
             if communityPostDataModel?.title == "" || communityPostDataModel?.title == nil {
                 titleLabel.text = communityPostDataModel?.content?.replacingOccurrences(of: "\n", with: "").replacingOccurrences(of: "\r", with: "")

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

@@ -76,7 +76,7 @@ class SearchTopicListTableViewCell: UITableViewCell {
     
     lazy var iconButton: UIButton = {
         let iconButton = UIButton(type: UIButton.ButtonType.custom)
-        iconButton.setImage(kImage(name: "pic_preload"), for: UIControl.State.normal)
+        iconButton.setImage(kImage(name: "default_pic"), for: UIControl.State.normal)
         iconButton.cornerRadius = 4
         iconButton.masksToBounds = true
         iconButton.isUserInteractionEnabled = false
@@ -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: "pic_preload"))
+            iconButton.kf.setImage(with: kURLImage(name: communityTopicDataModel?.img ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_pic"))
             titleLabel.text = communityTopicDataModel?.name
             subtitleLabel.text = "\(communityTopicDataModel?.followCount ?? "0")人参与"
         }

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

@@ -12,7 +12,7 @@ class ProductDetailEvaluationImageCollectionViewCell: UICollectionViewCell {
     
     var imageUrl: String? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: imageUrl ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            iconImageView.kf.setImage(with: kURLImage(name: imageUrl ?? "default_pic"), placeholder: kImage(name: "default_pic"))
         }
     }
     
@@ -55,7 +55,7 @@ class ProductDetailEvaluationImageCollectionViewCell: UICollectionViewCell {
     
     private lazy var iconImageView: UIImageView = {
         let iconImageView = UIImageView()
-        iconImageView.image = kImage(name: "pic_preload")
+        iconImageView.image = kImage(name: "default_pic")
         return iconImageView
     }()
 }

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

@@ -92,7 +92,7 @@ class ProductDetailEvaluationListTableViewCell: UITableViewCell {
     
     private lazy var avatarImagView: UIImageView = {
         let avatarImagView = UIImageView()
-        avatarImagView.image = kImage(name: "pic_preload")
+        avatarImagView.image = kImage(name: "default_pic")
         avatarImagView.cornerRadius = 14
         avatarImagView.masksToBounds = true
         return avatarImagView
@@ -159,7 +159,7 @@ class ProductDetailEvaluationListTableViewCell: UITableViewCell {
     
     var productCommentModel: ProductCommentModel? {
         didSet {
-            avatarImagView.kf.setImage(with: kURLImage(name: productCommentModel?.avatar ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            avatarImagView.kf.setImage(with: kURLImage(name: productCommentModel?.avatar ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             nameLabel.text = productCommentModel?.username
             timeLabel.text = productCommentModel?.createdAt
             let attributeString = NSMutableAttributedString(string:productCommentModel?.content ?? "")

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

@@ -69,7 +69,7 @@ class ProductDetailEvaluationTableViewCell: UITableViewCell {
     
     lazy var avatarImageView: UIImageView = {
         let avatarImageView = UIImageView()
-        avatarImageView.image = kImage(name: "pic_preload")
+        avatarImageView.image = kImage(name: "default_pic")
         avatarImageView.cornerRadius = 12
         avatarImageView.masksToBounds = true
         return avatarImageView
@@ -110,7 +110,7 @@ class ProductDetailEvaluationTableViewCell: UITableViewCell {
     
     var productCommentModel : ProductCommentModel? {
         didSet {
-            avatarImageView.kf.setImage(with: kURLImage(name: productCommentModel?.avatar ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            avatarImageView.kf.setImage(with: kURLImage(name: productCommentModel?.avatar ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             nickNameLabel.text = productCommentModel?.username
             let attributeString = NSMutableAttributedString(string:productCommentModel?.content ?? "")
             attributeString.changeAllLineSpacing(2)

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

@@ -52,7 +52,7 @@ class ProductDetailProductLabelIconCollectionViewCell: UICollectionViewCell {
     }
     lazy var iconImageView : UIImageView = {
         let iconImageView = UIImageView()
-        iconImageView.image = kImage(name: "pic_preload")
+        iconImageView.image = kImage(name: "default_pic")
         return iconImageView
     }()
     
@@ -65,7 +65,7 @@ class ProductDetailProductLabelIconCollectionViewCell: UICollectionViewCell {
     
     var label : ProductDetailLabelModel? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: label?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            iconImageView.kf.setImage(with: kURLImage(name: label?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = label?.name
         }
     }

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

@@ -70,7 +70,7 @@ class ProductDetailShopTableViewCell: UITableViewCell {
     
     private lazy var shopImageView: UIImageView = {
         let shopImageView = UIImageView()
-        shopImageView.image = kImage(name: "pic_preload")
+        shopImageView.image = kImage(name: "default_pic")
         shopImageView.cornerRadius = 60/2
         shopImageView.masksToBounds = true
         shopImageView.layer.borderColor = kf9f9f9Color.cgColor
@@ -105,7 +105,7 @@ class ProductDetailShopTableViewCell: UITableViewCell {
     
     var productDetailModel : ProductDetailModel? {
         didSet {
-            shopImageView.kf.setImage(with: kURLImage(name: productDetailModel?.logoImg ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            shopImageView.kf.setImage(with: kURLImage(name: productDetailModel?.logoImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             shopNameLabel.text = productDetailModel?.shopName
             
         }

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

@@ -55,7 +55,7 @@ class ProductDetailFSPagerViewCell: FSPagerViewCell {
     
     var imageNames: Array<String>?{
         didSet {
-            productImageView.kf.setImage(with: kURLImage(name: imageNames?[index ?? 0] ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            productImageView.kf.setImage(with: kURLImage(name: imageNames?[index ?? 0] ?? "default_pic"), placeholder: kImage(name: "default_pic"))
         }
     }
 }

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

@@ -175,7 +175,7 @@ class ProductDetailSkuView: FWPopupView {
     
     private lazy var productImageView: UIImageView = {
         let productImageView = UIImageView()
-        productImageView.image = kImage(name: "pic_preload")
+        productImageView.image = kImage(name: "default_pic")
         productImageView.contentMode = .scaleAspectFill
         productImageView.masksToBounds = true
         return productImageView
@@ -352,8 +352,8 @@ class ProductDetailSkuView: FWPopupView {
     
     var productDetailModel : ProductDetailModel? {
         didSet {
-            productImageView.kf.setImage(with: kURLImage(name: productDetailModel?.img ?? "pic_preload")
-                , placeholder: kImage(name: "pic_preload"))
+            productImageView.kf.setImage(with: kURLImage(name: productDetailModel?.img ?? "default_pic")
+                , placeholder: kImage(name: "default_pic"))
             if productDetailModel?.limitNumber ?? 0 <= 0 {
                 limitLabel.isHidden = true
             }else {

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

@@ -92,7 +92,7 @@ class ProductDetailHotSellCollectionViewCell: UICollectionViewCell {
         let iconImagView = UIImageView()
         iconImagView.contentMode = .scaleAspectFill
         iconImagView.masksToBounds = true
-        iconImagView.image = kImage(name: "pic_preload")
+        iconImagView.image = kImage(name: "default_pic")
         return iconImagView
     }()
     
@@ -149,7 +149,7 @@ class ProductDetailHotSellCollectionViewCell: UICollectionViewCell {
     
     var productSearchModel : ProductSearchModel? {
         didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = productSearchModel?.saleName
             detailTitleLabel.text = productSearchModel?.subtitle
             sellPriceLabel.text = priceConversion(price: productSearchModel?.price ?? 0)

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

@@ -104,7 +104,7 @@ class ProductMallBarChartCollectionViewCell: UICollectionViewCell {
         iconImagView.contentMode = .scaleAspectFill
         iconImagView.masksToBounds = true
 
-        iconImagView.image = kImage(name: "pic_preload")
+        iconImagView.image = kImage(name: "default_pic")
         return iconImagView
     }()
     
@@ -173,7 +173,7 @@ class ProductMallBarChartCollectionViewCell: UICollectionViewCell {
     
     var productModel : ProductModel? {
         didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productModel?.bigImg ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            iconImagView.kf.setImage(with: kURLImage(name: productModel?.bigImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = productModel?.saleName
             detailTitleLabel.text = productModel?.subtitle
             sellNumberLabel.text = "已售\(productModel?.totalCount ?? 0)件"

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

@@ -87,7 +87,7 @@ class ProductRightSideleftPictureCollectionViewCell: UICollectionViewCell {
         let iconImagView = UIImageView()
         iconImagView.contentMode = .scaleAspectFill
         iconImagView.masksToBounds = true
-        iconImagView.image = kImage(name: "pic_preload")
+        iconImagView.image = kImage(name: "default_pic")
         return iconImagView
     }()
     
@@ -152,7 +152,7 @@ class ProductRightSideleftPictureCollectionViewCell: UICollectionViewCell {
     
     var productModel : ProductModel? {
         didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            iconImagView.kf.setImage(with: kURLImage(name: productModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = productModel?.saleName
             detailTitleLabel.text = productModel?.subtitle
             sellNumberLabel.text = "已售\(productModel?.totalCount ?? 0)件"

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

@@ -86,7 +86,7 @@ class ProductSlidingLeftRightCollectionViewCell: UICollectionViewCell {
         let iconImagView = UIImageView()
         iconImagView.contentMode = .scaleAspectFill
         iconImagView.masksToBounds = true
-        iconImagView.image = kImage(name: "pic_preload")
+        iconImagView.image = kImage(name: "default_pic")
         return iconImagView
     }()
     
@@ -143,7 +143,7 @@ class ProductSlidingLeftRightCollectionViewCell: UICollectionViewCell {
     
     var productModel : ProductModel? {
         didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            iconImagView.kf.setImage(with: kURLImage(name: productModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = productModel?.saleName
             detailTitleLabel.text = productModel?.subtitle
             sellPriceLabel.text = priceConversion(price: productModel?.price ?? 0)
@@ -157,7 +157,7 @@ class ProductSlidingLeftRightCollectionViewCell: UICollectionViewCell {
     
     var productSearchModel : ProductSearchModel? {
         didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = productSearchModel?.saleName
             detailTitleLabel.text = productSearchModel?.subtitle
             sellPriceLabel.text = priceConversion(price: productSearchModel?.price ?? 0)

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

@@ -92,7 +92,7 @@ class ProductSlidingTopBottomCollectionViewCell: UICollectionViewCell {
         let iconImagView = UIImageView()
         iconImagView.contentMode = .scaleAspectFill
         iconImagView.masksToBounds = true
-        iconImagView.image = kImage(name: "pic_preload")
+        iconImagView.image = kImage(name: "default_pic")
         return iconImagView
     }()
     
@@ -142,7 +142,7 @@ class ProductSlidingTopBottomCollectionViewCell: UICollectionViewCell {
     
     var productSearchModel: ProductSearchModel? {
         didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = productSearchModel?.saleName
             sellNumberLabel.text = "已售\(productSearchModel?.totalCount ?? 0)件"
             sellPriceLabel.text = priceConversion(price: productSearchModel?.price ?? 0)

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/ProductCollectionReusableView/ProductFloorBannerView.swift

@@ -23,7 +23,7 @@ class ProductFloorBannerView: BaseView {
     
     private lazy var bannerButton: UIButton = {
         let bannerButton = UIButton(type: UIButton.ButtonType.custom)
-        bannerButton.setBackgroundImage(kImage(name: "pic_preload"), for: UIControl.State.normal)
+        bannerButton.setBackgroundImage(kImage(name: "default_pic"), for: UIControl.State.normal)
         bannerButton.cornerRadius = 4
         bannerButton.masksToBounds = true
         bannerButton.rx.tap.subscribe(onNext: {
@@ -36,7 +36,7 @@ class ProductFloorBannerView: BaseView {
     
     var cmsRuleModel: CMSRuleModel? {
         didSet {
-            bannerButton.kf.setBackgroundImage(with: kURLImage(name: cmsRuleModel?.url ?? "pic_preload"), for: UIControl.State.normal, placeholder: kImage(name: "pic_preload"))
+            bannerButton.kf.setBackgroundImage(with: kURLImage(name: cmsRuleModel?.url ?? "default_pic"), for: UIControl.State.normal, placeholder: kImage(name: "default_pic"))
         }
     }
 

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

@@ -102,7 +102,7 @@ class ProductHBigTableViewCell: UITableViewCell {
         let iconImagView = UIImageView()
         iconImagView.contentMode = .scaleAspectFill
         iconImagView.masksToBounds = true
-        iconImagView.image = kImage(name: "pic_preload")
+        iconImagView.image = kImage(name: "default_pic")
         return iconImagView
     }()
     
@@ -159,7 +159,7 @@ class ProductHBigTableViewCell: UITableViewCell {
     
     var productSearchModel: ProductSearchModel? {
         didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = productSearchModel?.saleName
             detailTitleLabel.text = productSearchModel?.subtitle
             sellNumberLabel.text = "已售\(productSearchModel?.totalCount ?? 0)件"

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

@@ -147,7 +147,7 @@ class ProductHSmallTableViewCell: UITableViewCell {
     
     var productSearchModel: ProductSearchModel? {
         didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = productSearchModel?.saleName
             detailTitleLabel.text = productSearchModel?.subtitle
             sellNumberLabel.text = "已售\(productSearchModel?.totalCount ?? 0)件"

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

@@ -82,7 +82,7 @@ class ShopViewShopInfoTableViewCell: UITableViewCell {
     
     lazy var shopIconImageView: UIImageView = {
         let shopIconImageView = UIImageView()
-        shopIconImageView.image = kImage(name: "pic_preload")
+        shopIconImageView.image = kImage(name: "default_pic")
         shopIconImageView.cornerRadius = 30
         shopIconImageView.masksToBounds = true
         return shopIconImageView
@@ -161,7 +161,7 @@ class ShopViewShopInfoTableViewCell: UITableViewCell {
             lookButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.right, imageTitleSpace: 4)
 
             
-            shopIconImageView.kf.setImage(with: kURLImage(name: shopModel?.logoImg ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            shopIconImageView.kf.setImage(with: kURLImage(name: shopModel?.logoImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
              shopNameLabel.text = shopModel?.shopName
 
             

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

@@ -43,7 +43,7 @@ class ShoppingCartListTableViewCell: UITableViewCell {
             let selStatus = productMdl?.isSelect == 1 ? true : false
             selectedButton.isSelected = selStatus
             // 商品图片
-            iconImageView.kf.setImage(with: kURLImage(name: productMdl?.productImg ?? ""), placeholder: kImage(name: "pic_preload"))
+            iconImageView.kf.setImage(with: kURLImage(name: productMdl?.productImg ?? ""), placeholder: kImage(name: "default_pic"))
             // 商品名称
             titleLabel.text = productMdl?.productName
             // 预计配送时间            

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 ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            bgImageView.kf.setImage(with: kURLImage(name: cmsRuleModel?.rule?.url ?? "default_pic"), placeholder: kImage(name: "default_pic"))
         }
     }
 }

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

@@ -66,7 +66,7 @@ class ShoppingMallCategoryCollectionViewCell: UICollectionViewCell {
     
     var cmsRuleModel : CMSRuleModel? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: cmsRuleModel?.rule?.url ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            iconImageView.kf.setImage(with: kURLImage(name: cmsRuleModel?.rule?.url ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = cmsRuleModel?.rule?.title ?? ""
         }
     }

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

@@ -49,7 +49,7 @@ class ShoppingMallSepcialCollectionViewCell: UICollectionViewCell {
     
     lazy var iconImageView : UIImageView = {
         let iconImageView = UIImageView()
-        iconImageView.image = kImage(name: "pic_preload")
+        iconImageView.image = kImage(name: "default_pic")
         iconImageView.cornerRadius = 4
         iconImageView.masksToBounds = true
         return iconImageView
@@ -57,7 +57,7 @@ class ShoppingMallSepcialCollectionViewCell: UICollectionViewCell {
     
     var cmsRuleModel : CMSRuleModel? {
         didSet {
-            iconImageView.kf.setImage(with: kURLImage(name: cmsRuleModel?.rule?.url ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            iconImageView.kf.setImage(with: kURLImage(name: cmsRuleModel?.rule?.url ?? "default_pic"), placeholder: kImage(name: "default_pic"))
         }
     }
     

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

@@ -25,7 +25,7 @@ class SpecialBannerView: BaseView {
     
     lazy var bannerButton: UIButton = {
         let bannerButton = UIButton(type: UIButton.ButtonType.custom)
-        bannerButton.setBackgroundImage(kImage(name: "pic_preload"), for: UIControl.State.normal)
+        bannerButton.setBackgroundImage(kImage(name: "default_pic"), for: UIControl.State.normal)
         bannerButton.backgroundColor = UIColor.white
         bannerButton.cornerRadius = 4
         bannerButton.masksToBounds = true
@@ -34,7 +34,7 @@ class SpecialBannerView: BaseView {
     
     var cmsRuleModel : CMSRuleModel? {
         didSet {
-            bannerButton.kf.setImage(with: kURLImage(name: cmsRuleModel?.url ?? "pic_preload"), for: UIControl.State.normal, placeholder: kImage(name: "pic_preload"))
+            bannerButton.kf.setImage(with: kURLImage(name: cmsRuleModel?.url ?? "default_pic"), for: UIControl.State.normal, placeholder: kImage(name: "default_pic"))
         }
     }
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -811,7 +811,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     ///   - messageShowTypes: 活动展示类型 0纯展示;1系统通知消息;2内容消息; 3活动消息; 4话题消息 ;5后台系统消息; 6评论消息; 7回复消息 ;8回复@ 消息;9攒内容消息 ;10收藏内容消息; 11分享内容消息 ;12关注消息
     ///   - page: 分页
     ///   - completion: 回调
-    func userMemberMessageListApi(messageShowTypes:String,page:Int,completion: @escaping successCallBack) {
+    func userMemberMessageListApi(messageShowTypes:String,page:Int,completion: @escaping successCallBack,fail: @escaping failCallback) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(messageShowTypes, forKey: "message_show_types")
         parameters.updateValue(page, forKey: "page")
@@ -822,6 +822,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         }
         SwiftMoyaNetWorkManager.shared.failCallback = {
             (loadingStatus) in
+            fail(loadingStatus)
         }
     }
     // MARK: - 用户消息阅读

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/ApiMacro.swift

@@ -48,8 +48,8 @@ public func kApiVirusPrefix() -> String {
     }
 }
 
-let kH5PersonalService = true
-let kH5DevelopSever = false
+let kH5PersonalService = false
+let kH5DevelopSever = true
 let kH5BetaSever = false
 let kH5ProductSever = false
 

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/DefaultPage/default_page_outage.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "default_page_outage@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "default_page_outage@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/DefaultPage/default_page_topic.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "default_page_topic@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "default_page_topic@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/DefaultPage/default_pic.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "default_pic@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "default_pic@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/DefaultPage/pic_preload.imageset/Contents.json

@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "pic_preload@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "pic_preload@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/EmptyView/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/EmptyView/def_page_pic_fans_list.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "def_page_pic_fans_list@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "def_page_pic_fans_list@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}