diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index e4a213ab34..45080e8f3f 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -948,12 +948,25 @@ public class DialogUtils { TextView contentDesTv = contentView.findViewById(R.id.content_des); TextView negativeTv = contentView.findViewById(R.id.negative); TextView positiveTv = contentView.findViewById(R.id.positive); + titleTv.setText(title); - negativeTv.setText(negative); - positiveTv.setText(positive); contentTitleTv.setText(contentTitle); contentDesTv.setText(contentDes); + if (TextUtils.isEmpty(negative)) { + negativeTv.setVisibility(View.GONE); + } else { + negativeTv.setVisibility(View.VISIBLE); + negativeTv.setText(negative); + } + + if (TextUtils.isEmpty(positive)) { + positiveTv.setVisibility(View.GONE); + } else { + positiveTv.setText(positive); + positiveTv.setVisibility(View.VISIBLE); + } + negativeTv.setOnClickListener(view -> { if (clListener != null) { clListener.onCancel(); diff --git a/app/src/main/java/com/gh/gamecenter/entity/ErrorEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/ErrorEntity.kt index 6ff0827c8a..f34017d717 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/ErrorEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/ErrorEntity.kt @@ -17,8 +17,8 @@ data class ErrorEntity(var code: Int? = 0, // post question @SerializedName("question_id") var questionId: String = "", - @SerializedName("question_name") - var questionName: String = "", + @SerializedName("question_title") + var questionTitle: String = "", @SerializedName("answer_count") var answerCount: Int = 0, @SerializedName("follow_count") diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt index 1fda258de1..d1643cb221 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt @@ -132,25 +132,27 @@ class TagsSelectFragment : BaseFragment() { when { errorEntity?.code == 403066 -> { DialogUtils.showCommunityDialog(context, - "已有相似问题,/n去看看?", - data?.questionName, + "已有相似问题,\n去看看?", + data?.questionTitle, data?.followCount.toString() + " 关注 · " + data?.answerCount + " 回答", "继续提交", "去看看", { mViewModel?.uploadPicAndPostQuestion(true) }, { - QuestionsDetailActivity.getIntent(context, data?.questionId, mEntrance, "相似问题") + val intent = QuestionsDetailActivity.getIntent(context, data?.questionId, mEntrance, "相似问题") + context?.startActivity(intent) }) } errorEntity?.code == 403067 -> { DialogUtils.showCommunityDialog(context, - "已有重复问题,/n无法提问", - data?.questionName, + "已有重复问题,\n无法提问", + data?.questionTitle, data?.followCount.toString() + " 关注 · " + data?.answerCount + " 回答", null, "去看看", null, { - QuestionsDetailActivity.getIntent(context, data?.questionId, mEntrance, "重复问题") + val intent = QuestionsDetailActivity.getIntent(context, data?.questionId, mEntrance, "重复问题") + context?.startActivity(intent) }) } else -> { diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 67c8901a1c..dfbada3909 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -620,7 +620,6 @@ public interface ApiService { /** * 社区列表已开通页面 - * todo 接口需要更换 */ @GET("communities") Observable> getCommunitySelectOpened(@Query("channel") String channel,