【光环助手v5.10.0】消息中心-赞同/邀请消息通知样式优化(点赞部分) https://git.shanqu.cc/pm/halo-app-issues/-/issues/1831

2022-05-24 18:13:33 +08:00
parent e21769eea8
commit 30f2cfd32d
4 changed files with 138 additions and 185 deletions
--- a/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java
@ -111,7 +111,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                mBinding.messageContent.setVisibility(View.VISIBLE);
                mBinding.messageContent.setText(messageEntity.getAnswer().getContent());
                mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle());
-                images = messageEntity.getAnswer().getImages();
+                images = messageEntity.getQuestion().getImages();
                if (images.size() > 0) {
                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
                    ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0));
@ -153,7 +153,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                mBinding.messageContent.setVisibility(View.VISIBLE);
                mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent());
                mBinding.messageOriginalTitle.setText(messageEntity.getDialogue().getTo().getContent());
-                images = messageEntity.getAnswer().getImages();
+                images = messageEntity.getDialogue().getTo().getImages();
                if (images.size() > 0) {
                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
                    ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0));
@ -179,7 +179,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
            case "answer_vote":
                mBinding.messageCommand.setText("赞同你的回答");
                mBinding.messageContent.setVisibility(View.GONE);
-                mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle());
+                mBinding.messageOriginalTitle.setText(messageEntity.getAnswer().getContent());
                images = messageEntity.getAnswer().getImages();
                if (images.size() > 0) {
                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
@ -203,10 +203,14 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                voteMoreUser(messageEntity);
                break;
            case "answer_comment_vote":
+            case "community_article_comment_vote":
+            case "game_comment_vote":
+            case "video_comment_vote":
+            case "game_list_comment_vote":
                mBinding.messageCommand.setText("赞了你的评论");
                mBinding.messageContent.setVisibility(View.GONE);
-                mBinding.messageOriginalTitle.setText(messageEntity.getQuestion().getTitle());
-                images = messageEntity.getAnswer().getImages();
+                mBinding.messageOriginalTitle.setText(messageEntity.getComment().getContent());
+                images = messageEntity.getComment().getImages();
                if (images.size() > 0) {
                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
                    ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0));
@ -268,24 +272,13 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                }
                voteMoreUser(messageEntity);
                break;
-            case "community_article_comment_vote":
-                mBinding.messageCommand.setText("赞了你的评论");
-                mBinding.messageContent.setVisibility(View.GONE);
-                mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle());
-                images = messageEntity.getArticle().getImages();
-                if (images.size() > 0) {
-                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
-                    ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0));
-                } else {
-                    mBinding.messageOriginalIcon.setVisibility(View.GONE);
-                }
-                voteMoreUser(messageEntity);
-                break;
            case "community_article_comment_reply_vote":
+            case "game_comment_reply_vote":
+            case "video_comment_reply_vote":
                mBinding.messageCommand.setText("赞了你的回复");
                mBinding.messageContent.setVisibility(View.GONE);
-                mBinding.messageOriginalTitle.setText(messageEntity.getArticle().getTitle());
-                images = messageEntity.getArticle().getImages();
+                mBinding.messageOriginalTitle.setText(messageEntity.getReply().getContent());
+                images = messageEntity.getReply().getImages();
                if (images.size() > 0) {
                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
                    ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0));
@ -295,11 +288,12 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                voteMoreUser(messageEntity);
                break;
            case "reply_community_article_comment":
+            case "video_comment_reply":
                mBinding.messageCommand.setText("回复了你的评论");
                mBinding.messageContent.setVisibility(View.VISIBLE);
                mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent());
                mBinding.messageOriginalTitle.setText(messageEntity.getDialogue().getTo().getContent());
-                images = messageEntity.getArticle().getImages();
+                images = messageEntity.getDialogue().getTo().getImages();
                if (images.size() > 0) {
                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
                    ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0));
@ -308,19 +302,6 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                }
                voteMoreUser(messageEntity);
                break;
-            case "game_comment_vote":
-                mBinding.messageCommand.setText("赞了你的评论");
-                mBinding.messageContent.setVisibility(View.GONE);
-                mBinding.messageOriginalTitle.setText(messageEntity.getGame().getName());
-                targetUrl = messageEntity.getGame().getDefaultIcon();
-                if (TextUtils.isEmpty(targetUrl)) {
-                    mBinding.messageOriginalIcon.setVisibility(View.GONE);
-                } else {
-                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
-                    ImageUtils.display(mBinding.messageOriginalIcon, targetUrl);
-                }
-                voteMoreUser(messageEntity);
-                break;
            case "update-answer":
                mBinding.messageCommand.setText("更新了回答");
                mBinding.messageContent.setVisibility(View.VISIBLE);
