Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
L
LuckFarm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lmj
LuckFarm
Commits
103b73c1
Commit
103b73c1
authored
Nov 13, 2020
by
Mazy
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts: GYDemo/GYDemo/AppDelegate.mm
parents
46889af2
a60910bf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
7 deletions
+20
-7
IOSADManager.m
GYDemo/GYDemo/SCAds/IOSADManager.m
+20
-7
UserInterfaceState.xcuserstate
...cuserdata/mazy.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
No files found.
GYDemo/GYDemo/SCAds/IOSADManager.m
View file @
103b73c1
...
...
@@ -12,6 +12,9 @@
#import "AddRuiShiADManager.h"
#import "AppDelegate.h"
#define TIMEOUT (30)
/// 广告工具类
@interface
IOSADManager
()
@property
(
nonatomic
,
retain
)
AddCSJADManager
*
csjAd
;
...
...
@@ -143,10 +146,17 @@ static IOSADManager * manager = nil;
}
}
else
{
static
int
timTouch
=
0
;
MBProgressHUD
*
hud
=
[
MBProgressHUD
showMessage
:
@"请稍等..."
];
hud
.
minShowTime
=
3
;
timTouch
+=
1
;
if
(
timTouch
>=
2
)
{
timTouch
=
0
;
self
.
haveLodeAD
=
NO
;
[
self
.
videoModels
removeObject
:
self
.
videoModels
.
firstObject
];
[
self
.
cachevideo
removeAllObjects
];
[
self
showADType
:
AdType
resultBlock
:
self
.
adShowBlock
];
}
self
.
showNow
=
YES
;
if
(
!
self
.
haveLodeAD
)
{
...
...
@@ -631,11 +641,6 @@ static IOSADManager * manager = nil;
}
// dispatch_queue_t queueglobal = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0);
//
// dispatch_async(queueglobal, ^{
//
// });
...
...
@@ -754,8 +759,16 @@ static IOSADManager * manager = nil;
[
self
.
bigImageModels
removeObject
:
self
.
bigImageModels
.
firstObject
];
}
}
// 广告超时
-
(
void
)
overtimeWith
:
(
GYAdsTrackModel
*
)
model
{
}
@end
farm.xcworkspace/xcuserdata/mazy.xcuserdatad/UserInterfaceState.xcuserstate
View file @
103b73c1
No preview for this file type
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment