合并

QXLive/Other/AppDelegate+Login.m

@@ -62,6 +62,7 @@
         [[NSNotificationCenter defaultCenter] postNotificationName:noticeTencentLogin object:nil];
         [TIMPushManager addPushListener:self];
         [[V2TIMManager sharedInstance] addConversationListener:self];
+        [[QXRoomMessageManager shared] addC2CObserver];
         [self configAppPush];
         [self getHomeMessage];
         [V2TIMManager.sharedInstance addIMSDKListener:self];
@@ -112,7 +113,7 @@
 }
 -(void)takeOff{
     if(QXGlobal.shareGlobal.roomId.length > 0){
-        [[QXGlobal shareGlobal] quitRoomWithRoomId:QXGlobal.shareGlobal.roomId];
+        [[QXGlobal shareGlobal] quitRoomWithRoomId:QXGlobal.shareGlobal.roomId removeListener:YES];
     }
     self.tabbarVC.selectedIndex = 3;
     QXBaseNavigationController *tabbarNa = (QXBaseNavigationController *)self.tabbarVC.selectedViewController;

QXLive/Other/AppDelegate.m

@@ -53,7 +53,9 @@
 #import "IQKeyboardManager.h"
 #import "QXChirldViewController.h"
 #import "QXMineNetwork.h"
+#import "QXHomePageNetwork.h"
 #import "QXRoomNavigationController.h"
+#import "QXInvitePopView.h"
 #if DEBUG
 #import <LLDebugTool.h>
 #endif
@@ -261,18 +263,49 @@
     if ([QXGlobal.shareGlobal.roomId isExist]) {
         [[QXGiftPlayerManager shareManager] stopPlay];
         [[QXGiftDisplayManager sharedManager] inBackGround];
+        [[QXGlobal shareGlobal] dirfViewDidToBackground];
     }
 }
 -(void)applicationWillResignActive:(UIApplication *)application{
     QXLOG(@"========app即将进入后台========");
 }
 -(void)applicationWillEnterForeground:(UIApplication *)application{
+    QXLOG(@"========app从后台回到前台========");
     if ([QXGlobal.shareGlobal.roomId isExist]) {
         [[QXGiftPlayerManager shareManager] startPlay];
         [[QXGiftDisplayManager sharedManager] becomeFront];
+        [[QXGlobal shareGlobal] dirfViewBecomeToFront];
+    }else{
+        [self getRecommendRoom];
     }
 }
+-(void)getRecommendRoom{
+    if (QXGlobal.shareGlobal.isLogin) {
+        [QXHomePageNetwork getRecommendRoomSuccessBlock:^(QXRoomListModel * _Nonnull model) {
+            [self popInviteWithModel:model];
+        } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) {
+            
+        }];
+    }
+}
+-(void)popInviteWithModel:(QXRoomListModel*)model{
+    __block QXRoomListModel *roomModel = model;
+    QXInvitePopView *view = [[QXInvitePopView alloc] init];
+    view.model = model;
+    view.closeActionBlock = ^{
+        [[QXGlobal shareGlobal].alertViewController hideViewFinishBlock:^{
+            QXLOG(@"页面关闭");
+            
+        }];
+    };
+    view.agreeActionBlock = ^{
+        [[QXGlobal shareGlobal] joinRoomWithRoomId:roomModel.room_id isRejoin:NO navagationController:(UINavigationController*)KEYWINDOW.rootViewController];
+    };
 
+    [[QXGlobal shareGlobal] showView:view popType:(PopViewTypeTopToCenter) tapDismiss:NO finishBlock:^{
+        
+    }];
+}
 /// 设备转向
 - (UIInterfaceOrientationMask)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(UIWindow *)window {
 //    ZFInterfaceOrientationMask orientationMask = [ZFLandscapeRotationManager supportedInterfaceOrientationsForWindow:window];

QXLive/Other/Assets.xcassets/app_one_login_icon.imageset/Contents.json

@@ -5,12 +5,11 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Home@2x.png",
+      "filename" : "app_one_login_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Home@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/drif/nobility_drif_join_room_bg.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/body_price_rule_bg.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/mine_edit_btn.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/mine_header_room.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Mask group@2x.png",
+      "filename" : "mine_header_room@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Mask group@3x.png",
+      "filename" : "mine_header_room@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/mine/mine_live_gift_corn.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "花瓣素材_金色的3D立体金币元素_101119090 1@2x.png",
+      "filename" : "mine_live_gift_corn@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "花瓣素材_金色的3D立体金币元素_101119090 1@3x.png",
+      "filename" : "mine_live_gift_corn@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/mine/mine_nobility_bg.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Customer Support@2x.png",
+      "filename" : "mine_nobility_bg@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Customer Support@3x.png",
+      "filename" : "mine_nobility_bg@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/mine/mine_recharge_corn.imageset/Contents.json

@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "花瓣素材_金色的3D立体金币元素_101119090 1@2x.png",
+      "filename" : "mine_recharge_corn@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "mine_recharge_corn@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/mine/mine_redbag.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Frame@2x.png",
+      "filename" : "mine_redbag@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Frame@3x.png",
+      "filename" : "mine_redbag@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/mine/mine_setting.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Setting@2x.png",
+      "filename" : "mine_setting@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Setting@3x.png",
+      "filename" : "mine_setting@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/mine/mine_tools_friend.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/mine_tools_guild.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/mine_tools_recharge.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/mine_tools_room.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/mine_tools_shop.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/mine_usercode_isLiang.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Mask group@2x.png",
+      "filename" : "mine_usercode_isLiang@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Mask group@3x.png",
+      "filename" : "mine_usercode_isLiang@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/mine/service_bag.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Frame@2x.png",
+      "filename" : "service_bag@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Frame@3x.png",
+      "filename" : "service_bag@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/mine/service_customer_service.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/service_dress.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Frame@2x.png",
+      "filename" : "service_dress@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Frame@3x.png",
+      "filename" : "service_dress@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/mine/service_help.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/service_invite.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/service_level.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Award, Trophy@2x.png",
+      "filename" : "service_level@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Award, Trophy@3x.png",
+      "filename" : "service_level@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/mine/service_my_family.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/service_report.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/service_setting.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/mine/service_singer_auth.imageset/Contents.json

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