bug修复

RainbowPlanet/RainbowPlanet/Base/BaseTabbarViewController/BaseTabbarViewController.swift

@@ -82,29 +82,31 @@ class BaseTabbarViewController: ESTabBarController {
     static let shared : BaseTabbarViewController = BaseTabbarViewController()
     
     /// 社区
-    var v1 = CommunityViewController()
+    var v1 : CommunityViewController!
     /// 商城
-//    var v2 = ShoppingMallViewController()
+//    var v2 = ShoppingMallViewController!
     /// 兑换专区
-    var v2 = RedemptionAreaViewController()
+    var v2 : RedemptionAreaViewController!
     /// 发布
-    var v3 = UIViewController()
+    var v3 : UIViewController!
     /// 消息
-    var v4 = MessageMainViewController()
+    var v4 : MessageMainViewController!
     /// 我的
-    var v5 = UserPersonalCenterViewController()
+    var v5 : UserPersonalCenterViewController!
     
     /// 社区
-    let lottieAnimateContentView1 = BaseLottieAnimateContentView(jsonStr: "communityModuleTabbar")
+    var lottieAnimateContentView1 : BaseLottieAnimateContentView!
     
     /// 商城
-    let lottieAnimateContentView2 = BaseLottieAnimateContentView(jsonStr: "shoppingMallModuleTabbar")
+    var lottieAnimateContentView2 : BaseLottieAnimateContentView!
     
     /// 消息
-    let lottieAnimateContentView4 = BaseLottieAnimateContentView(jsonStr: "messageModuleTabbar")
+    var lottieAnimateContentView4 : BaseLottieAnimateContentView!
     
     /// 我的
-    let lottieAnimateContentView5 = BaseLottieAnimateContentView(jsonStr: "MineModuleTabbar")
+    var lottieAnimateContentView5 : BaseLottieAnimateContentView!
+    
+    
     
     var lastIndex : Int = 0
 
@@ -136,6 +138,31 @@ class BaseTabbarViewController: ESTabBarController {
             }
         }
         
+        /// 社区
+        v1 = CommunityViewController()
+        /// 商城
+        //    var v2 = ShoppingMallViewController!
+        /// 兑换专区
+        v2 = RedemptionAreaViewController()
+        /// 发布
+        v3 = UIViewController()
+        /// 消息
+        v4 = MessageMainViewController()
+        /// 我的
+        v5 = UserPersonalCenterViewController()
+        
+        /// 社区
+        lottieAnimateContentView1 = BaseLottieAnimateContentView(jsonStr: "communityModuleTabbar")
+        
+        /// 商城
+        lottieAnimateContentView2 = BaseLottieAnimateContentView(jsonStr: "shoppingMallModuleTabbar")
+        
+        /// 消息
+        lottieAnimateContentView4 = BaseLottieAnimateContentView(jsonStr: "messageModuleTabbar")
+        
+        /// 我的
+        lottieAnimateContentView5 = BaseLottieAnimateContentView(jsonStr: "MineModuleTabbar")
+        
         v1.tabBarItem = ESTabBarItem.init(lottieAnimateContentView1, title: "社区", image: UIImage(named: "tabbar_home")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: nil)
         v2.tabBarItem = ESTabBarItem.init(lottieAnimateContentView2, title: "商城", image: UIImage(named: "tabbar_shopping"), selectedImage: nil)
         v3.tabBarItem = UITabBarItem(title: nil, image: UIImage(named: "tabbar_publish")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal), selectedImage: UIImage(named: "tabbar_publish")?.withRenderingMode(UIImage.RenderingMode.alwaysOriginal))

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

@@ -40,7 +40,6 @@ class CommunityViewController: BaseViewController {
         view.addSubview(listContainerView)
         view.addSubview(navigationBarbgView)
         view.addSubview(communityNavigationBarView)
-    
         
     }
     

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

