Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev

Browse Source
This commit is contained in:
Jack
2020-03-06 15:12:22 +08:00
parent f45d1ded17 da9eac4ecd
commit f32e6b60d1
10 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/gh/common/util/ErrorHelper.kt
View File

@ -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,

5
app/src/main/java/com/gh/gamecenter/SearchActivity.kt
View File

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

5
app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java
View File

@ -184,9 +184,8 @@ public class CommentDetailAdapter extends BaseRecyclerAdapter<ViewHolder> {
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);
});

5
app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
View File

@ -411,9 +411,8 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter<ViewHolder> {
})
));
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);
});

1
app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt
View File

@ -71,7 +71,6 @@ class GameHorizontalAdapter(context: Context,
StringUtils.buildString("(游戏-专题:", mSubjectEntity.name, "-列表[", (position + 1).toString(), "])"), exposureEventList!![position])
}
}
holder.binding.executePendingBindings()
}
// notifyDataSetChanged 会出现页面抖动情况

1
app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideAdapter.kt
View File

@ -64,7 +64,6 @@ class GameHorizontalSlideAdapter(context: Context,
StringUtils.buildString("(游戏-专题:", mSubjectEntity.name, "-列表[", (position + 1).toString(), "])"))
}
}
holder.binding.executePendingBindings()
}
// notifyDataSetChanged 会出现页面抖动情况

5
app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
View File

@ -603,9 +603,8 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter<ViewHolder> {
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()));
});

6
app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt
View File

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