修改细节

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -28,7 +28,7 @@ extension AppDelegate {
         DeliveryMethodTypeModel.shared().setModel(model: deliveryMethodTypeModel)
         //基础配置
         SwiftMoyaNetWorkServiceConfig.shared().configApi {(data) -> (Void) in}
-        //彩虹豆
+        //U米
         UserMemberTotalBeanViewModel.shared.userMemberGetTotalBeanApiInterval()
         //设置Tabbar
         setTabbarController()

RainbowPlanet/RainbowPlanet/Macro/CommonH5.swift

@@ -8,10 +8,10 @@
 
 import Foundation
 
-let kCommunityPostDetailTitleShare  = "送了你 \(ConfigModel.shared.object()?.sharePostBean ?? 0) 彩虹豆，快来赞我的动态哦！我马上就能换东西啦^_^"
+let kCommunityPostDetailTitleShare  = "送了你 \(ConfigModel.shared.object()?.sharePostBean ?? 0) U米，快来赞我的动态哦！我马上就能换东西啦^_^"
 
 
-let kCommunityPushingNewActivitiesTitle  = "向好友传递美好生活，送TA \(ConfigModel.shared.object()?.sharePostBean ?? 0)彩虹豆"
-let kCommunityPushingNewActivitiesDetailTitle  = "越多好友加入，收获彩虹豆越多"
-let kCommunityPushingNewActivitiesTitleShare  = "在吗？送你 \(ConfigModel.shared.object()?.sharePostBean ?? 0) 彩虹豆~"
+let kCommunityPushingNewActivitiesTitle  = "向好友传递美好生活，送TA \(ConfigModel.shared.object()?.sharePostBean ?? 0)U米"
+let kCommunityPushingNewActivitiesDetailTitle  = "越多好友加入，收获U米越多"
+let kCommunityPushingNewActivitiesTitleShare  = "在吗？送你 \(ConfigModel.shared.object()?.sharePostBean ?? 0) U米~"
 let kCommunityPushingNewActivitiesDetailTitleShare  = "彩虹星球，每天刷一下，免费领优酷会员、腾讯会员、网易云会员、爱奇艺会员、芒果会员...很多会员！！！"

RainbowPlanet/RainbowPlanet/Model/WVJBModel/WVJBModel.swift

@@ -12,7 +12,7 @@ import ObjectMapper
 /// - view: APP原生页面跳转
 /// - link: H5页面跳转
 /// - copy: 复制
-/// - bean: 刷新彩虹豆
+/// - bean: 刷新U米
 /// - preview: 预览图片
 /// - follow: 关注
 enum WVJBModelType : String {

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

@@ -45,7 +45,6 @@ class CardContentActionTableViewCell: UITableViewCell {
         addSubview(shareButton)
         addSubview(collectButton)
         addSubview(praiseButton)
-        addSubview(lineLabel)
         collectButton.addSubview(collectAnimationView)
         praiseButton.imageView?.addSubview(praiseAnimationView)
     }
@@ -64,9 +63,9 @@ class CardContentActionTableViewCell: UITableViewCell {
             make.height.equalTo(24)
         }
         shareButton.snp.makeConstraints { (make) in
-            make.centerY.equalToSuperview()
+            make.centerY.equalToSuperview().offset(2)
             make.right.equalTo(-17)
-            make.size.equalTo(16)
+            make.size.equalTo(22)
         }
         collectButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
@@ -84,12 +83,6 @@ class CardContentActionTableViewCell: UITableViewCell {
         praiseAnimationView.snp.makeConstraints { (make) in
             make.edges.equalToSuperview()
         }
-        lineLabel.snp.makeConstraints { (make) in
-            make.bottom.equalToSuperview()
-            make.left.equalTo(14)
-            make.right.equalTo(-14)
-            make.height.equalTo(1)
-        }
 
     }
     
@@ -103,8 +96,8 @@ class CardContentActionTableViewCell: UITableViewCell {
     
     private lazy var skittlesButton: UIButton = {
         let skittlesButton = UIButton(type: UIButton.ButtonType.custom)
-        skittlesButton.setImage(kImage(name: "ico_bean_org"), for: .normal)
-        skittlesButton.setTitle("666彩虹豆待收获", for: .normal)
+        skittlesButton.setImage(kImage(name: "ico_bean_org_40px"), for: .normal)
+        skittlesButton.setTitle("666U米待收获", for: .normal)
         skittlesButton.setTitleColor(kFFA42FColor, for: .normal)
         skittlesButton.titleLabel?.font = kRegularFont13
         skittlesButton.isEnabled = false
@@ -231,16 +224,10 @@ class CardContentActionTableViewCell: UITableViewCell {
         }).disposed(by: disposeBag)
         return praiseButton
     }()
-
-    private lazy var lineLabel: UILabel = {
-        let lineLabel = UILabel()
-        lineLabel.backgroundColor = kf1f1f1Color
-        return lineLabel
-    }()
     
     var communityRecommendDataModel: CommunityRecommendDataModel? {
         didSet {
-            skittlesButton.setTitle("\(communityRecommendDataModel?.willCollectBean ?? 0)彩虹豆待收获", for: UIControl.State.normal)
+            skittlesButton.setTitle("\(communityRecommendDataModel?.willCollectBean ?? 0)U米待收获", for: UIControl.State.normal)
             skittlesButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
             
             if communityRecommendDataModel?.isLike == 0 {
@@ -261,7 +248,7 @@ class CardContentActionTableViewCell: UITableViewCell {
     
     var communityFollowDataModel: CommunityFollowDataModel? {
         didSet {
-            skittlesButton.setTitle("\(communityFollowDataModel?.relateData?.willCollectBean ?? 0)彩虹豆待收获", for: UIControl.State.normal)
+            skittlesButton.setTitle("\(communityFollowDataModel?.relateData?.willCollectBean ?? 0)U米待收获", for: UIControl.State.normal)
             skittlesButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 5)
             
             if communityFollowDataModel?.relateData?.isLike == 0 {

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

@@ -45,7 +45,7 @@ class CardContentCommnetTableViewCell: UITableViewCell {
     
     private func setupLayouts() {
         avatarButton.snp_makeConstraints { (make) in
-            make.top.equalTo(20)
+            make.centerY.equalToSuperview()
             make.left.equalTo(14)
             make.size.equalTo(28)
         }
@@ -53,6 +53,7 @@ class CardContentCommnetTableViewCell: UITableViewCell {
             make.centerY.equalTo(avatarButton)
             make.height.equalTo(avatarButton)
             make.left.equalTo(avatarButton.snp_right).offset(10)
+            make.right.equalTo(-14)
         }
     }
     
@@ -71,6 +72,7 @@ class CardContentCommnetTableViewCell: UITableViewCell {
         addCommnetButton.setTitle("添加评论...", for: UIControl.State.normal)
         addCommnetButton.setTitleColor(k999999Color, for: UIControl.State.normal)
         addCommnetButton.titleLabel?.font = kRegularFont14
+        addCommnetButton.contentHorizontalAlignment = .left
         addCommnetButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
             if UserModel.isTokenNil() {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/CommentList/CardContentCommentListTableViewCell.swift

@@ -61,13 +61,13 @@ class CardContentCommentListTableViewCell: UITableViewCell {
     }()
     
     private lazy var headerView: UIView = {
-        let headerView = UIView(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: 18))
+        let headerView = UIView(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: 1))
         headerView.backgroundColor = .white
         return headerView
     }()
     
     private lazy var footerView: CardContentCommentListFooterView = {
-        let footerView = CardContentCommentListFooterView(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: 30))
+        let footerView = CardContentCommentListFooterView(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: 23))
         footerView.backgroundColor = .white
         return footerView
     }()

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

@@ -297,7 +297,7 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
         didSet {
             avatarButton.kf.setImage(with: kURLImage(name: communityFollowDataModel?.followAvatar ?? ""), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(communityFollowDataModel?.followUsername, for: UIControl.State.normal)
-            skittlesTitleLabel.text = "收获 \(communityFollowDataModel?.content?.beans ?? 0) 个彩虹豆"
+            skittlesTitleLabel.text = "收获 \(communityFollowDataModel?.content?.beans ?? 0) U米"
 
             communityFollowType = CommunityFollowType(rawValue: communityFollowDataModel?.type ?? "1")
 

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift

@@ -601,10 +601,10 @@ extension CommunityFollowViewController : UITableViewDelegate,UITableViewDataSou
                     if communityFollowDataModel.relateData?.content?.count ?? 0 >= 45 {
                         str = str.prefix(45) + "...更多"
                         let contentHeight = "\(str)".heightForComment(font: kRegularFont14!, width: kScreenWidth-28)
-                        return (22 + 10 + contentHeight)
+                        return (22 + 6 + contentHeight)
                     }else {
                         let contentHeight = "\(str)".heightForComment(font: kRegularFont14!, width: kScreenWidth-28)
-                        return 22 + 10 + contentHeight
+                        return 22 + 6 + contentHeight
                     }
                 }
             }
@@ -626,15 +626,15 @@ extension CommunityFollowViewController : UITableViewDelegate,UITableViewDataSou
                 }
                 
                 if (communityFollowDataModel.relateData?.commentCount ?? 0) <= 2 {
-                    return (height ?? 0) + 18
+                    return (height ?? 0)
                 }else {
-                    return 30 + 18 + (height ?? 0)
+                    return 23 + (height ?? 0)
                 }
             }
             return 0
         //评论
         case 5:
-            return 74
+            return 58
         default:
             return 0
         }

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

@@ -90,7 +90,7 @@ class CommunityViewController: BaseViewController {
                 self?.navigationController?.pushViewController(vc, animated: true)
             }
         }
-        //彩虹豆
+        //U米
         communityNavigationBarView.rightButtonClosure = {
             [weak self] in
             if UserModel.isTokenNil() {
@@ -271,8 +271,8 @@ class CommunityViewController: BaseViewController {
             title = contentStr?.prefix(12) ?? ""
         }
         let shareCommunityView =  ShareCommunityView.shareCommunityView(
-            uid: uid ?? 0, title: "向好友传递美好生活，送TA 500彩虹豆",
-            detailTitle: "越多好友看到，收获彩虹豆越多",
+            uid: uid ?? 0, title: "向好友传递美好生活，送TA 500U米",
+            detailTitle: "越多好友看到，收获U米越多",
             h5Str: (H5UrlStr ?? "" + "\(UserModel.shared().getModel()?.inviteCode ?? "")"),
             thumbnailImg: UIImage.imageUrl(imgUrl),
             sharedTitle: String(title ?? ""),

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendViewController.swift

@@ -462,7 +462,7 @@ extension CommunityRecommnendViewController : UITableViewDelegate,UITableViewDat
                         cardContentPicVideoModel.number = 1
                         cardContentPicVideoModel.width = getImageWidth(imgStr: (imgStr)!)
                         cardContentPicVideoModel.height = getImageHeight(imgStr: (imgStr)!)
-                        return cardContentPicVideoModel.collectionViewHeight() + 20
+                        return cardContentPicVideoModel.collectionViewHeight() + 15
                     }else {
                         return 0
                     }
@@ -472,13 +472,13 @@ extension CommunityRecommnendViewController : UITableViewDelegate,UITableViewDat
                             cardContentPicVideoModel.number = 1
                             cardContentPicVideoModel.width = getImageWidth(imgStr: (imgStr)!)
                             cardContentPicVideoModel.height = getImageHeight(imgStr: (imgStr)!)
-                            return cardContentPicVideoModel.collectionViewHeight() + 20
+                            return cardContentPicVideoModel.collectionViewHeight() + 15
                         }else {
                             return 0
                         }
                     }else {
                         cardContentPicVideoModel.number = communityRecommendDataModel.imgs?.count ?? 0
-                        return cardContentPicVideoModel.collectionViewHeight() + 20
+                        return cardContentPicVideoModel.collectionViewHeight() + 15
                     }
                 }
             //内容标题
@@ -501,10 +501,10 @@ extension CommunityRecommnendViewController : UITableViewDelegate,UITableViewDat
                         if communityRecommendDataModel.content?.count ?? 0 >= 45 {
                             str = str.prefix(45) + "...更多"
                             let contentHeight = "\(str)".heightForComment(font: kRegularFont14!, width: kScreenWidth-28)
-                            return (22 + 10 + contentHeight)
+                            return (22 + 6 + contentHeight)
                         }else {
                             let contentHeight = "\(str)".heightForComment(font: kRegularFont14!, width: kScreenWidth-28)
-                            return 22 + 10 + contentHeight
+                            return 22 + 6 + contentHeight
                         }
                     }
                 }
