From 7e1da213d52b05e174bd147daff44325f9dd5ac5 Mon Sep 17 00:00:00 2001 From: "kehaoyuan@ghzhushou.com" Date: Fri, 13 Mar 2020 16:58:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=89=8D=E7=AB=AF=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=B1=87=E6=80=BB=EF=BC=882020=E5=B9=B43=E6=9C=88?= =?UTF-8?q?=E7=AC=AC2=E5=91=A8=EF=BC=89(7.9.10)https://gitlab.ghzs.com/pm/?= =?UTF-8?q?halo-app-issues/issues/805?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/SuggestionActivity.java | 10 ++++++++++ .../gh/gamecenter/message/MessageItemViewHolder.java | 7 +++++-- .../com/gh/gamecenter/qa/follow/AskFollowAdapter.kt | 12 +++++++----- .../assistant/fragment/game/GamePluginAdapter.java | 4 +--- app/src/main/res/layout/dialog_ask_follow_more.xml | 2 ++ 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 356f929f07..374362bd36 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -182,6 +182,8 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall private int mFunctionType = -1; + private String mCollectCancelPkgName = ""; + @NonNull public static Intent getIntent(Context context, SuggestType suggestType) { Intent intent = new Intent(context, SuggestionActivity.class); @@ -714,6 +716,10 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall back.setOnClickListener(v -> { MtaHelper.onEvent("意见反馈", "意见反馈-游戏收录弹窗", "点击返回"); dialog.dismiss(); + + if (mSelectGameEntity != null) { + mCollectCancelPkgName = mSelectGameEntity.getPackageName(); + } }); forcePost.setOnClickListener(v -> { MtaHelper.onEvent("意见反馈", "意见反馈-游戏收录弹窗", "点击不是我要的游戏，继续提交"); @@ -1023,6 +1029,10 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall @Override protected boolean handleBackPressed() { + if (mSelectGameEntity != null && mCollectCancelPkgName.equals(mSelectGameEntity.getPackageName())) { + return super.handleBackPressed(); + } + if (!TextUtils.isEmpty(mSuggestContentEt.getText().toString()) || !TextUtils.isEmpty(mSuggestGameName.getText().toString()) || !TextUtils.isEmpty(mLinkEt.getText().toString()) || diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java index 1d96ff4b42..0f1e453c5e 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java @@ -8,6 +8,7 @@ import android.widget.RelativeLayout; import com.gh.base.BaseActivity; import com.gh.base.BaseRecyclerViewHolder; import com.gh.base.OnListClickListener; +import com.gh.common.util.ClickUtils; import com.gh.common.util.DirectUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.ImageUtils; @@ -123,7 +124,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle()); images = messageEntity.getAnswer().getImages(); if (images.size() > 0) { - targetUrl=images.get(0); + targetUrl = images.get(0); mBinding.messageAskIcon.setVisibility(View.VISIBLE); mBinding.messageArticleIcon.setVisibility(View.GONE); } @@ -373,7 +374,9 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageUserMore.setOnClickListener(v -> { MessageEntity.Fold fold = messageEntity.getFold(); - if (fold != null) getFoldList(context, messageEntity.getFold().getResourceId()); + if (fold != null && !ClickUtils.isFastDoubleClick(mBinding.messageUserMore.getId(), 1000)) { + getFoldList(context, messageEntity.getFold().getResourceId()); + } }); mBinding.messageUserIcon.setOnClickListener(v -> { MtaHelper.onEvent("消息中心", mOuterInfo, "点击头像"); diff --git a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt index e761012a7c..3a0cbc84a8 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/follow/AskFollowAdapter.kt @@ -68,12 +68,14 @@ class AskFollowAdapter(val context: Context, val viewModel: AskFollowViewModel) userDesc.text = highlightedString userDesc.visibility = View.VISIBLE userDesc.setOnClickListener { - val dialog = AskFollowMoreDialog().apply { - userList = ArrayList(historyEntity.foldUsers) - this.type = "赞同$type" - this.path = "问答首页-关注折叠" + debounceActionWithInterval(userDesc.id, 1000) { + val dialog = AskFollowMoreDialog().apply { + userList = ArrayList(historyEntity.foldUsers) + this.type = "赞同$type" + this.path = "问答首页-关注折叠" + } + dialog.show((context as AppCompatActivity).supportFragmentManager, "more") } - dialog.show((context as AppCompatActivity).supportFragmentManager, "more") } userCommand.text = "赞同了$type" } else { diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java b/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java index e4220889e0..de2ee257fb 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GamePluginAdapter.java @@ -6,7 +6,6 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; -import com.gh.common.AppExecutor; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.DownloadItemUtils; @@ -106,8 +105,7 @@ public class GamePluginAdapter extends BaseRecyclerAdapter { for (int position = 0; position < mPluginList.size(); position++) { GameEntity pluginEntity = mPluginList.get(position); if (downloadEntity.getName().equals(pluginEntity.getName())) { - int finalPosition = position; - AppExecutor.getUiExecutor().execute(() -> notifyItemChanged(finalPosition)); + notifyItemChanged(position); } } } diff --git a/app/src/main/res/layout/dialog_ask_follow_more.xml b/app/src/main/res/layout/dialog_ask_follow_more.xml index cfa4121e59..bf99ad176a 100644 --- a/app/src/main/res/layout/dialog_ask_follow_more.xml +++ b/app/src/main/res/layout/dialog_ask_follow_more.xml @@ -8,6 +8,8 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:layout_marginBottom="20dp" android:background="@color/all_white" android:gravity="center" android:orientation="vertical"