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) +} 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/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) } } 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 @@