@@ -526,15 +526,15 @@ extension CommunityRecommnendViewController : UITableViewDelegate,UITableViewDat
                     }
                     
                     if (communityRecommendDataModel.commentCount ?? 0) <= 2 {
-                        return (height ?? 0) + 18
+                        return (height ?? 0)
                     }else {
-                        return 30 + 18 + (height ?? 0)
+                        return 23 + (height ?? 0)
                     }
                 }
                 return 0
             //评论
             case 5:
-                return 74
+                return 58
             default:
                 return 0
             }

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

@@ -551,10 +551,10 @@ extension CommunityFeaturedTopicsViewController : UITableViewDelegate,UITableVie
                     if communityRecommendDataModel.content?.count ?? 0 >= 45 {
                         str = str.prefix(45) + "...更多"
                         let contentHeight = "\(str)".heightForComment(font: kRegularFont14!, width: kScreenWidth-28)
-                        return (22 + 10 + contentHeight)
+                        return (22 + 6 + contentHeight)
                     }else {
                         let contentHeight = "\(str)".heightForComment(font: kRegularFont14!, width: kScreenWidth-28)
-                        return 22 + 10 + contentHeight
+                        return 22 + 6 + contentHeight
                     }
                 }
             }
@@ -577,15 +577,15 @@ extension CommunityFeaturedTopicsViewController : UITableViewDelegate,UITableVie
                 }
                 
                 if (communityRecommendDataModel.commentCount ?? 0) <= 2 {
-                    return (height ?? 0) + 18
+                    return (height ?? 0)
                 }else {
-                    return 30 + 18 + (height ?? 0)
+                    return 23 + (height ?? 0)
                 }
             }
             return 0
         //评论
         case 5:
