diff --git a/app/src/main/java/com/gh/common/util/LoginUtils.java b/app/src/main/java/com/gh/common/util/LoginUtils.java index 9f349d78a2..3954da531e 100644 --- a/app/src/main/java/com/gh/common/util/LoginUtils.java +++ b/app/src/main/java/com/gh/common/util/LoginUtils.java @@ -153,21 +153,15 @@ public class LoginUtils { if (exception.code() == 403) { try { JSONObject errorJson = new JSONObject(exception.response().errorBody().string()); - String detail = errorJson.getString("detail"); - switch (detail) { - case "too frequent": - Utils.toast(context, R.string.comment_failed_toofrequent); - break; - case "user blocked": + int errorCode = errorJson.getInt("code"); + switch (errorCode) { + case 403019: Utils.toast(context, R.string.comment_failed_userblocked); break; - case "user banned": - Utils.toast(context, R.string.comment_failed_userbanned); + case 403020: + Utils.toast(context, R.string.comment_failed_toofrequent); break; - case "article blocked": - Utils.toast(context, R.string.comment_failed_articleblocked); - break; - case "illegal": + case 403021: Utils.toast(context, R.string.comment_failed_illegal); break; default: diff --git a/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java index 8883899de3..dc94208680 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AnswerCommentFragment.java @@ -36,8 +36,6 @@ import com.lightgame.utils.Utils; import org.json.JSONObject; -import java.util.Iterator; - import butterknife.BindView; import butterknife.OnClick; import butterknife.Optional; @@ -96,20 +94,8 @@ public class AnswerCommentFragment extends ListFragment keys = errorJson.keys(); - while (keys.hasNext()) { // todo 叫后端统一 code/detail - String key = keys.next(); - if (key.equals("detail") && "user banned".equals(errorJson.getString(key))) { - toast(R.string.comment_failed_userblocked); - return; - } - } int errorCode = errorJson.getInt("code"); switch (errorCode) { - case 403018: - toast("内容可能已被删除"); - setSoftInput(false); - break; case 403019: toast(R.string.comment_failed_userblocked); break; diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java index 4d610904c6..eb444f3cfb 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskQuestionsRecommendsFragment.java @@ -56,21 +56,23 @@ public class AskQuestionsRecommendsFragment extends ListFragment { if (integer != null) { - switch (integer) { case 0: mRefreshHint.setText("已经没有新内容咯,请稍后再试"); + mRefreshHint.setVisibility(View.VISIBLE); + mBaseHandler.sendEmptyMessageDelayed(1, 2000); + AskLogUtils.communityRefresh(getContext(), integer); break; case -1: - mRefreshHint.setText("获取失败,请检查网络设置"); + toast("获取失败,请检查网络设置"); break; default: mRefreshHint.setText("成功获取" + integer + "条内容"); + mRefreshHint.setVisibility(View.VISIBLE); + mBaseHandler.sendEmptyMessageDelayed(1, 2000); + AskLogUtils.communityRefresh(getContext(), integer); break; } - mRefreshHint.setVisibility(View.VISIBLE); - mBaseHandler.sendEmptyMessageDelayed(1, 2000); - AskLogUtils.communityRefresh(getContext(), integer); } if (mListRefresh.isRefreshing()) { diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskSubjectPageAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/AskSubjectPageAdapter.java index 7e8beae9dc..1f5e080fc7 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskSubjectPageAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskSubjectPageAdapter.java @@ -41,7 +41,7 @@ public class AskSubjectPageAdapter extends RecyclingPagerAdapter { } AskSubjectEntity entity = mEntityList.get(position % mEntityList.size()); binding.setEntity(entity); - ImageUtils.Companion.getInstance().displayScale(binding.subjectIcon, entity.getIcon(), DisplayUtils.dip2px(mContext, 67)); + ImageUtils.Companion.getInstance().displayScale(binding.subjectIcon, entity.getThumb(), DisplayUtils.dip2px(mContext, 67)); binding.getRoot().setOnClickListener(v -> { mContext.startActivity(CommunitySubjectActivity.getIntent(mContext, entity)); }); diff --git a/app/src/main/java/com/gh/gamecenter/ask/SelectGameViewModel.java b/app/src/main/java/com/gh/gamecenter/ask/SelectGameViewModel.java index b0d27c7dd0..cf28f98b23 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/SelectGameViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/ask/SelectGameViewModel.java @@ -6,6 +6,7 @@ import android.support.annotation.NonNull; import com.gh.gamecenter.ask.entity.AskGameSelectEntity; import com.gh.gamecenter.baselist.ListViewModel; import com.gh.gamecenter.retrofit.RetrofitManager; +import com.halo.assistant.HaloApp; import java.util.List; @@ -24,6 +25,6 @@ public class SelectGameViewModel extends ListViewModel> provideDataObservable(int page) { - return RetrofitManager.getInstance(getApplication()).getApi().getAskGameSelect(page); + return RetrofitManager.getInstance(getApplication()).getApi().getAskGameSelect(HaloApp.getInstance().getChannel(), page); } } diff --git a/app/src/main/java/com/gh/gamecenter/ask/entity/AskSubjectEntity.java b/app/src/main/java/com/gh/gamecenter/ask/entity/AskSubjectEntity.java index 07a1208bde..8c4e9447e9 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/entity/AskSubjectEntity.java +++ b/app/src/main/java/com/gh/gamecenter/ask/entity/AskSubjectEntity.java @@ -18,6 +18,8 @@ public class AskSubjectEntity implements Parcelable { @SerializedName("_id") private String id; + private String thumb; + private String icon; private String title; @@ -31,6 +33,7 @@ public class AskSubjectEntity implements Parcelable { protected AskSubjectEntity(Parcel in) { id = in.readString(); + thumb = in.readString(); icon = in.readString(); title = in.readString(); description = in.readString(); @@ -57,6 +60,14 @@ public class AskSubjectEntity implements Parcelable { this.id = id; } + public String getThumb() { + return thumb; + } + + public void setThumb(String thumb) { + this.thumb = thumb; + } + public String getIcon() { return icon; } @@ -97,6 +108,7 @@ public class AskSubjectEntity implements Parcelable { @Override public void writeToParcel(Parcel dest, int flags) { dest.writeString(id); + dest.writeString(thumb); dest.writeString(icon); dest.writeString(title); dest.writeString(description); diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java index 85aedf4021..e1bd1d1542 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java @@ -45,7 +45,6 @@ import com.gh.gamecenter.eventbus.EBNetworkState; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.eventbus.EBSkip; import com.gh.gamecenter.login.ApiResponse; -import com.gh.gamecenter.login.AppDatabase; import com.gh.gamecenter.login.LoginTag; import com.gh.gamecenter.login.UserViewModel; import com.gh.gamecenter.manager.UserManager; @@ -126,7 +125,6 @@ public class PersonalFragment extends BaseFragment implements Observer> getAskGameSelect(@Query("page") int page); + Observable> getAskGameSelect(@Query("channel") String channel, @Query("page") int page); /** * 社区列表 @@ -893,7 +893,7 @@ public interface ApiService { * 删除用户草稿 */ @DELETE("users/{user_id}/answer_drafts/{draft_id}") - Observable deleteAnswerDrafts(@Path("user_id")String userId, @Path("draft_id")String draftId); + Observable deleteAnswerDrafts(@Path("user_id") String userId, @Path("draft_id") String draftId); /** * 获取用户收藏的回答列表 @@ -944,7 +944,7 @@ public interface ApiService { Observable postVoteAnswerComment(@Path("answer_id") String answerId, @Path("comment_id") String commentId); /** - * 举报回答的评论 + * 举报回答的评论 */ @POST("answers/{answer_id}/comments/{comment_id}:report") Observable postReportOfAnswerComment(@Path("answer_id") String answerId, @Path("comment_id") String commentId, @Body RequestBody reportData); diff --git a/app/src/main/res/layout/fragment_answer_detail.xml b/app/src/main/res/layout/fragment_answer_detail.xml index 22abfc7740..b4ddc4a9c0 100644 --- a/app/src/main/res/layout/fragment_answer_detail.xml +++ b/app/src/main/res/layout/fragment_answer_detail.xml @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="10dp" - android:layout_marginTop="15dp" + android:layout_marginTop="12dp" android:gravity="center_vertical" android:text="@{detail.question.title}" android:textColor="@color/black" @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/answer_detail_title" - android:layout_marginTop="15dp"> + android:layout_marginTop="2dp"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/message_item.xml b/app/src/main/res/layout/message_item.xml index 9238dea478..8e73993ad9 100644 --- a/app/src/main/res/layout/message_item.xml +++ b/app/src/main/res/layout/message_item.xml @@ -54,7 +54,9 @@ android:layout_width = "0dp" android:layout_height = "wrap_content" android:layout_marginLeft = "15dp" - android:layout_marginTop = "8dp" + android:layout_marginTop = "6dp" + android:ellipsize = "end" + android:maxLines = "3" android:textColor = "@color/black" android:textSize = "14sp" app:layout_constraintLeft_toRightOf = "@id/message_user_icon" @@ -67,8 +69,8 @@ android:layout_height = "wrap_content" android:layout_marginLeft = "15dp" android:layout_marginTop = "8dp" - android:padding="10dp" android:background = "@color/background" + android:padding = "10dp" app:layout_constraintLeft_toRightOf = "@id/message_user_icon" app:layout_constraintRight_toRightOf = "parent" app:layout_constraintTop_toBottomOf = "@id/message_content" > diff --git a/app/src/main/res/layout/message_item_top.xml b/app/src/main/res/layout/message_item_top.xml index 5d33a451c9..5d2f43237c 100644 --- a/app/src/main/res/layout/message_item_top.xml +++ b/app/src/main/res/layout/message_item_top.xml @@ -17,7 +17,7 @@ @@ -25,6 +25,7 @@ android:id = "@+id/message_vote_icon" android:layout_width = "wrap_content" android:layout_height = "wrap_content" + android:layout_marginTop = "15dp" android:src = "@drawable/message_vote_icon" app:layout_constraintBottom_toTopOf = "@+id/message_vote_name" app:layout_constraintLeft_toLeftOf = "parent" @@ -64,6 +65,7 @@ android:id = "@+id/message_vote_name" android:layout_width = "wrap_content" android:layout_height = "wrap_content" + android:layout_marginBottom = "13dp" android:layout_marginTop = "9dp" android:text = "赞同" android:textColor = "@color/black" @@ -77,7 +79,7 @@ @@ -85,6 +87,7 @@ android:id = "@+id/message_invite_icon" android:layout_width = "wrap_content" android:layout_height = "wrap_content" + android:layout_marginTop = "15dp" android:src = "@drawable/message_invite_icon" app:layout_constraintBottom_toTopOf = "@+id/message_invite_name" app:layout_constraintLeft_toLeftOf = "parent" @@ -124,6 +127,7 @@ android:id = "@+id/message_invite_name" android:layout_width = "wrap_content" android:layout_height = "wrap_content" + android:layout_marginBottom = "13dp" android:layout_marginTop = "9dp" android:text = "邀请" android:textColor = "@color/black" @@ -137,7 +141,7 @@ @@ -145,6 +149,7 @@ android:id = "@+id/message_service_icon" android:layout_width = "wrap_content" android:layout_height = "wrap_content" + android:layout_marginTop = "15dp" android:src = "@drawable/message_service_icon" app:layout_constraintBottom_toTopOf = "@+id/message_service_name" app:layout_constraintLeft_toLeftOf = "parent" @@ -184,6 +189,7 @@ android:id = "@+id/message_service_name" android:layout_width = "wrap_content" android:layout_height = "wrap_content" + android:layout_marginBottom = "13dp" android:layout_marginTop = "9dp" android:text = "系统" android:textColor = "@color/black" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c7b4afaa46..96ee79f119 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,7 +76,7 @@ 加载失败,点击重试 活动 相关推荐 - 噢,网络好似开小差了~ + 噢,网络好似开小差了 点击任意地方重试 暂无游戏 查看精品推荐