From a2dc3f3d5b3616e750a19f4bfd2fcc992cedaa69 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Thu, 28 Mar 2019 16:25:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=83=A8=E5=88=86?= =?UTF-8?q?=20=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV3.6.3=20DEV=EF=BC=88201?= =?UTF-8?q?90327-1830=EF=BC=89=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=20https?= =?UTF-8?q?://gitlab.ghzhushou.com/pm/halo-app-issues/issues/476?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qa/article/edit/ArticleEditViewModel.kt | 11 ++++++++++- .../qa/questions/detail/AnswerViewHolder.java | 5 +++-- .../qa/questions/detail/QuestionsDetailAdapter.java | 11 +++++++++++ .../com/gh/gamecenter/qa/select/OpenedViewModel.kt | 2 +- .../res/layout/collection_comunity_article_item.xml | 1 + app/src/main/res/values/strings.xml | 2 +- 6 files changed, 27 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt index db94a59f86..e3fe8652f4 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditViewModel.kt @@ -12,6 +12,7 @@ import com.gh.gamecenter.R import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.mvvm.Resource +import com.gh.gamecenter.qa.answer.edit.AnswerEditActivity import com.gh.gamecenter.qa.entity.ArticleDetailEntity import com.gh.gamecenter.qa.entity.ArticleDraftEntity import com.gh.gamecenter.qa.questions.edit.QuestionEditViewModel @@ -38,6 +39,8 @@ class ArticleEditViewModel(application: Application) : AndroidViewModel(applicat val FILE_HOST = "file:///" + private var mPostDraftsCount: Int = 0 + val MIN_ARTICLE_TEXT_LENGTH = 6 val processDialog = MediatorLiveData() @@ -261,7 +264,13 @@ class ArticleEditViewModel(application: Application) : AndroidViewModel(applicat .subscribe(object : Response() { override fun onResponse(response: ResponseBody?) { if (isExit) postArticleDrafts.postValue(true) - Utils.toast(getApplication(), "文章已保存到草稿箱") + + if (mPostDraftsCount >= AnswerEditActivity.SAVE_DRAFTS_TOAST_COUNT) { + mPostDraftsCount = 0 + Utils.toast(getApplication(), "回答已保存到草稿箱") + } else { + mPostDraftsCount++ + } val string = response?.string() if (!string.isNullOrEmpty() && draftEntity?.id == null) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java index b3e6a490ba..b2b9f6927a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java @@ -109,10 +109,11 @@ public class AnswerViewHolder extends BaseRecyclerViewHolder { mQuestionTitle.setVisibility(View.VISIBLE); mQuestionTitle.setText(entity.getQuestions().getTitle()); mVotecount.setText(mVotecount.getContext().getString(R.string.ask_vote_count, NumberUtils.transSimpleCount(entity.getVote()))); - mCommentCount.setText(String.format("%s 评论", NumberUtils.transSimpleCount(entity.getCommentCount()))); - // 3.6.3 产品说把右下角的社区名字换成时间 + // 3.6.3 产品说把右下角的社区名字换成时间, 评论隐藏掉 mCommunityName.setVisibility(View.VISIBLE); mCommunityName.setText(NewsUtils.getFormattedTime(entity.getTime())); + mCommentCount.setVisibility(View.GONE); +// mCommentCount.setText(String.format("%s 评论", NumberUtils.transSimpleCount(entity.getCommentCount()))); // mCommunityName.setText(entity.getCommunityName()); UserEntity user = entity.getUser(); mUsername.setText(user.getName()); diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java index 8f4fecbc13..7734c77eb9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailAdapter.java @@ -181,15 +181,26 @@ public class QuestionsDetailAdapter extends ListAdapter { private void initQuestionsDetailItemViewHolder(QuestionsDetailItemViewHolder holder) { List images = mQuestionsDetailEntity.getImages(); + if (mQuestionsDetailEntity.getImages().size() == 0) { + holder.mPic2.setVisibility(View.INVISIBLE); + } else if (mQuestionsDetailEntity.getImages().size() == 1) { + holder.mPic2.setVisibility(View.INVISIBLE); + holder.mPic3.setVisibility(View.INVISIBLE); + holder.mPic3Desc.setVisibility(View.GONE); + holder.mPic3Mask.setVisibility(View.GONE); + } for (int i = 0; i < images.size(); i++) { switch (i) { case 0: + holder.mPic1.setVisibility(View.VISIBLE); ImageUtils.display(holder.mPic1, images.get(i)); break; case 1: + holder.mPic2.setVisibility(View.VISIBLE); ImageUtils.display(holder.mPic2, images.get(i)); break; case 2: + holder.mPic3.setVisibility(View.VISIBLE); ImageUtils.display(holder.mPic3, images.get(i)); if (images.size() > 3) { holder.mPic3Mask.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewModel.kt index dc0c5492b3..90229a09d3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/select/OpenedViewModel.kt @@ -24,7 +24,7 @@ class OpenedViewModel(application: Application) : ListViewModel diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0044a30102..a20428d0cd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -553,7 +553,7 @@ http://www.ghzs.com/question/%1$s?invite=%2$s http://www.ghzs.com/question/%1$s http://www.ghzs.com/question/%1$s?answer=%2$s - 3.配图最多上传3张，不得出现恶心、低俗等图片 + 3.配图最多上传30张，不得出现恶心、低俗等图片 登录失败 最多只能选择5个标签 最多只能上传50张图片