From 50214e7461b7de648e92a3e37dd67501f06e43d2 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Fri, 6 Mar 2020 12:02:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=E7=9A=84=E6=97=A0=E5=93=8D?= =?UTF-8?q?=E5=BA=94=E9=97=AE=E9=A2=98(=E6=94=B9=E4=BA=86=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E5=8F=88=E4=B8=8D=E8=83=BD=E9=98=B2=E6=AD=A2=E6=8A=96?= =?UTF-8?q?=E5=8A=A8=E4=BA=86)=20=20=E7=A4=BE=E5=8C=BA=E9=97=AE=E7=AD=94/?= =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=8F=91=E8=A1=A8=E8=AF=84=E8=AE=BA=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E5=85=B3=E9=97=AD=E8=AF=84=E8=AE=BA=E5=92=8C=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E7=8A=B6=E6=80=81=20=20=E4=BF=AE=E6=94=B9=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E8=AF=84=E8=AE=BA/=E8=B5=84=E8=AE=AF=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E5=8F=AF=E4=BB=A5=E5=9B=9E=E5=A4=8D=E8=87=AA=E5=B7=B1?= =?UTF-8?q?=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/util/ErrorHelper.kt | 1 + .../com/gh/gamecenter/adapter/CommentDetailAdapter.java | 5 ++--- .../com/gh/gamecenter/adapter/MessageDetailAdapter.java | 5 ++--- .../gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt | 1 - .../game/horizontal/GameHorizontalSlideAdapter.kt | 1 - .../com/gh/gamecenter/newsdetail/NewsDetailAdapter.java | 5 ++--- .../java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt | 6 ++++-- app/src/main/res/layout/game_head_item.xml | 2 +- 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/ErrorHelper.kt b/app/src/main/java/com/gh/common/util/ErrorHelper.kt index edc68c651a..15af55e0b6 100644 --- a/app/src/main/java/com/gh/common/util/ErrorHelper.kt +++ b/app/src/main/java/com/gh/common/util/ErrorHelper.kt @@ -115,6 +115,7 @@ object ErrorHelper { 403074 -> Utils.toast(context, "该微信号（${errorEntity.data?.nickname}）已绑定") 403078 -> Utils.toast(context, "已点赞") 403072 -> Utils.toast(context, R.string.comment_failed_userblocked) + 403082 -> Utils.toast(context, "作者已关闭评论") 403020 -> if (showHighPriorityHint) { DialogUtils.showAlertDialog(context, diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java index d80209bf89..5ed2f4426a 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java @@ -184,9 +184,8 @@ public class CommentDetailAdapter extends BaseRecyclerAdapter { commentEntity, holder.commentLikeCountTv, holder.commentLikeIv, null))); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { + holder.itemView.setOnClickListener(v -> { + if (holder.commentReply.getVisibility() == View.VISIBLE) { CheckLoginUtils.checkLogin(mContext, "资讯文章-评论-回复", () -> { mOnCommentCallBackListener.onCommentCallback(commentEntity); }); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index 93c7b1eabf..3cc681fc68 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -411,9 +411,8 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { }) )); - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { + holder.itemView.setOnClickListener(v -> { + if (holder.commentReply.getVisibility() == View.VISIBLE) { CheckLoginUtils.checkLogin(mContext, "资讯文章详情-评论详情-回复", () -> { mOnCommentCallBackListener.onCommentCallback(finalCommentEntity); }); diff --git a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt index 750b8b6b5e..071b54df3a 100644 --- a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt @@ -71,7 +71,6 @@ class GameHorizontalAdapter(context: Context, StringUtils.buildString("(游戏-专题:", mSubjectEntity.name, "-列表[", (position + 1).toString(), "])"), exposureEventList!![position]) } } - holder.binding.executePendingBindings() } // notifyDataSetChanged 会出现页面抖动情况 diff --git a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideAdapter.kt index 9dc9a2594d..f960e82d46 100644 --- a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideAdapter.kt @@ -64,7 +64,6 @@ class GameHorizontalSlideAdapter(context: Context, StringUtils.buildString("(游戏-专题:", mSubjectEntity.name, "-列表[", (position + 1).toString(), "])")) } } - holder.binding.executePendingBindings() } // notifyDataSetChanged 会出现页面抖动情况 diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index 53669f47bd..fbb4f9fa3f 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -603,9 +603,8 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { viewHolder.commentLikeIv, null))); // 资讯文章详情回复 直接跳转至评论详情 - viewHolder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { + viewHolder.itemView.setOnClickListener(v -> { + if (viewHolder.commentReply.getVisibility() == View.VISIBLE) { CheckLoginUtils.checkLogin(mContext, "资讯文章详情-评论-回复", () -> { mContext.startActivity(MessageDetailActivity.getMessageDetailIntent(mContext, commentEntity, mNewsDetailEntity.getId())); }); diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt index b9a82aa7b2..71e2dfae4d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt @@ -119,8 +119,10 @@ class NewCommentAdapter(context: Context, } holder.itemView.setOnClickListener { - mContext.ifLogin("回答详情-评论-回复") { - mCommentCallBackListener.onCommentCallback(commentEntity) + if (holder.commentReply.visibility == View.VISIBLE) { + mContext.ifLogin("回答详情-评论-回复") { + mCommentCallBackListener.onCommentCallback(commentEntity) + } } } diff --git a/app/src/main/res/layout/game_head_item.xml b/app/src/main/res/layout/game_head_item.xml index c0fa5a87dd..4d0fa78cbc 100644 --- a/app/src/main/res/layout/game_head_item.xml +++ b/app/src/main/res/layout/game_head_item.xml @@ -34,7 +34,7 @@ Date: Fri, 6 Mar 2020 14:28:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=A4=9A=E6=AC=A1=E8=BE=93=E5=85=A5=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E5=85=B3=E9=94=AE=E5=AD=97=E6=97=B6=EF=BC=8C=E5=8F=AA?= =?UTF-8?q?=E6=9C=89=E9=A6=96=E6=AC=A1=E8=A7=A6=E5=8F=91=E7=9A=84=E9=97=AE?= =?UTF-8?q?=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/SearchActivity.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt index 5d6b57a89a..32632900c2 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt @@ -118,6 +118,7 @@ open class SearchActivity : BaseActivity() { val newSearchKey = editable.toString().trim { it <= ' ' } if (newSearchKey.isEmpty()) { updateDisplayType(DisplayType.DEFAULT) + mPublishSubject?.onNext(newSearchKey) } else if (!mIsAutoSearchDisabled) { mPublishSubject?.onNext(newSearchKey) } @@ -187,12 +188,12 @@ open class SearchActivity : BaseActivity() { } DisplayType.GAME_DIGEST -> { val digestListFragment = SearchGameIndexFragment() - digestListFragment.setParams(mSearchKey?:"", mSearchType.value) + digestListFragment.setParams(mSearchKey ?: "", mSearchType.value) transaction.replace(R.id.search_result, digestListFragment) } DisplayType.GAME_DETAIL -> { val detailListFragment = SearchGameResultFragment() - detailListFragment.setParams(mSearchKey?:"", mSearchType.value) + detailListFragment.setParams(mSearchKey ?: "", mSearchType.value) transaction.replace(R.id.search_result, detailListFragment) } } From da9eac4ecdc115540e8bf23f5f4f2cbe8e4e51be Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Fri, 6 Mar 2020 15:07:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DRichEditor=E4=B8=AA?= =?UTF-8?q?=E5=88=AB=E6=9C=BA=E5=9E=8B=E6=8F=92=E5=85=A5=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E6=A0=B7=E5=BC=8F=E6=97=A0=E6=B3=95=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/rich_editor.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/assets/rich_editor.js b/app/src/main/assets/rich_editor.js index 04a3fa5955..bffdca51c8 100644 --- a/app/src/main/assets/rich_editor.js +++ b/app/src/main/assets/rich_editor.js @@ -617,3 +617,10 @@ RE.sendElementNameToNative = function() { } } } + +// android function to open link +function customLinkgo(self) { + var datas = self.dataset.datas + // console.log(datas) + window.OnLinkClickListener.onClick(datas) +}