@ -335,27 +316,14 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                }
                voteMoreUser(messageEntity);
                break;
-            case "game_comment_reply_vote":
-                mBinding.messageCommand.setText("赞了你的回复");
-                mBinding.messageContent.setVisibility(View.GONE);
-                mBinding.messageOriginalTitle.setText(messageEntity.getGame().getName());
-                targetUrl = messageEntity.getGame().getDefaultIcon();
-                if (TextUtils.isEmpty(targetUrl)) {
-                    mBinding.messageOriginalIcon.setVisibility(View.GONE);
-                } else {
-                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
-                    ImageUtils.display(mBinding.messageOriginalIcon, targetUrl);
-                }
-                voteMoreUser(messageEntity);
-                break;
            case "game_comment_reply":
                mBinding.messageCommand.setText("回复了你的评价");
                mBinding.messageContent.setVisibility(View.VISIBLE);
                mBinding.messageContent.setText(messageEntity.getReply().getContent());
-                String parentContent = messageEntity.getReply().getParentContent();
+                String parentId = messageEntity.getReply().getParent().getId();
                // parentContent为空代表是回复评价中的回复，否则是回复游戏评价
-                if (!TextUtils.isEmpty(parentContent)) {
-                    mBinding.messageOriginalTitle.setText(messageEntity.getReply().getParentContent());
+                if (!TextUtils.isEmpty(parentId)) {
+                    mBinding.messageOriginalTitle.setText(messageEntity.getReply().getParent().getContent());
                } else {
                    String comment = messageEntity.getReply().getComment();
                    if (comment != null) {
@ -384,12 +352,12 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                        }
                    }
                }
-                targetUrl = messageEntity.getGame().getDefaultIcon();
-                if (TextUtils.isEmpty(targetUrl)) {
-                    mBinding.messageOriginalIcon.setVisibility(View.GONE);
-                } else {
+                images = messageEntity.getReply().getParent().getImages();
+                if (images.size() > 0) {
                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
-                    ImageUtils.display(mBinding.messageOriginalIcon, targetUrl);
+                    ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0));
+                } else {
+                    mBinding.messageOriginalIcon.setVisibility(View.GONE);
                }
                voteMoreUser(messageEntity);
                break;
@ -407,33 +375,6 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                }
                voteMoreUser(messageEntity);
                break;
-            case "video_comment_reply":
-                mBinding.messageCommand.setText("回复了你的评论");
-                mBinding.messageContent.setVisibility(View.VISIBLE);
-                mBinding.messageContent.setText(messageEntity.getDialogue().getFrom().getContent());
-                mBinding.messageOriginalTitle.setText(messageEntity.getDialogue().getTo().getContent());
-                targetUrl = messageEntity.getVideo().getPoster();
-                if (TextUtils.isEmpty(targetUrl)) {
-                    mBinding.messageOriginalIcon.setVisibility(View.GONE);
-                } else {
-                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
-                    ImageUtils.display(mBinding.messageOriginalIcon, targetUrl);
-                }
-                voteMoreUser(messageEntity);
-                break;
-            case "video_comment_vote":
-                mBinding.messageCommand.setText("赞了你的评论");
-                mBinding.messageContent.setVisibility(View.GONE);
-                mBinding.messageOriginalTitle.setText(messageEntity.getVideo().getTitle());
-                targetUrl = messageEntity.getVideo().getPoster();
-                if (TextUtils.isEmpty(targetUrl)) {
-                    mBinding.messageOriginalIcon.setVisibility(View.GONE);
-                } else {
-                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
-                    ImageUtils.display(mBinding.messageOriginalIcon, targetUrl);
-                }
-                voteMoreUser(messageEntity);
-                break;
            case "video_vote":
                mBinding.messageCommand.setText("赞同了你的视频");
                mBinding.messageContent.setVisibility(View.GONE);
@ -447,19 +388,6 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                }
                voteMoreUser(messageEntity);
                break;
-            case "video_comment_reply_vote":
-                mBinding.messageCommand.setText("赞了你的回复");
-                mBinding.messageContent.setVisibility(View.GONE);
-                mBinding.messageOriginalTitle.setText(messageEntity.getVideo().getTitle());
-                targetUrl = messageEntity.getVideo().getPoster();
-                if (TextUtils.isEmpty(targetUrl)) {
-                    mBinding.messageOriginalIcon.setVisibility(View.GONE);
-                } else {
-                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
-                    ImageUtils.display(mBinding.messageOriginalIcon, targetUrl);
-                }
-                voteMoreUser(messageEntity);
-                break;
            case "reply_activity_comment":
                mBinding.messageCommand.setText("回复了你");
                mBinding.messageContent.setVisibility(View.VISIBLE);