-            return 74
+            return 58
         default:
             return 0
         }

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

@@ -316,8 +316,8 @@ class CommunityRecommendController: BaseViewController {
             title = self.communityPostDetailModel?.content?.prefix(12) ?? ""
         }
         let shareCommunityView =  ShareCommunityView.shareCommunityView(
-            uid: self.communityPostDetailModel?.uid ?? 0, title: "向好友传递美好生活，送TA 500彩虹豆",
-            detailTitle: "越多好友看到，收获彩虹豆越多",
+            uid: self.communityPostDetailModel?.uid ?? 0, title: "向好友传递美好生活，送TA 500U米",
+            detailTitle: "越多好友看到，收获U米越多",
             h5Str: (self.communityPostDetailModel?.h5url ?? "" + "\(UserModel.shared().getModel()?.inviteCode ?? "")"),
             thumbnailImg: UIImage.imageUrl(self.communityPostDetailModel?.img),
             sharedTitle: String(title ?? ""),

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

@@ -157,7 +157,7 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
     
     private lazy var beanImageView : UIImageView = {
         let beanImageView = UIImageView()
-        beanImageView.image = kImage(name: "navbar_bean_org")
+        beanImageView.image = kImage(name: "ico_bean_org_40px")
         return beanImageView
     }()
     
@@ -250,7 +250,7 @@ class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
             avatarButton.kf.setImage(with: kURLImage(name: communityPostDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             nameButton.setTitle(communityPostDetailModel?.username, for: UIControl.State.normal)
             CommunityFollowUserViewModel.shared.setFollowType(followButton: followButton, followType: FollowType(rawValue: communityPostDetailModel?.isFollow ?? 0) ?? .futureFollow)
-            beanLabel.text = "\(communityPostDetailModel?.availableBean ?? 0)彩虹豆待收获"
+            beanLabel.text = "\(communityPostDetailModel?.availableBean ?? 0)U米待收获"
             timeReadLabel.text = " I \(communityPostDetailModel?.createdAt ?? "") I 阅读·\(communityPostDetailModel?.pv ?? 0)"
             webView.load(URLRequest(url: URL(string: communityPostDetailModel?.descUrl ?? "")!))
             

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/imageCell/RecommendDetailContentCell.swift

@@ -212,7 +212,7 @@ class RecommendDetailContentCell: UITableViewCell {
     
     var communityPostDetailModel : CommunityPostDetailModel? {
         didSet {
-            beanLabel.text = "\(communityPostDetailModel?.willCollectBean ?? 0)彩虹豆待收获"
+            beanLabel.text = "\(communityPostDetailModel?.willCollectBean ?? 0)U米待收获"
             contentLabel.text = communityPostDetailModel?.content
             if communityPostDetailModel?.location == nil || communityPostDetailModel?.location == "" {
                 timeLabel.text = "\(communityPostDetailModel?.createdAt ?? "")"

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

@@ -131,7 +131,7 @@ class CommunityShareContentViewController: BaseViewController {
             QRCodeImageView.image = UIImage(cgImage: tryImage)
         } else {
         }
-        scanLabel.text = "扫码查看内容 领取\(bean ?? 0)彩虹豆"
+        scanLabel.text = "扫码查看内容 领取\(bean ?? 0)U米"
         scrollView.swContentScrollCapture {
             [weak self] (image) in
             self?.shareCommunityContentView.image = image

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

@@ -263,7 +263,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
             make.right.equalToSuperview()
         }
         
-        // 彩虹豆View
+        // U米View
         rainbowBeanView.snp.makeConstraints { (make) in
             make.left.equalTo(14)
             make.height.equalTo(24)
@@ -750,7 +750,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
         return followButton
     }()
     
-    // MARK: 彩虹豆View
+    // MARK: U米View
     private lazy var rainbowBeanView: UIView = {
         let rainbowBeanView = UIView()
         rainbowBeanView.backgroundColor = kRGBAColor(r: 0/255.0, g: 0/255.0, b: 0/255.0, a: 0.3)
@@ -849,7 +849,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
                 videoPlayView.assetURLString = self.videoItemMdl?.video
             }
             
-            beanLabel.text = "\(self.videoItemMdl?.willCollectBean ?? 0)彩虹豆待收获"
+            beanLabel.text = "\(self.videoItemMdl?.willCollectBean ?? 0)U米待收获"
             
             avatarButton.kf.setImage(with: kURLImage(name: self.videoItemMdl?.avatar ?? ""), for: .normal, placeholder: kImage(name: "default_avatar"))
             personLabel.text = self.videoItemMdl?.username

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

@@ -295,8 +295,8 @@ extension CommunityVideoListController {
             title = videoItemModel.content?.prefix(12) ?? ""
         }
         let shareCommunityView =  ShareCommunityView.shareCommunityView(
-            uid: videoItemModel.uid ?? 0, title: "向好友传递美好生活，送TA 500彩虹豆",
-            detailTitle: "越多好友看到，收获彩虹豆越多",
+            uid: videoItemModel.uid ?? 0, title: "向好友传递美好生活，送TA 500U米",
+            detailTitle: "越多好友看到，收获U米越多",
             h5Str: (videoItemModel.h5url ?? "" + "\(UserModel.shared().getModel()?.inviteCode ?? "")"),
             thumbnailImg: UIImage.imageUrl(videoItemModel.img),
             sharedTitle: String(title ?? ""),

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

@@ -11,7 +11,7 @@ import PPBadgeViewSwift
 
 class MessageHomeOneCollectionViewCell: UICollectionViewCell {
     
-    var images = ["news_comment","news_interaction","news_follow"]
+    var images = ["news_comment","news_interaction","news_inform"]
     var titles = ["评论和@","赞与互动","关注通知"]
     
     class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> MessageHomeOneCollectionViewCell {
@@ -51,7 +51,7 @@ class MessageHomeOneCollectionViewCell: UICollectionViewCell {
         iconImageView.snp.makeConstraints { (make) in
             make.top.equalTo(20)
             make.centerX.equalToSuperview()
-            make.size.equalTo(40)
+            make.size.equalTo(50)
         }
         titleLabel.snp.makeConstraints { (make) in
             make.top.equalTo(iconImageView.snp_bottom).offset(4)
@@ -65,8 +65,8 @@ class MessageHomeOneCollectionViewCell: UICollectionViewCell {
         let iconImageView = UIImageView()
         iconImageView.isUserInteractionEnabled = true
         iconImageView.pp.addDot(color: kFE352BColor)
-        iconImageView.pp.setBadge(height: 10)
-        iconImageView.pp.moveBadge(x: -5, y: -5)
+        iconImageView.pp.setBadge(height: 8)
+        iconImageView.pp.moveBadge(x: -6, y: -6)
         iconImageView.pp.hiddenBadge()
         return iconImageView
     }()

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

@@ -10,7 +10,7 @@ import UIKit
 
 class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
     
-    var images = ["news_inform","news_activity"]
+    var images = ["news_notice","news_activity"]
     var titles = ["星球通知","星球活动"]
     
     class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> MessageHomeTwoCollectionViewCell {
@@ -107,14 +107,14 @@ class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
     
     private lazy var lineLabel: UILabel = {
         let lineLabel = UILabel()
-        lineLabel.backgroundColor = kf5f5f5Color
+        lineLabel.backgroundColor = kf7f8faColor
         return lineLabel
     }()
     
     private lazy var dotLabel: UILabel = {
         let dotLabel = UILabel()
         dotLabel.backgroundColor = kFE352BColor
-        dotLabel.cornerRadius = 5
+        dotLabel.cornerRadius = 4
         dotLabel.masksToBounds = true
         dotLabel.isHidden = true
         return dotLabel
@@ -140,8 +140,8 @@ class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
                 subLabel.isHidden = true
                 dotLabel.snp.remakeConstraints { (make) in
                     make.centerY.equalTo(titleLabel)
-                    make.right.equalTo(-17.5)
-                    make.size.equalTo(10)
+                    make.right.equalTo(-24.5)
+                    make.size.equalTo(8)
                 }
             }else {
                 timeLabel.isHidden = false
@@ -155,7 +155,7 @@ class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
                 
                 timeLabel.snp.makeConstraints { (make) in
                     make.centerY.equalTo(titleLabel)
-                    make.right.equalTo(-17.5)
+                    make.right.equalTo(-14)
                 }
                 
                 subLabel.snp.remakeConstraints { (make) in
@@ -167,8 +167,8 @@ class MessageHomeTwoCollectionViewCell: UICollectionViewCell {
                 
                 dotLabel.snp.remakeConstraints { (make) in
                     make.centerY.equalTo(subLabel)
-                    make.right.equalTo(-17.5)
-                    make.size.equalTo(10)
+                    make.right.equalTo(-24.5)
+                    make.size.equalTo(8)
                 }
             }
         }

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

@@ -32,6 +32,7 @@ class MessageMainViewController: BaseViewController {
         navigationBar.title = "消息"
         view.backgroundColor = kf7f8faColor
         view.addSubview(collectionView)
+        view.insertSubview(navigationBar, aboveSubview: collectionView)
     }
     
     override func setupData() {

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

@@ -83,7 +83,7 @@ class MessagePlanetNotiTableCell: UITableViewCell {
             make.top.equalToSuperview().offset(48)
             make.left.equalTo(14)
             make.right.equalTo(-14)
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         titleLabel.snp.makeConstraints { (make) in
             make.top.equalTo(sepView.snp_bottom).offset(14)
@@ -114,10 +114,10 @@ class MessagePlanetNotiTableCell: UITableViewCell {
     private lazy var notiView: UIView = {
         let notiView = UIView()
         notiView.backgroundColor = kffffffColor
-        notiView.cornerRadius = 4
+        notiView.cornerRadius = 5
         notiView.masksToBounds = true
-        notiView.layer.borderWidth = 1.0
-        notiView.layer.borderColor = ke6e6e6Color.cgColor
+        notiView.layer.borderWidth = 0.5
+        notiView.layer.borderColor = kf7f8faColor.cgColor
         return notiView
     }()
     
@@ -138,7 +138,7 @@ class MessagePlanetNotiTableCell: UITableViewCell {
     
     private lazy var sepView: UIView = {
         let sepView = UIView()
-        sepView.backgroundColor = kebebebColor
+        sepView.backgroundColor = kf7f8faColor
         return sepView
     }()
     

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/UserPersonalCenter/View/RainbowBeanPhysical/RainbowBeanPhysicalCollectionViewCell.swift

@@ -21,9 +21,9 @@ class RainbowBeanPhysicalCollectionViewCell: UICollectionViewCell {
         didSet {
             if indexPath?.row == 0 {
                 iconImageView.image = kImage(name: "personage_dou")
-                titleLabel.text = "收获彩虹豆"
+                titleLabel.text = "收获U米"
                 valueLabel.text = "0"
-                subtitleLabel.text = "彩虹豆是什么?"
+                subtitleLabel.text = "U米是什么?"
             }else {
                 iconImageView.image = kImage(name: "personage_vit")
                 titleLabel.text = "今日体力值（100）"

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

@@ -190,7 +190,7 @@ class UserPersonalCenterViewController: BaseViewController {
     
     lazy var setButton: UIButton = {
         let setButton = UIButton(type: UIButton.ButtonType.custom)
-        setButton.setImage(kImage(name: "center_install"), for: UIControl.State.normal)
+        setButton.setImage(kImage(name: "nav_precenter_set"), for: UIControl.State.normal)
         return setButton
     }()
     

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

@@ -70,7 +70,7 @@ class PublishShareBottomView: BaseView {
     
     private lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
-        titleLabel.text = "向好友传递美好生活，收货更多彩虹豆"
+        titleLabel.text = "向好友传递美好生活，收货更多U米"
         titleLabel.textColor = k333333Color
         titleLabel.font = kRegularFont16
         return titleLabel

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

@@ -138,7 +138,7 @@ class PublishSuccessController: BaseViewController {
             QRCodeImageView.image = UIImage(cgImage: tryImage)
         } else {
         }
-        scanLabel.text = "扫码查看内容 领取\(bean ?? 0)彩虹豆"
+        scanLabel.text = "扫码查看内容 领取\(bean ?? 0)U米"
         scrollView.swContentScrollCapture {
             [weak self] (image) in
             self?.shareCommunityContentView.image = image

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

@@ -145,7 +145,7 @@ class RedemptionAreaBannerTableViewCell: UITableViewCell {
     
     lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
-        titleLabel.text = "我的彩虹豆"
+        titleLabel.text = "我的U米"
         titleLabel.textColor = k333333Color
         titleLabel.font = kRegularFont14
         return titleLabel

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

@@ -115,7 +115,7 @@ class RedemptionAreaProductCollectionViewCell: UICollectionViewCell {
         let beanNameLabel = UILabel()
         beanNameLabel.textColor = kFFA42FColor
         beanNameLabel.font = kRegularFont12
-        beanNameLabel.text = "彩虹豆"
+        beanNameLabel.text = "U米"
         return beanNameLabel
     }()
     

RainbowPlanet/RainbowPlanet/Modules/ShareModules/ShareCommunityModule/ShareCommunityVideo/ShareCommunityVideoView.swift

@@ -64,7 +64,7 @@ class ShareCommunityVideoView: BaseView {
         titleLabel.textColor = kffffffColor
         titleLabel.font = kRegularFont15
         titleLabel.textAlignment = .center
-        titleLabel.text = "向好友传递美好生活，收获更多彩虹豆"
+        titleLabel.text = "向好友传递美好生活，收获更多U米"
         return titleLabel
     }()
     
@@ -73,7 +73,7 @@ class ShareCommunityVideoView: BaseView {
         beanLabel.textColor = UIColor(hexString: "FFA42F")
         beanLabel.font = kMediumFont13
         beanLabel.textAlignment = .center
-        beanLabel.text = "预计可获得0彩虹豆"
+        beanLabel.text = "预计可获得0U米"
         beanLabel.backgroundColor = UIColor(hexString: "FFF9F0")
         return beanLabel
     }()

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

@@ -862,8 +862,8 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         }
     }
     
-    // MARK: - 获取彩虹豆
-    /// 获取彩虹豆
+    // MARK: - 获取U米
+    /// 获取U米
     ///
     /// - Parameter completion: 回调
     func userMemberGetTotalBeanApi(completion: @escaping successCallBack) {

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

@@ -149,8 +149,8 @@ public let kUserMemberReadMessageApi = "/user/v2/member/readMessage"
 /// 用户搜索列表
 public let kUserMemberSearchMemberApi = "/user/v2/member/searchMember"
 
-// MARK: - 获取用户彩虹豆总额
-/// 获取用户彩虹豆总额
+// MARK: - 获取用户U米总额
+/// 获取用户U米总额
 public let kUserMemberGetTotalBeanApi = "/user/v2/member/getTotalBean"
 
 // MARK: - 手机号码一键登录
@@ -195,7 +195,7 @@ public let kUserMobileAuthorizationLoginApi = "/user/mobileAuthorizationLogin"
 /// - userMemberMessageList: 用户消息列表
 /// - userMemberReadMessage: 用户消息阅读
 /// - userMemberSearchMember: 用户搜索列表
-/// - userMemberGetTotalBean: 获取用户彩虹豆总额
+/// - userMemberGetTotalBean: 获取用户U米总额
 /// - userMobileAuthorizationLogin: 手机号码一键登录
 public enum SwiftMoyaServiceUserApi {
     case userLogout(parameters:Dictionary<String, Any>)

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

@@ -14,7 +14,7 @@ let kH5PlanetUrl = kApiH5Prefix() + "/planet"
 /// 小贴士
 let kH5ContentId1Url = kApiH5Prefix() + "/content?id=1"
 
-/// 什么是彩虹豆
+/// 什么是U米
 let kH5ContentId2Url = kApiH5Prefix() + "/content?id=2"
 
 /// 什么是彩虹星球

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/NavigationBarIcons/nav_precenter_set.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/CommunityModule.xcassets/ico_bean_org_40px.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/MessageModule.xcassets/news_notice.imageset/Contents.json

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