From e9515515312d0a5e20281f4fa30dee85ed14346e Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Wed, 27 Feb 2019 10:39:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=AD=94?= =?UTF-8?q?=E6=A1=88=E8=AF=A6=E6=83=85=E7=82=B9=E5=87=BB=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E4=BC=9A=E9=97=AA=E9=80=80=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/gamecenter/qa/answer/detail/AnswerDetailFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.java b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.java index 0c3efdf8b7..150844302d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.java @@ -586,6 +586,7 @@ public class AnswerDetailFragment extends NormalFragment { public void onMenuItemClick(MenuItem menuItem) { switch (menuItem.getItemId()) { case R.id.menu_more: + if (mDetailEntity == null) return; showMoreItemDialog(); break; case R.id.menu_collect: @@ -644,7 +645,7 @@ public class AnswerDetailFragment extends NormalFragment { } private void showMoreItemDialog() { - if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED) || mDetailEntity != null) { + if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) { View view = LayoutInflater.from(getContext()).inflate(R.layout.menu_answer_detail_more, null); Dialog dialog = new Dialog(getActivity()); dialog.setContentView(view); From 5ae22bd2bce275d0d8fac14d32472f797001d609 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Wed, 27 Feb 2019 10:40:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=B2=A1=E6=9C=89=E7=99=BB=E5=BD=95=E4=B9=9F=E8=83=BD?= =?UTF-8?q?=E7=9C=8B=E5=88=B0=E6=B6=88=E6=81=AF=E4=B8=AD=E5=BF=83=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/base/GHUmengNotificationService.kt | 7 +++++++ .../com/gh/gamecenter/receiver/UmengMessageReceiver.kt | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/base/GHUmengNotificationService.kt b/app/src/main/java/com/gh/base/GHUmengNotificationService.kt index b9e0098b37..98256ba19a 100644 --- a/app/src/main/java/com/gh/base/GHUmengNotificationService.kt +++ b/app/src/main/java/com/gh/base/GHUmengNotificationService.kt @@ -93,6 +93,13 @@ class GHUmengNotificationService : UmengMessageService() { return } + // 用户未登录的情况下不生成消息中心通知，避免用户掉登录了还收到跳转至消息中心的通知 + if (data != null + && data.link?.target == "system" + && !UserManager.getInstance().isLoggedIn) { + return + } + val clickIntent = Intent() val removeIntent = Intent() diff --git a/app/src/main/java/com/gh/gamecenter/receiver/UmengMessageReceiver.kt b/app/src/main/java/com/gh/gamecenter/receiver/UmengMessageReceiver.kt index 28cba6f24d..6f34ce9d31 100644 --- a/app/src/main/java/com/gh/gamecenter/receiver/UmengMessageReceiver.kt +++ b/app/src/main/java/com/gh/gamecenter/receiver/UmengMessageReceiver.kt @@ -40,7 +40,6 @@ class UmengMessageReceiver : BroadcastReceiver() { // 记录该推送通知被点击 UTrack.getInstance(context).trackMsgClick(msgObject) - // TODO 记录点击了推送 val msgId = intent.getStringExtra(GHUmengNotificationService.MESSAGE_ID) val pushId = intent.getStringExtra(GHUmengNotificationService.PUSH_ID) From 6b9cf7094e744af4b2eef650b13be5e951f8c463 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Wed, 27 Feb 2019 15:45:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=B7=E6=96=B0=E4=B8=8D=E5=8F=8A=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java index a0c5448221..05aa0dd633 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java @@ -334,8 +334,6 @@ public class ConcernFragment extends NormalFragment implements SwipeRefreshLayou // 关注事件 @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBConcernChanged changed) { - mConcernRecommendAdapter.concernGame(changed.getGameId()); - if (!isResumed()) { refresh(); } else { @@ -348,6 +346,7 @@ public class ConcernFragment extends NormalFragment implements SwipeRefreshLayou }); } } + mConcernRecommendAdapter.concernGame(changed.getGameId()); } // 登录事件