删除了无用的彩虹豆,我的页面的参与互动可以收取U米哦完成

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -233,7 +233,7 @@ extension ESTabBar {
         
         let view  = super.hitTest(point, with: event)
         if view == nil {
-            if UserModel.isTokenNil() {
+            if UserModel.isTokenNil() && (getCurrentVC() is CommunityViewController || getCurrentVC() is RedemptionAreaViewController) {
                 for subView in subviews {
                     if !subView.subviews.isEmpty {
                         for subView in subView.subviews {

RainbowPlanet/RainbowPlanet/Base/BaseWebViewController/BaseJSWebViewController.swift

@@ -25,7 +25,7 @@ class BaseJSWebViewController: BaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
-        setupData()
+//        setupData()
     }
     
     override func setupViews() {

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

@@ -54,7 +54,7 @@ class CommunityPlanetViewController: BaseJSWebViewController {
                 WebViewJavascriptBridgeManager.shared.callHandlerH5(bridge: self?.bridge)
             }
         }
-        
+
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityModulePlanetTop"), object: nil, queue: OperationQueue.main, using: {
             [weak self] (notification) in
             if self?.wkWebView.scrollView.contentOffset == CGPoint(x: 0, y: 0) {

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

@@ -124,7 +124,7 @@ class RecommendDetailContentCell: 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
     }()
     

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

@@ -66,7 +66,7 @@ class MessageHomeOneCollectionViewCell: UICollectionViewCell {
         iconImageView.isUserInteractionEnabled = true
         iconImageView.pp.addDot(color: kFE352BColor)
         iconImageView.pp.setBadge(height: 8)
-        iconImageView.pp.moveBadge(x: -6, y: -6)
+        iconImageView.pp.moveBadge(x: -6, y: 7)
         iconImageView.pp.hiddenBadge()
         return iconImageView
     }()

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

@@ -42,6 +42,7 @@ class UserPersonalCenterViewController: BaseViewController {
         view.addSubview(pagingView)
         view.insertSubview(navigationBar, aboveSubview: pagingView)
         setnavigationBar()
+        view.addSubview(iconImageView)
     }
     
     /// 设置navigationBar
@@ -88,6 +89,10 @@ class UserPersonalCenterViewController: BaseViewController {
             make.right.equalTo(navigationBar.rightButton.snp_left)
             make.size.equalTo(34)
         }
+        iconImageView.snp.makeConstraints { (make) in
+            make.bottom.equalToSuperview()
+            make.centerX.equalToSuperview()
+        }
     }
     
     
@@ -129,7 +134,8 @@ class UserPersonalCenterViewController: BaseViewController {
         })
         
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("communityDeletePostApi"), object: nil, queue: OperationQueue.main) { [weak self] (notification) in
-            self?.cmsTemplateTitles = ["发布 \((Int(self?.userDetailModel?.postCount ?? "0") ?? 1) - 1)","收藏 \(self?.userDetailModel?.collectCount ?? "0")","分享 \(self?.userDetailModel?.shareCount ?? "0")"]
+            self?.userDetailModel?.postCount  = "\((Int(self?.userDetailModel?.postCount ?? "0") ?? 1) - 1)"
+            self?.cmsTemplateTitles = ["发布 \(self?.userDetailModel?.postCount ?? "0")","收藏 \(self?.userDetailModel?.collectCount ?? "0")","分享 \(self?.userDetailModel?.shareCount ?? "0")"]
             self?.reloadData()
         }
         
@@ -155,6 +161,12 @@ class UserPersonalCenterViewController: BaseViewController {
         self.segmentedView.defaultSelectedIndex = userPersonalCenterVCType
         self.segmentedView.reloadData()
         self.pagingView.reloadData()
+        
+        if userPersonalCenterVCType == 0 && self.userDetailModel?.postCount == "0" {
+            iconImageViewAlpha(alpha: 1)
+        }else {
+            iconImageViewAlpha(alpha: 0)
+        }
     }
     
     /// 编辑
@@ -201,6 +213,20 @@ class UserPersonalCenterViewController: BaseViewController {
         return navigationBgView
     }()
     
+    lazy var iconImageView: UIImageView = {
+        let iconImageView = UIImageView()
+        iconImageView.image = kImage(name: "def_page_pic_pecenter")
+        iconImageView.alpha = 0
+        return iconImageView
+    }()
+    
+    func iconImageViewAlpha(alpha:CGFloat) {
+        UIView.animate(withDuration: 1) {
+            [weak self] in
+            self?.iconImageView.alpha = alpha
+        }
+    }
+    
     //1.初始化JXSegmentedView
     lazy var segmentedView: JXSegmentedView = {
         let segmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: UIScreen.main.bounds.size.width, height: CGFloat(JXheightForHeaderInSection)))
@@ -282,6 +308,11 @@ extension UserPersonalCenterViewController : JXSegmentedViewDelegate {
     //点击选中或者滚动选中都会调用该方法。适用于只关心选中事件，而不关心具体是点击还是滚动选中的情况。
     func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
         self.userPersonalCenterVCType = index
+        if index == 0 && self.userDetailModel?.postCount == "0" {
+            iconImageViewAlpha(alpha: 1)
+        }else {
+            iconImageViewAlpha(alpha: 0)
+        }
     }
     
     // 点击选中的情况才会调用该方法

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

@@ -162,7 +162,7 @@ class RedemptionAreaBannerTableViewCell: UITableViewCell {
     
     lazy var iconImagView: UIImageView = {
         let iconImagView = UIImageView()
-        iconImagView.image = kImage(name: "exchange_ico_bean")
+        iconImagView.image = kImage(name: "ico_bean_org_40px")
         return iconImagView
     }()
     

RainbowPlanet/RainbowPlanet/Modules/ShareModules/ShareCommunityModule/ShareCommunity/ShareCommunityView.swift

@@ -214,7 +214,7 @@ extension ShareCommunityView: UICollectionViewDelegateFlowLayout,UICollectionVie
         if UserModel.shared().isEqualUid(uid: self.uid ?? 0) {
             return platformTitles.count
         }else {
-            return platformTitles.prefix(5).count
+            return platformTitles.prefix(6).count
         }
     }
     

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

@@ -48,15 +48,15 @@ public func kApiVirusPrefix() -> String {
     }
 }
 
-let kH5PersonalService = false
-let kH5DevelopSever = true
+let kH5PersonalService = true
+let kH5DevelopSever = false
 let kH5BetaSever = false
 let kH5ProductSever = false
 
 // MARK: - H5
 public func kApiH5Prefix() -> String {
     if kH5PersonalService /** 接口前缀-个人服务器*/ {
-        return ""
+        return "http://192.168.23.130:8820" //大黄
     }else if kH5DevelopSever /** 接口前缀-开发服务器*/ {
         return "http://h5.dev.caihongxingqiu.com"
     } else if kH5BetaSever /** 接口前缀-测试服务器*/{

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -3,55 +3,55 @@
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "iconiPhoneNotification_20pt@2x.png",
+      "filename" : "AppIconiPhoneNotification_20pt@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "iconiPhoneNotification_20pt@3x.png",
+      "filename" : "AppIconiPhoneNotification_20pt@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "iconiPhoneSpootlight5_29pt@2x.png",
+      "filename" : "AppIconiPhoneSpootlight5_29pt@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "iconiPhoneSpootlight5_29pt@3x.png",
+      "filename" : "AppIconiPhoneSpootlight5_29pt@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "iconiPhoneSpootlight7_40pt@2x.png",
+      "filename" : "AppIconiPhoneSpootlight7_40pt@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "iconiPhoneSpootlight7_40pt@3x.png",
+      "filename" : "AppIconiPhoneSpootlight7_40pt@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "iconiPhoneApp_60pt@2x.png",
+      "filename" : "AppIconiPhoneApp_60pt@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "iconiPhoneApp_60pt@3x.png",
+      "filename" : "AppIconiPhoneApp_60pt@3x.png",
       "scale" : "3x"
     },
     {
       "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "iconstore_1024pt.png",
+      "filename" : "AppIconstore_1024pt.png",
       "scale" : "1x"
     }
   ],

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

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

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

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

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

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

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

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

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

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

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

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

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/center_install.imageset/Contents.json

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

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

@@ -6,12 +6,12 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "page03@2x.png",
+      "filename" : "def_page_pic_pecenter@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "page03@3x.png",
+      "filename" : "def_page_pic_pecenter@3x.png",
       "scale" : "3x"
     }
   ],

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_evaluation.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_message_active.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_message_attention.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_message_comment.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_message_indent.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_message_letter.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_message_like.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_message_system.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_payment.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_reception.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_refund.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_shipment.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/MineModule.xcassets/my_switch_off.imageset/Contents.json

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