From c7cd56e7beae8eb34da154846bb692cb42277cdb Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Mon, 6 Apr 2020 10:05:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=89=E7=8E=AF=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E4=BC=98=E5=8C=96=E6=B1=87=E6=80=BB(4=E6=9C=88?= =?UTF-8?q?=E7=AC=AC1=E5=91=A8)=E7=9A=847,8,12=20https://gitlab.ghzs.com/p?= =?UTF-8?q?m/halo-app-issues/issues/824?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/base/BaseActivity.java | 3 +-- .../java/com/gh/common/util/ShareUtils.java | 23 +++++++++++++++---- .../gamecenter/qa/comment/CommentActivity.kt | 11 +++++++-- app/src/main/res/layout/activity_comment.xml | 4 ++-- .../main/res/layout/share_popup_layout.xml | 1 + app/src/main/res/values/styles.xml | 4 ++++ 6 files changed, 36 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index afcce83ad7..c81ebaca94 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -189,8 +189,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy } /** - * 可凭借此回调确定当前 activity 已经执行了 finish() 处于 isFinishing 状态 - * 可在后续进行 + * 此回调可用于确认当前 activity 已经执行了 finish() 方法并处于 isFinishing 状态 */ protected void onFinish() { diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java index 01a679c2e1..34af0bf9fe 100644 --- a/app/src/main/java/com/gh/common/util/ShareUtils.java +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -206,9 +206,9 @@ public class ShareUtils { arrLogo[7] = R.drawable.share_cancel_logo; } - popupWindow = new PopupWindow(contentView, LinearLayout.LayoutParams.MATCH_PARENT + popupWindow = new SharePopupWindow(contentView, LinearLayout.LayoutParams.MATCH_PARENT , LinearLayout.LayoutParams.MATCH_PARENT, true); - popupWindow.setAnimationStyle(R.style.mypopwindow_anim_style); + popupWindow.setAnimationStyle(R.style.popwindow_exit_only_anim_style); //解决PopupWindow无法覆盖状态栏 popupWindow.setClippingEnabled(false); @@ -655,5 +655,20 @@ public class ShareUtils { void onCancel(); } - -} + + private static class SharePopupWindow extends PopupWindow { + SharePopupWindow(View contentView, int width, int height, boolean focusable) { + super(contentView, width, height, focusable); + } + + @Override + public void dismiss() { + View backgroundView = getContentView().findViewById(R.id.share_container); + if (backgroundView != null) { + backgroundView.setBackgroundColor(Color.TRANSPARENT); + } + getContentView().postDelayed(super::dismiss, 0); + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt index a9e73d873e..963990fafa 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/CommentActivity.kt @@ -3,6 +3,7 @@ package com.gh.gamecenter.qa.comment import android.app.Activity import android.content.Context import android.content.Intent +import android.graphics.Color import android.os.Bundle import android.view.View import butterknife.OnClick @@ -11,6 +12,7 @@ import com.gh.common.util.DisplayUtils import com.gh.gamecenter.R import com.gh.gamecenter.qa.answer.detail.AnswerDetailFragment import com.lightgame.utils.Util_System_Keyboard +import kotlinx.android.synthetic.main.activity_comment.* class CommentActivity : BaseActivity() { @@ -69,15 +71,20 @@ class CommentActivity : BaseActivity() { commentCallback) } - supportFragmentManager.beginTransaction().replace(R.id.answer_comment_placeholder, commentFragment).commitNowAllowingStateLoss() + supportFragmentManager.beginTransaction().replace(R.id.answerCommentPlaceholderView, commentFragment).commitNowAllowingStateLoss() } - @OnClick(R.id.answer_comment_container) + @OnClick(R.id.answerCommentContainerView) fun finishActivity(view: View) { Util_System_Keyboard.hideSoftKeyboard(this) finish() } + override fun onFinish() { + super.onFinish() + answerCommentContainerView.setBackgroundColor(Color.TRANSPARENT) + } + companion object { const val ANSWER_ID = "answer_id" const val COMMENT_COUNT = "comment_count" diff --git a/app/src/main/res/layout/activity_comment.xml b/app/src/main/res/layout/activity_comment.xml index e83cf4fb9c..4fa5e34fb6 100644 --- a/app/src/main/res/layout/activity_comment.xml +++ b/app/src/main/res/layout/activity_comment.xml @@ -1,12 +1,12 @@ diff --git a/app/src/main/res/layout/share_popup_layout.xml b/app/src/main/res/layout/share_popup_layout.xml index a92e12bd88..1e8df2cd0e 100644 --- a/app/src/main/res/layout/share_popup_layout.xml +++ b/app/src/main/res/layout/share_popup_layout.xml @@ -1,5 +1,6 @@ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 7c01f12e22..4514a31729 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -126,6 +126,10 @@ + +