@ -531,26 +459,13 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                mBinding.messageCommand.setText("回复了你的游戏单评价");
                mBinding.messageContent.setVisibility(View.VISIBLE);
                mBinding.messageContent.setText(messageEntity.getComment().getContent());
-                mBinding.messageOriginalTitle.setText(messageEntity.getComment().getParentContent());
-                targetUrl = messageEntity.getGameList().getCover();
-                if (TextUtils.isEmpty(targetUrl)) {
-                    mBinding.messageOriginalIcon.setVisibility(View.GONE);
-                } else {
+                mBinding.messageOriginalTitle.setText(messageEntity.getComment().getParent().getContent());
+                images = messageEntity.getComment().getParent().getImages();
+                if (images.size() > 0) {
                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
-                    ImageUtils.display(mBinding.messageOriginalIcon, targetUrl);
-                }
-                voteMoreUser(messageEntity);
-                break;
-            case "game_list_comment_vote":
-                mBinding.messageCommand.setText("赞了你的评论");
-                mBinding.messageContent.setVisibility(View.GONE);
-                mBinding.messageOriginalTitle.setText(messageEntity.getGameList().getTitle());
-                targetUrl = messageEntity.getGameList().getCover();
-                if (TextUtils.isEmpty(targetUrl)) {
-                    mBinding.messageOriginalIcon.setVisibility(View.GONE);
+                    ImageUtils.displayIcon(mBinding.messageOriginalIcon, images.get(0));
                } else {
-                    mBinding.messageOriginalIcon.setVisibility(View.VISIBLE);
-                    ImageUtils.display(mBinding.messageOriginalIcon, targetUrl);
+                    mBinding.messageOriginalIcon.setVisibility(View.GONE);
                }
                voteMoreUser(messageEntity);
                break;
@ -657,6 +572,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                }
                break;
            case "answer":
+            case "answer_vote":
                intent = NewQuestionDetailActivity.getSpecifiedCommentIntent(
                        context,
                        entity.getQuestion().getId(),
@ -675,13 +591,6 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                    context.startActivity(SimpleAnswerDetailActivity.getIntent(context, entity.getAnswer().getId(), entrance, path));
                }
                break;
-            case "answer_vote":
-                if (view.getId() == R.id.message_original) {
-                    context.startActivity(NewQuestionDetailActivity.getCommentIntent(context, entity.getQuestion().getId(), entity.getAnswer().getId(), entrance, path));
-                } else if (view.getId() == R.id.message_item) {
-                    context.startActivity(NewQuestionDetailActivity.getIntent(context, entity.getQuestion().getId(), entrance, path));
-                }
-                break;
            case "reply_answer_comment":
                intent = NewCommentDetailActivity.Companion.getAnswerCommentIntent(
                        context,
@ -706,17 +615,6 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                context.startActivity(intent);
                break;
            case "community_article_comment_vote":
-                community = new CommunityEntity(entity.getArticle().getCommunityId(), "");
-                if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) {
-                    context.startActivity(ArticleDetailActivity.getCommentIntent(context, community, entity.getArticle().getId(), entrance, path));
-                }
-                break;
-            case "community_article_comment_reply_vote":
-                community = new CommunityEntity(entity.getArticle().getCommunityId(), "");
-                if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) {
-                    context.startActivity(CommentActivity.getCommentDetailIntent(context, entity.getComment().getTopId(), community.getId(), entity.getArticle().getId(), "", "", false, 1, entrance, path));
-                }
-                break;
            case "community_article_comment":
                community = new CommunityEntity(entity.getArticle().getCommunityId(), "");
                intent = ArticleDetailActivity.getSpecifiedCommentIntent(
@ -725,14 +623,33 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                        entity.getArticle().getId(),
                        entity.getComment().getId(),
                        entrance,
-                        path);
+                        path
+                );
+                context.startActivity(intent);
+                break;
+            case "community_article_comment_reply_vote":
+                intent = NewCommentDetailActivity.Companion.getArticleCommentIntent(
+                        context,
+                        entity.getComment().getTopId(),
+                        entity.getArticle().getCommunityId(),
+                        entity.getArticle().getId(),
+                        entity.getComment().getId(),
+                        entrance,
+                        path
+                );
                context.startActivity(intent);
                break;
            case "community_article_vote":
