Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release' into dev

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/common/util/DialogUtils.java
#	app/src/main/java/com/gh/gamecenter/MainActivity.java
#	app/src/main/res/layout/dialog_privacy_policy.xml
#	dependencies.gradle
#	module_common/src/main/java/com/gh/gamecenter/common/utils/PermissionHelper.kt
This commit is contained in:
chenjuntao
2023-12-28 11:53:03 +08:00
parent 84d8de881e 423bcda7ff
commit c4b519204b
34 changed files with 253 additions and 909 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/com/gh/gamecenter/MainActivity.java
View File

@ -522,22 +522,26 @@ public class MainActivity extends BaseActivity {
float screenWidthInDp = DisplayUtils.px2dip(this, screenWidthInPx);
float screenHeightInDp = DisplayUtils.px2dip(this, screenHeightInPx);
AdDelegateHelper.requestSplashAd(
this,
screenWidthInPx,
screenHeightInPx,
screenWidthInDp,
screenHeightInDp,
startAdContainer,
sdkStartAdContainer,
adsFl,
(BaseHandler) mBaseHandler,
false,
() -> {
hideSplashAd();
return null;
}
);
if (startAdContainer != null && sdkStartAdContainer != null && adsFl != null) {
AdDelegateHelper.requestSplashAd(
this,
screenWidthInPx,
screenHeightInPx,
screenWidthInDp,
screenHeightInDp,
startAdContainer,
sdkStartAdContainer,
adsFl,
(BaseHandler) mBaseHandler,
false,
() -> {
hideSplashAd();
return null;
}
);
} else {
hideSplashAd();
}
} else {
hideSplashAd();
}