From 20f8ba0de5a3cdf0f23ca22a54b1794f21e111ab Mon Sep 17 00:00:00 2001 From: juntao Date: Wed, 21 Oct 2020 16:53:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=A4=84=E7=90=86=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=95=B0=E6=8D=AE=E6=94=B6=E9=9B=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GHActivityLifecycleCallbacksImpl.java | 26 ++++++++++++------- .../java/com/gh/common/util/DialogUtils.java | 14 +++++----- .../main/java/com/halo/assistant/HaloApp.java | 6 ++--- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java b/app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java index d3ce26fe9a..ab4ad466e4 100644 --- a/app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java +++ b/app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java @@ -8,6 +8,7 @@ import com.gh.common.im.ImManager; import com.gh.common.notifier.Notifier; import com.gh.common.util.DataUtils; import com.gh.download.DownloadManager; +import com.halo.assistant.HaloApp; import com.lightgame.utils.AppManager; /** @@ -34,23 +35,28 @@ public class GHActivityLifecycleCallbacksImpl implements ActivityLifecycleCallba @Override public void onActivityResumed(Activity activity) { - - DataUtils.onResume(activity); CurrentActivityHolder.getActivitySet().add(activity); - ImManager.updateFloatingWindow(); - //FIXME 这里应该只是部分Activity需要 - try { - // 初始化gameMap - DownloadManager.getInstance(activity).initGameMap(); - } catch (Exception e) { - e.printStackTrace(); + + if (HaloApp.isUserAcceptPrivacyPolicy(activity)) { + DataUtils.onResume(activity); + ImManager.updateFloatingWindow(); + //FIXME 这里应该只是部分Activity需要 + try { + // 初始化gameMap + DownloadManager.getInstance(activity).initGameMap(); + } catch (Exception e) { + e.printStackTrace(); + } } } @Override public void onActivityPaused(Activity activity) { - DataUtils.onPause(activity); CurrentActivityHolder.getActivitySet().remove(activity); + + if (HaloApp.isUserAcceptPrivacyPolicy(activity)) { + DataUtils.onPause(activity); + } } @Override diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index f1a72b01dc..849e71b611 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -1030,7 +1030,7 @@ public class DialogUtils { @Override public void onClick(@NonNull View widget) { - MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击隐私政策"); +// MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击隐私政策"); Intent intent = WebActivity.getPrivacyPolicyIntent(activityContext); activityContext.startActivity(intent); } @@ -1046,7 +1046,7 @@ public class DialogUtils { @Override public void onClick(@NonNull View widget) { - MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击用户协议"); +// MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击用户协议"); activityContext.startActivity(WebActivity.getWebIntent(activityContext)); } }, skipText.length() - 15, skipText.length() - 11, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); @@ -1061,7 +1061,7 @@ public class DialogUtils { @Override public void onClick(@NonNull View widget) { - MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击第三方SDK接入说明"); +// MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击第三方SDK接入说明"); activityContext.startActivity(WebActivity.getThirdPartySdkStatementIntent(activityContext)); } }, skipText.length() - 10, skipText.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); @@ -1075,25 +1075,25 @@ public class DialogUtils { allowButton.setOnClickListener(view -> { dialog.dismiss(); callback.onCallback(); - MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击同意"); +// MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击同意"); }); disallowButton.setOnClickListener(v -> { dialog.dismiss(); showPrivacyPolicyDisallowDialog(activityContext, entity, callback); - MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "不同意并退出App"); +// MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "不同意并退出App"); }); dialog.setOnCancelListener(cd -> { if (isCanceledByClickOutsideOfDialog.get()) { - MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击空白"); +// MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击空白"); } }); dialog.setOnKeyListener((dialog1, keyCode, event) -> { if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) { isCanceledByClickOutsideOfDialog.set(false); - MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击返回"); +// MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击返回"); } return false; }); diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index d6485cbe17..397bea86bb 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -173,6 +173,8 @@ public class HaloApp extends TinkerAppLike { if (isUserAcceptPrivacyPolicy(getApplication())) { initPushSdk(); } + + registerActivityLifecycleCallbacks(new GHActivityLifecycleCallbacksImpl()); } public void postInit() { @@ -206,10 +208,6 @@ public class HaloApp extends TinkerAppLike { } }); } - - // 刷新内存中的用户信息，避免应用进程重建时因没有用户信息数据而显示为掉登录状态 - UserRepository.getInstance(getApplication()).getLoginUserInfo(); - registerActivityLifecycleCallbacks(new GHActivityLifecycleCallbacksImpl()); } /**