From 7bf2ef1007782d5363bc18c8b37f2de0f0e308e9 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Wed, 26 Dec 2018 10:33:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E8=B5=9E=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=B8=BA=E9=9B=B6=E7=9A=84=E6=83=85=E5=86=B5,?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=8A=95=E7=A5=A8=20=E5=B7=B2=E5=BC=80?= =?UTF-8?q?=E9=80=9A=E7=9A=84toast=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/entity/FollowersOrFansEntity.kt | 3 +-- .../main/java/com/gh/gamecenter/entity/PersonalEntity.kt | 2 -- .../com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt | 2 +- .../main/java/com/gh/gamecenter/qa/entity/InviteEntity.kt | 3 +-- .../qa/questions/invite/QuestionsInviteViewHolder.java | 2 +- .../gh/gamecenter/qa/select/SelectGameDialogAdapter.java | 6 +++--- app/src/main/res/layout/followers_or_fans_item.xml | 2 +- app/src/main/res/layout/personal_home_top.xml | 2 +- 8 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/entity/FollowersOrFansEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/FollowersOrFansEntity.kt index 9c27fa7777..c452f3e25a 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/FollowersOrFansEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/FollowersOrFansEntity.kt @@ -12,8 +12,7 @@ data class FollowersOrFansEntity( val auth: Auth = Auth()) { data class Count( - @SerializedName("answer_vote") - val answerVote: Int = 0, + val vote: Int = 0, val answer: Int = 0) } diff --git a/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt index 5ef81a6945..f637b8fd56 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/PersonalEntity.kt @@ -13,8 +13,6 @@ data class PersonalEntity( val me: MeEntity = MeEntity()) { data class Count( - @SerializedName("answer_vote") - val answerVote: Int = 0, // 包括回答点赞和社区文章点赞 val vote: Int? = 0, val answer: Int = 0, diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt index b889cda183..c9c7489750 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/PersonalHomeAdapter.kt @@ -141,7 +141,7 @@ class PersonalHomeAdapter(context: Context, mContext.startActivity(MyArticleActivity.getIntent(mContext, mListViewModel.userId, "$mEntrance+(个人主页)")) } userVoteContainer.setOnClickListener { - Utils.toast(mContext, "共获得 " + entity?.count?.answerVote + " 赞同") + Utils.toast(mContext, "共获得 " + entity?.count?.vote + " 赞同") } userConcernOrEdit.setOnClickListener { mContext.ifLogin("个人主页-关注-[关注]") { diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/InviteEntity.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/InviteEntity.kt index 45adcff42f..e814495c60 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/entity/InviteEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/entity/InviteEntity.kt @@ -20,6 +20,5 @@ data class InviteEntity(@SerializedName("_id") @SerializedName("is_followers") var isFollowers: Boolean? = false) { data class Count(var answer: Int? = 0, - @SerializedName("answer_vote") - var answerVote: Int? = 0) + var vote: Int? = 0) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java index 630cf5ca0b..5a58d465d1 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java @@ -71,7 +71,7 @@ public class QuestionsInviteViewHolder extends BaseRecyclerViewHolder (o2.getTag() + "").compareTo(o1.getTag() + "")); + Collections.sort(gameList, (o1, o2) -> (o1.getTag() + "").compareTo(o2.getTag() + "")); loadOver(); } @@ -184,7 +184,7 @@ public class SelectGameDialogAdapter extends BaseRecyclerAdapter { if (isGameData && gameList.get(position).getTag() != null) { - Utils.toast(mContext, gameList.get(position).getName() + "问答专区已经开通了哦"); + Utils.toast(mContext, gameList.get(position).getTag() + "问答专区已经开通了哦"); return; } diff --git a/app/src/main/res/layout/followers_or_fans_item.xml b/app/src/main/res/layout/followers_or_fans_item.xml index 8c1aa1662e..9cf7c9d074 100644 --- a/app/src/main/res/layout/followers_or_fans_item.xml +++ b/app/src/main/res/layout/followers_or_fans_item.xml @@ -82,7 +82,7 @@ android:layout_width = "wrap_content" android:layout_height = "wrap_content" android:layout_toRightOf = "@id/answer_count" - android:text = "@{NumberUtils.transSimpleCount(entity.count.answerVote) + `赞同`}" + android:text = "@{NumberUtils.transSimpleCount(entity.count.vote) + `赞同`}" android:textColor = "@color/title" android:textSize = "11sp" /> diff --git a/app/src/main/res/layout/personal_home_top.xml b/app/src/main/res/layout/personal_home_top.xml index d970b3e58e..7cdcec8a16 100644 --- a/app/src/main/res/layout/personal_home_top.xml +++ b/app/src/main/res/layout/personal_home_top.xml @@ -210,7 +210,7 @@