Compare commits
4 Commits
dev
...
pack/v5.38
| Author | SHA1 | Date | |
|---|---|---|---|
| dbf37e03eb | |||
| 60ca040c94 | |||
| e688ca1899 | |||
| ac19644333 |
@ -37,16 +37,16 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
|
||||
GlobalActivityManager.currentActivity = activity
|
||||
GlobalActivityManager.activityCount ++
|
||||
if (GlobalActivityManager.activityCount == 1 && isFromBackgroundToForeground) {
|
||||
if (AdDelegateHelper.shouldShowStartUpAd(true)
|
||||
&& !HaloApp.getInstance().isDisableSplashAdTemporarily
|
||||
&& activity !is SplashScreenActivity
|
||||
&& activity !is SkipActivity
|
||||
&& activity !is AuthorizationActivity
|
||||
&& activity !is SplashAdActivity
|
||||
&& !isSuggestionActivity(activity)
|
||||
) {
|
||||
activity.startActivity(SplashAdActivity.getIntent(activity))
|
||||
}
|
||||
// if (AdDelegateHelper.shouldShowStartUpAd(true)
|
||||
// && !HaloApp.getInstance().isDisableSplashAdTemporarily
|
||||
// && activity !is SplashScreenActivity
|
||||
// && activity !is SkipActivity
|
||||
// && activity !is AuthorizationActivity
|
||||
// && activity !is SplashAdActivity
|
||||
// && !isSuggestionActivity(activity)
|
||||
// ) {
|
||||
// activity.startActivity(SplashAdActivity.getIntent(activity))
|
||||
// }
|
||||
isFromBackgroundToForeground = false
|
||||
}
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ ext {
|
||||
// application info (每个大版本之间的 versionCode 增加 20)
|
||||
versionCode = 1114
|
||||
versionName = "5.38.4"
|
||||
applicationId = "com.gh.gamecenter"
|
||||
applicationId = "com.gh.gamecenter.a1"
|
||||
applicationIdGat = "com.gh.gamecenter.intl"
|
||||
|
||||
// AndroidX
|
||||
|
||||
@ -94,6 +94,12 @@ public class OkHttpCacheInterceptor implements Interceptor {
|
||||
String token = userManagerProvider.getToken();
|
||||
String deviceId = appProvider.getGid();
|
||||
String temporaryLocalDeviceId = appProvider.getTemporaryLocalDeviceId();
|
||||
String packageName = mContext.getPackageName();
|
||||
|
||||
request = request.newBuilder()
|
||||
.addHeader("PACKAGE", packageName)
|
||||
.build();
|
||||
|
||||
if (!TextUtils.isEmpty(token)) {
|
||||
request = request.newBuilder()
|
||||
.addHeader("TOKEN", token)
|
||||
|
||||
@ -216,6 +216,7 @@
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_marginBottom="64dp"
|
||||
android:gravity="center"
|
||||
android:visibility="invisible"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
|
||||
@ -77,7 +77,7 @@ done
|
||||
if [ $BUILD_WITH_INIT_GRADLE == false ]; then
|
||||
./gradlew assemble${BUILD_VARIANT_ENV}${BUILD_VARIANT_REGION^}Release -PBUILD_PUSH_TYPE=${BUILD_PUSH_TYPE}
|
||||
else
|
||||
./gradlew assemble${BUILD_VARIANT_ENV}${BUILD_VARIANT_REGION^}Release -I init.gradle -PBUILD_PUSH_TYPE=${BUILD_PUSH_TYPE}
|
||||
./gradlew assemble${BUILD_VARIANT_ENV}${BUILD_VARIANT_REGION^}Release -I init.gradle -PEXCLUDE_OPTIONAL_MODULES=true -PENABLE_PUSH=true -PENABLE_FEEDBACK=true -PENABLE_PKG=true -PENABLE_MESSAGE=true -PENABLE_FLOATING_WINDOW=true -PENABLE_SENTRY=true -PENABLE_OAID=true -PENABLE_SENSOR_DATA=true
|
||||
fi
|
||||
|
||||
mkdir -p release-app/${versionName}_${versionCode}
|
||||
|
||||
Reference in New Issue
Block a user