From 595f7747f4ab49da9152807933176bf4c21f1e29 Mon Sep 17 00:00:00 2001 From: juntao Date: Thu, 3 Sep 2020 16:54:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E8=AF=84=E8=AE=BA=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qa/article/detail/ArticleDetailViewModel.kt | 4 ++-- .../qa/article/detail/BaseArticleDetailCommentAdapter.kt | 2 +- .../article/detail/BaseArticleDetailCommentViewModel.kt | 9 ++++----- .../detail/comment/ArticleDetailCommentFragment.kt | 1 + .../detail/comment/ArticleDetailCommentViewModel.kt | 2 ++ 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailViewModel.kt index 1cde632fb9..f59f5b287d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailViewModel.kt @@ -50,7 +50,7 @@ class ArticleDetailViewModel(application: Application, } override fun mergeResultLiveData() { - mResultLiveData.addSource(mListLiveData) { mergeListData(it, displayFloor = true, inAscOrder = currentSortType == SortType.OLDEST) } + mResultLiveData.addSource(mListLiveData) { mergeListData(it, displayFloor = true) } } fun getArticleDetail() { @@ -63,7 +63,7 @@ class ArticleDetailViewModel(application: Application, topItemData = CommentItemData(articleDetail = response) commentCount = response?.count?.comment ?: 0 loadResultLiveData.postValue(LoadResult.SUCCESS) - mergeListData(mListLiveData.value, displayFloor = true, inAscOrder = currentSortType == SortType.OLDEST) + mergeListData(mListLiveData.value, displayFloor = true) } override fun onFailure(e: HttpException?) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentAdapter.kt index cf1e9168bd..ee830a6105 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentAdapter.kt @@ -209,7 +209,7 @@ abstract class BaseArticleDetailCommentAdapter(context: Context, // 帖子详情页面用的样式 updateSubComment(comment.subCommentList, viewModel.topItemData?.articleDetail?.user?.id ?: "") - binding.floorHintTv.text = if (comment.floor != 0) "${comment.floor}楼" else CommentUtils.getCommentTime(comment.time) + binding.floorHintTv.text = if (comment.floor != 0) "${comment.floor}楼" else "" binding.root.setOnClickListener { ArticleDetailCommentActivity.getIntent(binding.root.context, comment.id!!, viewModel.communityId, viewModel.articleId, false, comment.floor, entrance, PATH_ARTICLE_DETAIL).apply { binding.root.context.startActivity(this) diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentViewModel.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentViewModel.kt index 92f9d47b40..241afbb1e2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/BaseArticleDetailCommentViewModel.kt @@ -69,7 +69,7 @@ abstract class BaseArticleDetailCommentViewModel(application: Application, var a } } - fun mergeListData(commentList: List?, displayFloor: Boolean = false, inAscOrder: Boolean = false) { + fun mergeListData(commentList: List?, displayFloor: Boolean = false) { topItemData?.let { val mergedList = arrayListOf().apply { if (mResultLiveData.value?.firstOrNull() != null) { @@ -85,15 +85,14 @@ abstract class BaseArticleDetailCommentViewModel(application: Application, var a } else if (commentList.isNullOrEmpty() && mLoadStatusLiveData.value == LoadStatus.INIT_FAILED) { add(CommentItemData(errorConnection = true)) } else { - // 草，这里的楼数有问题，接口来不及改，干脆倒序的时候不显示楼层好了 - var floor = if (inAscOrder) 1 else commentCount + 1 + var floor = 1 commentList?.forEach { if (displayFloor) { - it.floor = if (inAscOrder) floor else 0 + it.floor = floor } add(CommentItemData(commentNormal = it)) if (displayFloor) { - if (inAscOrder) floor++ + floor++ } } add(CommentItemData(footer = true)) diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentFragment.kt index dfa53aa83c..995de239c1 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/comment/ArticleDetailCommentFragment.kt @@ -34,6 +34,7 @@ class ArticleDetailCommentFragment : BaseArticleDetailCommentFragment>? = null @@ -41,6 +42,7 @@ class ArticleDetailCommentViewModel(application: Application, @SuppressLint("CheckResult") override fun onSuccess(data: CommentEntity) { commentDetail = data + commentDetail?.floor = positionInOriginList commentCount = data.reply topItemData = CommentItemData(commentTop = data) loadResultLiveData.postValue(LoadResult.SUCCESS) From e04a7fc4b98b68b34226793b1b83f2b94c6d0776 Mon Sep 17 00:00:00 2001 From: juntao Date: Thu, 3 Sep 2020 17:19:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E8=AE=AF?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/gamecenter/entity/ArticleCommentParent.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/entity/ArticleCommentParent.kt b/app/src/main/java/com/gh/gamecenter/entity/ArticleCommentParent.kt index 63fdb16023..e610b67cb5 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/ArticleCommentParent.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/ArticleCommentParent.kt @@ -8,7 +8,7 @@ import kotlinx.android.parcel.Parcelize data class ArticleCommentParent(val user: User = User(), val active: Boolean = true, val comment: String = "", - var me: MeEntity) : Parcelable + var me: MeEntity? = MeEntity()) : Parcelable @Parcelize data class User( From 479f7c464ba16b93c59eab6a0adf3620754fa8ed Mon Sep 17 00:00:00 2001 From: juntao Date: Thu, 3 Sep 2020 17:25:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=88=86=E4=BA=AB=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt index 472178455b..e263e2082d 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -837,7 +837,7 @@ class GameDetailFragment : NormalFragment() { GdtHelper.logAction(ActionType.SHARE, GdtHelper.CONTENT_TYPE, "GAME", GdtHelper.CONTENT_ID, mGameEntity!!.id) - val url = "http://www.ghzs666.com/game/" + it.shareCode + val url = "http://m.ghzs666.com/game/" + it.shareCode if (activity is BaseActivity) { var shareEntrance: ShareUtils.ShareEntrance = ShareUtils.ShareEntrance.game