提交

QXLive/Other/AppDelegate.m

@@ -49,6 +49,7 @@
 #import <SDWebImageWebPCoder/SDWebImageWebPCoder.h>
 #import "QXAppStartViewController.h"
 #import "QXGiftPlayerManager.h"
+#import "QXGiftDisplayManager.h"
 #import "IQKeyboardManager.h"
 #import "QXChirldViewController.h"
 #import "QXMineNetwork.h"
@@ -258,14 +259,16 @@
     QXLOG(@"========app已经进入后台========");
     if ([QXGlobal.shareGlobal.roomId isExist]) {
         [[QXGiftPlayerManager shareManager] stopPlay];
+        [[QXGiftDisplayManager sharedManager] inBackGround];
     }
 }
 -(void)applicationWillResignActive:(UIApplication *)application{
     QXLOG(@"========app即将进入后台========");
 }
 -(void)applicationWillEnterForeground:(UIApplication *)application{
-    if ([QXGlobal.shareGlobal.roomId isExist] && (QXGlobal.shareGlobal.miniView==nil)) {
+    if ([QXGlobal.shareGlobal.roomId isExist]) {
         [[QXGiftPlayerManager shareManager] startPlay];
+        [[QXGiftDisplayManager sharedManager] becomeFront];
     }
 }
 

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

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "背景3@2x.png",
+      "filename" : "一键登录背景@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

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

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "app_home_bg@2x.png",
+      "filename" : "首页背景@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

QXLive/Other/Assets.xcassets/chat_buble/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_nor.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/home_rank_btn_bg_sel.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/home_rank_list_bg.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/home_rank_top_bg.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/home_rank_top_cp_name_bg.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/home_rank_top_name_bg.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/home_rank_vc_bg.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/my_rank_bg.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/rank_real_love_first_header.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/rank_real_love_second_header.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/rank_real_love_third_header.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/home/room_hot_icon.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/login/login_logo.imageset/Contents.json

@@ -5,7 +5,7 @@
       "scale" : "1x"
     },
     {
-      "filename" : "iPadProApp_83.5pt@2x.png",
+      "filename" : "login_logo.png",
       "idiom" : "universal",
       "scale" : "2x"
     },

QXLive/Other/Assets.xcassets/login/random.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/login/welcome_midi.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "welcome_midi@2x.png",
+      "filename" : "欢迎来到梵音@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "welcome_midi@3x.png",
+      "filename" : "欢迎来到梵音@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

QXLive/Other/Assets.xcassets/room/room_song_close.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/room_song_give.imageset/Contents.json

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

QXLive/Other/Assets.xcassets/room/room_song_next.imageset/Contents.json

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