优化提交

QXLive/Tabbar/QXTabbarController.m

@@ -30,6 +30,7 @@
 #import "QXMessageServices.h"
 
 #import "QXMeetActivityDriftView.h" // 巡乐会
+#import "QXChirldModeViewController.h"
 
 @interface QXTabbarController ()<UITabBarControllerDelegate,QXTabBarDelegate,UINavigationControllerDelegate,MQTTClientModelDelegate,V2TIMConversationListener>
 @property(nonatomic,strong) QXTabBar *customTabBar;
@@ -55,7 +56,8 @@
         return;
     }
     if (QXGlobal.shareGlobal.isLogin) {
-        [self performSelector:@selector(popChirldView) afterDelay:1];
+//        [self performSelector:@selector(popChirldView) afterDelay:1];
+        [self popChirldView];
     }
     QXLOG(@"视图即将展示");
 }
@@ -87,7 +89,8 @@
     }];
 }
 -(void)pushToChirld{
-    QXChirldViewController *vc = [[QXChirldViewController alloc] init];
+    QXChirldModeViewController *vc = [[QXChirldModeViewController alloc] init];
+    vc.type = 0;
     [self.navigationController pushViewController:vc animated:YES];
 }
 
@@ -258,9 +261,26 @@
 
 -(void)socketManager:(NSString *)socketManager receivedMessage:(NSDictionary *)message topic:(NSString *)topic{
     if ([topic isEqualToString:qx_room_topic]) {
-        QXGiftScrollModel *model = [QXGiftScrollModel yy_modelWithJSON:message[@"msg"][@"list"]];
-        [self.homeVC giftScrollViewShowWithModel:model];
-        [[QXGiftDriftView shareView] addGiftModel:model];
+//        NSDictionary*dict = message[@"msg"];
+//        BOOL isList = YES;
+//        for (NSString *key in dict.allKeys) {
+//            if ([key isEqualToString:@"list"]) {
+//                isList = NO;
+//                break;
+//            }
+//        }
+//        if (isList) {
+            NSArray *array = [NSArray yy_modelArrayWithClass:[QXGiftScrollModel class] json:message[@"msg"][@"list"]];
+            if (array.count == 0) {
+                return;
+            }
+            [self.homeVC giftScrollViewShowWithModelList:array];
+            [[QXGiftDriftView shareView] addGiftModelList:array];
+//        }else{
+//            QXGiftScrollModel *model = [QXGiftScrollModel yy_modelWithJSON:message[@"msg"][@"list"]];
+//            [self.homeVC giftScrollViewShowWithModel:model];
+//            [[QXGiftDriftView shareView] addGiftModel:model];
+//        }
     }else if([topic isEqualToString:qx_ac_topic]){
         QXMeetActivityDriftModel *model = [QXMeetActivityDriftModel yy_modelWithJSON:message[@"msg"]];
         [[QXMeetActivityDriftView shareView] addActivityModel:model];