@@ -11,6 +11,10 @@ import SwiftyMediator
 
 class MessagePlanetActivityController: BaseViewController {
     
+    deinit {
+        NXLLog("deinit")
+    }
+    
     var messageShowTypes : String = ""
     var messageDataModels = Array<MessageDataModel>()
     
@@ -19,7 +23,6 @@ class MessagePlanetActivityController: BaseViewController {
         setupViews()
         setupLayouts()
         setupData()
-        
     }
     
     override func setupViews() {
@@ -69,6 +72,8 @@ extension MessagePlanetActivityController {
     func userMemberMessageList(page:Int) {
         SwiftMoyaNetWorkServiceUser.shared().userMemberMessageListApi(messageShowTypes: self.messageShowTypes, page: page) {
             [weak self] (messageListModel) -> (Void) in
+            
+            
             let messageListModel = messageListModel as? MessageListModel
             if messageListModel?.pagination?.currentPage ?? 1  <= messageListModel?.pagination?.totalPages ?? 1 {
                 if messageListModel?.pagination?.currentPage == 1{
@@ -77,7 +82,7 @@ extension MessagePlanetActivityController {
                 self?.messageDataModels = (self?.messageDataModels)! + (messageListModel?.data!)!
                 self?.tableView.reloadData()
                 if  self?.messageDataModels.count ?? 0 >= messageListModel?.pagination?.total ?? 0 {
-                    self?.tableView.isHiddenFooter(true)
+                    self?.tableView.endFooterNoMoreData()
                 }
             }else {
                 self?.tableView.endFooterNoMoreData()

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

@@ -115,20 +115,13 @@ class PersonViewUserAndOtherListCollectionViewCell: UICollectionViewCell {
             }else {
                 videoImageView.isHidden = true
             }
-            if uid == UserModel.shared().getModel()?.uid {
-                if type != 0 {
-                    rainbowBeanImageView.isHidden = true
-                    rainbowBeanNumberLabel.isHidden = true
-                }else {
-                    rainbowBeanImageView.isHidden = false
-                    rainbowBeanNumberLabel.isHidden = false
-                }
-
+            if type == 0 {
+                rainbowBeanImageView.isHidden = false
+                rainbowBeanNumberLabel.isHidden = false
             }else {
                 rainbowBeanImageView.isHidden = true
                 rainbowBeanNumberLabel.isHidden = true
             }
-            
         }
     }
     var uid: Int?

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/Common/ResourceManager/Views/AliyunEffectFilterCell.xib

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
+    <device id="retina6_1" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>

RainbowPlanet/RainbowPlanet/Router/RouterManager.swift

@@ -59,8 +59,8 @@ class RouterManager: NSObject {
         case .recommend?: //推荐
             let vc = UIViewController.topMost
             let v1 = BaseTabbarViewController.shared.v1
-            v1.reloadSegmentedView()
-            v1.tabBarController?.selectedIndex = 0
+            v1?.reloadSegmentedView()
+            v1?.tabBarController?.selectedIndex = 0
             if vc?.presentingViewController != nil {
                 vc?.dismissToWindowRootViewController(animated: false, completion: {
                     
@@ -72,8 +72,8 @@ class RouterManager: NSObject {
         case .star?: //星球
             let vc = UIViewController.topMost
             let v1 = BaseTabbarViewController.shared.v1
-            v1.reloadSegmentedStarView()
-            v1.tabBarController?.selectedIndex = 0
+            v1?.reloadSegmentedStarView()
+            v1?.tabBarController?.selectedIndex = 0
             if vc?.presentingViewController != nil {
                 vc?.dismissToWindowRootViewController(animated: false, completion: {
                     

RainbowPlanet/RainbowPlanet/Tools/MJRefreshEX/UIScrollView+MJRefreshEX.m

@@ -79,15 +79,16 @@ typedef void(^LoadMoreBlock)(NSInteger pageIndex);
 
 - (void)addFooterWithWithHeaderWithAutomaticallyRefresh:(BOOL)automaticallyRefresh loadMoreBlock:(void(^)(NSInteger pageIndex))loadMoreBlock{
     
+    __weak typeof(self) weakSelf = self;
     self.loadMoreBlock = loadMoreBlock;
     
     if (automaticallyRefresh) {
         MJRefreshAutoNormalFooter * footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-            self.pageIndex += 1;
-            if (self.loadMoreBlock) {
-                self.loadMoreBlock(self.pageIndex);
+            weakSelf.pageIndex += 1;
+            if (weakSelf.loadMoreBlock) {
+                weakSelf.loadMoreBlock(weakSelf.pageIndex);
             }
-            [self endFooterRefresh];
+            [weakSelf endFooterRefresh];
         }];
 
         footer.automaticallyRefresh = automaticallyRefresh;
@@ -100,14 +101,13 @@ typedef void(^LoadMoreBlock)(NSInteger pageIndex);
         [footer setTitle:@"这是我的底线啦~" forState:MJRefreshStateNoMoreData];
 
         self.mj_footer = footer;
-    }
-    else{
+    } else{
         MJRefreshBackNormalFooter * footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
-            self.pageIndex += 1;
-            if (self.loadMoreBlock) {
-                self.loadMoreBlock(self.pageIndex);
+            weakSelf.pageIndex += 1;
+            if (weakSelf.loadMoreBlock) {
+                weakSelf.loadMoreBlock(weakSelf.pageIndex);
             }
-            [self endFooterRefresh];
+            [weakSelf endFooterRefresh];
         }];
 
         footer.stateLabel.font = [UIFont systemFontOfSize:13.0];