提交

QXLive/Other/AppDelegate.m

@@ -46,6 +46,7 @@
 #import <Bugly/Bugly.h>
 #import <AlipaySDK/AlipaySDK.h>
 #import <TIMPush/TIMPushManager.h>
+#import <XHLaunchAd.h>
 #import <SDWebImageWebPCoder/SDWebImageWebPCoder.h>
 #import "QXAppStartViewController.h"
 #import "QXGiftPlayerManager.h"
@@ -86,6 +87,7 @@
     SDImageWebPCoder *webPCoder = [SDImageWebPCoder sharedCoder];
     [IQKeyboardManager sharedManager].enable = NO;
     [[SDImageCodersManager sharedManager] addCoder:webPCoder];
+    [self startVideo];
     [self configThirdPartLogin];
 #if DEBUG
     [[LLDebugTool sharedTool] startWorking];
@@ -289,6 +291,9 @@
     }
 }
 -(void)popInviteWithModel:(QXRoomListModel*)model{
+    if ([KEYWINDOW.rootViewController isKindOfClass:[QXAppStartViewController class]]) {
+        return;
+    }
     QXRoomNavigationController*na = (QXRoomNavigationController*)KEYWINDOW.rootViewController;
     if ([na.visibleViewController isKindOfClass:[QXAlertViewController class]]) {
         return;
@@ -353,4 +358,21 @@
 - (void)onNotificationClicked:(NSString *)ext {
         // 获取 ext 自定义跳转
 }
+-(void)startVideo{
+    [XHLaunchAd setLaunchSourceType:SourceTypeLaunchScreen];
+//    [XHLaunchAd setWaitDataDuration:1];
+    //配置广告数据
+    XHLaunchVideoAdConfiguration *videoAdconfiguration = [XHLaunchVideoAdConfiguration defaultConfiguration];
+//    NSString *path = [[NSBundle mainBundle] pathForResource:@"app_start" ofType:@"mp4"];
+    videoAdconfiguration.videoNameOrURLString = @"app_start.mp4";
+    videoAdconfiguration.duration = 2;
+    videoAdconfiguration.skipButtonType = SkipTypeNone;
+    [XHLaunchAd videoAdWithVideoAdConfiguration:videoAdconfiguration];
+    //广告图片URLString/或本地图片名(.jpg/.gif请带上后缀)
+//    imageAdconfiguration. = model.img;
+//    //广告点击打开页面参数(openModel可为NSString,模型,字典等任意类型)
+//    imageAdconfiguration.openModel = model;
+//    //显示开屏广告
+//    [XHLaunchAd imageAdWithImageAdConfiguration:imageAdconfiguration delegate:self];
+}
 @end

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

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

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

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

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

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

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

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

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

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

QXLive/Other/NoitceAndKey.h

@@ -34,7 +34,8 @@ static NSString *const FaceAuthLicense = @"Fq0Sj4UpfryHBB3inAxCwLmJUw3nNGc42mqvv
 static NSInteger const TencentIMID = 1600096890;
 static NSString *const TencentIMSecret = @"448a3259085924f89957c1884c761974e8fded64b9ab1c67b8e0a5a1c4b68f3f";
 
-static NSString *const AddressOfMQTTServer = @"1.13.181.248";
+//static NSString *const AddressOfMQTTServer = @"1.13.181.248";
+static NSString *const AddressOfMQTTServer = @"test.vespa.qxyushen.top";
 static NSInteger const AddressOfMQTTPort = 1883;
 static NSInteger const AppPushId = 46164;
 
@@ -58,7 +59,8 @@ static NSString *const FaceAuthLicense = @"P6N+VYfdu1Op5p+QwUGdI4y64PqOnxMzChX2S
 static NSInteger const TencentIMID = 1600096860;
 static NSString *const TencentIMSecret = @"d9a5b8088ed39113d0c92ae434bc37528c4715c1f1d2eaedb172134eacd06103";
 
-static NSString *const AddressOfMQTTServer = @"1.13.20.30";
+//static NSString *const AddressOfMQTTServer = @"1.13.20.30";
+static NSString *const AddressOfMQTTServer = @"yushengapi.qxyushen.top";
 static NSInteger const AddressOfMQTTPort = 1883;
 
 static NSInteger const AppPushId = 46163;
@@ -90,6 +92,7 @@ static NSString *const OSSEndPoint = @"oss-cn-beijing.aliyuncs.com";
 //static NSString *const  IMG_FILE_BASE_PATH = @"ios_images/";
 static NSString *const  IMG_FILE_BASE_PATH = @"images/ios_images/";
 static NSString *const  AUDIO_FILE_BASE_PATH = @"audios/ios_audios/";
+static NSString *const  LOG_FILE_BASE_PATH = @"iosAppLog/";
 static NSString *const  VIDEO_FILE_BASE_PATH = @"ios/videos/";
 static NSString *const  CHAT_IMG_FILE_BASE_PATH = @"emchat/image/ios/";
 static NSString *const  CHAT_VIDEO_FILE_BASE_PATH = @"emchat/videos/ios";
@@ -108,6 +111,8 @@ static NSString *const kWalletRuleHide = @"kWalletRuleHide";
 static NSString *const kChirldLocalPassword = @"kChirldLocalPassword";
 /// 是否开启飘屏
 static NSString *const kIsCloseDrifPop = @"kIsCloseDrifPop";
+/// 红包音效是否播放
+static NSString *const kIsCloseRedBagSound = @"kIsCloseRedBagSound";
 /// 是否可以聊天
 static NSString *const kIsCanChat = @"kIsCanChat";
 /// 充值多少钱可以聊天

QXLive/Other/PrefixHeader.pch

@@ -36,7 +36,7 @@
 #import "QXBaseNavigationController.h"
 #import "QXRoomNavigationController.h"
 #import "QXCOSUploadManager.h"
-
+#import "QXLogger.h"
 
 #import "QXLive-Bridging-Header.h"
 #endif /* PrefixHeader_pch */

QXLive/Other/QXApi.h

@@ -562,4 +562,11 @@ static NSString * QXAppSign = @"api/Tasks/dailyTasksSign";
 static NSString * QXAppSignStatus = @"api/Tasks/dailyTasksSignStatus";
 /// 每日任务未领取数量
 static NSString * QXAppTaskWaitDraw = @"api/Tasks/dailyTasksUnReceiveCount";
+
+/// 上传日志
+static NSString * QXAppLogReport = @"api/Report/android_log_report";
+/// 活动状态
+static NSString * QXActivityStatus = @"api/BlindBoxTurntable/blind_box_status";
+/// 加入房间
+static NSString * QXBeforeJoinRoom = @"api/Room/before_join_room_check";
 #endif /* Api_h */