-                if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) {
-                    community = new CommunityEntity(entity.getArticle().getCommunityId(), "");
-                    context.startActivity(ArticleDetailActivity.getIntent(context, community, entity.getArticle().getId(), entrance, path, null));
-                }
+                community = new CommunityEntity(entity.getArticle().getCommunityId(), "");
+                intent = ArticleDetailActivity.getIntent(
+                        context,
+                        community,
+                        entity.getArticle().getId(),
+                        entrance,
+                        path,
+                        null
+                );
+                context.startActivity(intent);
                break;
            case "reply_community_article_comment":
                intent = NewCommentDetailActivity.Companion.getArticleCommentIntent(
@ -747,9 +664,17 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                context.startActivity(intent);
                break;
            case "game_comment_vote":
-                if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) {
-                    GameDetailActivity.startGameDetailActivity(context, entity.getGame().getId(), BaseActivity.mergeEntranceAndPath(entrance, path), -1, true, false, false, false, null);
-                }
+                GameDetailActivity.startGameDetailActivity(
+                        context,
+                        entity.getGame().getId(),
+                        BaseActivity.mergeEntranceAndPath(entrance, path),
+                        -1,
+                        true,
+                        false,
+                        false,
+                        false,
+                        null
+                );
                break;
            case "game_comment_reply":
            case "game_comment_reply_vote":
@ -764,24 +689,22 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                context.startActivity(intent);
                break;
            case "video_vote":
-                if (view.getId() == R.id.message_original || view.getId() == R.id.message_item) {
-                    DirectUtils.directToVideoDetail(
-                            context,
-                            entity.getVideo().getId(),
-                            VideoDetailContainerViewModel.Location.SINGLE_VIDEO.getValue(),
-                            false,
-                            "",
-                            entrance,
-                            outerInfo,
-                            ""
-                    );
-                }
+                DirectUtils.directToVideoDetail(
+                        context,
+                        entity.getVideo().getId(),
+                        VideoDetailContainerViewModel.Location.SINGLE_VIDEO.getValue(),
+                        false,
+                        "",
+                        entrance,
+                        outerInfo,
+                        ""
+                );
                break;
            case "video_comment":
+            case "video_comment_vote":
                intent = ForumVideoDetailActivity.Companion.getSpecifiedCommentIntent(
                        context,
                        entity.getVideo().getId(),
-                        "",
                        entity.getComment().getId()
                );
                context.startActivity(intent);
@ -797,22 +720,16 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                );
                context.startActivity(intent);
                break;
-            case "video_comment_vote":
            case "video_comment_reply_vote":
-                boolean showComment = false;
-
-                if (view.getId() == R.id.message_item) {
-                    showComment = true;
-                }
-                DirectUtils.directToVideoDetail(
+                intent = NewCommentDetailActivity.Companion.getVideoCommentIntent(
                        context,
+                        entity.getComment().getTopId(),
                        entity.getVideo().getId(),
-                        VideoDetailContainerViewModel.Location.SINGLE_VIDEO.getValue(),
-                        showComment,
-                        "",
+                        entity.getComment().getId(),
                        entrance,
-                        outerInfo,
-                        "");
+                        path
+                );
+                context.startActivity(intent);
                break;

            case "reply_activity_comment":
@ -833,6 +750,25 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                );
                context.startActivity(intent);
                break;
+            case "game_list_comment_vote":
+                if (TextUtils.isEmpty(entity.getComment().getTopId())) {
+                    intent = GameCollectionDetailActivity.Companion.getSpecifiedCommentIntent(
+                            context,
+                            entity.getGameList().getId(),
+                            entity.getComment().getId()
+                    );
+                } else {
+                    intent = NewCommentDetailActivity.Companion.getGameCollectionCommentIntent(
+                            context,
+                            entity.getComment().getTopId(),
+                            entity.getGameList().getId(),
+                            entity.getComment().getId(),
+                            entrance,
+                            path
+                    );
+                }
+                context.startActivity(intent);
+                break;
            case "game_list_comment_reply":
                intent = NewCommentDetailActivity.Companion.getGameCollectionCommentIntent(
                        context,
@ -844,22 +780,13 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder<MessageEntity>
                );
                context.startActivity(intent);
                break;
-            case "game_list_comment_vote":
-                if (view.getId() == R.id.message_original) {
-                    context.startActivity(GameCollectionDetailActivity.getIntent(context, entity.getGameList().getId(), false));
-                } else if (view.getId() == R.id.message_item) {
-                    context.startActivity(CommentActivity.getGameCollectionCommentDetailIntent(
-                            context,
-                            entity.getComment().getTopId(),
-                            entity.getGameList().getId(),
-                            false,
-                            entrance,
-                            path
-                    ));
-                }
-                break;
            case "game_list_vote":
-                context.startActivity(GameCollectionDetailActivity.getIntent(context, entity.getGameList().getId(), false));
+                intent = GameCollectionDetailActivity.getIntent(
+                        context,
+                        entity.getGameList().getId(),
+                        false
+                );
+                context.startActivity(intent);
                break;
        }
    }