Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	GYDemo/GYDemo.xcodeproj/project.pbxproj

GYDemo/GYDemo/Info.plist

@@ -75,5 +75,12 @@
 	</array>
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
+	<key>SKAdNetworkItems</key>
+	<array>
+		<dict>
+			<key>SKAdNetworkIdentifier</key>
+			<string>58922NB4GD.skadnetwork</string>
+		</dict>
+	</array>
 </dict>
 </plist>

GYDemo/GYDemo/SCAds/IOSADManager.m

@@ -408,7 +408,7 @@ static IOSADManager * manager = nil;
         if (self.advertisingSpace) {
             [[CGUserManager shared] addADLocCollection:self.advertisingSpace value:@"show_reward_video_ad" andADData:showData];
         }
-        dispatch_async(dispatch_get_main_queue(), ^{
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             if ([showData.adPlatform  isEqualToString:@"chuanshanjia"]) {
                 [weakSelf.csjAd showAdWithData:showData withADType:adType];
                 
@@ -422,6 +422,7 @@ static IOSADManager * manager = nil;
                 [weakSelf.ruishiAd showAdWithData:showData withADType:adType];
             }
         });
+        
         if (weakSelf.videoModels.count <= 1) {
             [weakSelf requestVideoAD];
         }else{