From 3af3d413c082f977a4afb27ca7ffbbbe0348b8dc Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Mon, 2 Sep 2024 14:31:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98=20https:?= =?UTF-8?q?//jira.shanqu.cc/browse/GHZSCY-6628?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenjuntao --- .../java/com/gh/common/provider/EntranceUtilsProviderImpl.kt | 2 +- app/src/main/java/com/gh/common/util/CheckLoginUtils.java | 2 +- app/src/main/java/com/gh/gamecenter/SkipActivity.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/gh/common/provider/EntranceUtilsProviderImpl.kt b/app/src/main/java/com/gh/common/provider/EntranceUtilsProviderImpl.kt index bcb3ffa92d..4ea98eb2a9 100644 --- a/app/src/main/java/com/gh/common/provider/EntranceUtilsProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/EntranceUtilsProviderImpl.kt @@ -24,7 +24,7 @@ class EntranceUtilsProviderImpl : IEntranceUtilsProvider { override fun jumpActivityWithCallback(context: Context, bundle: Bundle, callback: () -> Unit) { if (context is FragmentActivity && !context.supportFragmentManager.isDestroyed) { - EntranceUtils.jumpActivityCompat(context, null, bundle, object : Callback { + EntranceUtils.jumpActivityCompat(context, bundle, null, object : Callback { override fun onActivityResult(resultCode: Int, data: Intent?) { callback() } diff --git a/app/src/main/java/com/gh/common/util/CheckLoginUtils.java b/app/src/main/java/com/gh/common/util/CheckLoginUtils.java index e0b61e8124..2459169bf9 100644 --- a/app/src/main/java/com/gh/common/util/CheckLoginUtils.java +++ b/app/src/main/java/com/gh/common/util/CheckLoginUtils.java @@ -74,7 +74,7 @@ public class CheckLoginUtils { Bundle bundle = new Bundle(); bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance); bundle.putString(EntranceConsts.KEY_TO, LoginActivity.class.getName()); - EntranceUtils.jumpActivityCompat(context, nextToBundle, bundle, (resultCode, data) -> { + EntranceUtils.jumpActivityCompat(context, bundle, nextToBundle, (resultCode, data) -> { if (isTriggerNextStep && listener != null && isLogin()) { listener.onLogin(); } diff --git a/app/src/main/java/com/gh/gamecenter/SkipActivity.java b/app/src/main/java/com/gh/gamecenter/SkipActivity.java index 38330458bf..7c76d1da49 100644 --- a/app/src/main/java/com/gh/gamecenter/SkipActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SkipActivity.java @@ -419,7 +419,7 @@ public class SkipActivity extends BaseActivity { } else { Bundle newBundle = new Bundle(); newBundle.putString(EntranceConsts.KEY_TO, LoginActivity.class.getName()); - EntranceUtils.jumpActivityCompat(this, null, newBundle, (resultCode, data) -> { + EntranceUtils.jumpActivityCompat(this, newBundle, null, (resultCode, data) -> { if(CheckLoginUtils.isLogin()) { VHelper.INSTANCE.updateAuthorizeInfo(true); }