From f601fd23395cb9ec9f04512d2f8eb2e624a6dcde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Fri, 25 Sep 2020 10:34:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.3.0-?=
 =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=88?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=9C=9F=EF=BC=890904=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95(1,2)=20https://gitlab.ghzs.com/pm/halo-app-i?=
 =?UTF-8?q?ssues/-/issues/1002?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/gamecenter/forum/home/ForumArticleListFragment.kt   | 2 +-
 .../com/gh/gamecenter/forum/home/ForumArticleListViewModel.kt  | 2 +-
 .../qa/article/detail/BaseArticleDetailCommentViewModel.kt     | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt
index a7c62cbce6..75d6d00173 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt
@@ -100,7 +100,7 @@ class ForumArticleListFragment : ListFragment<ArticleEntity, ForumArticleListVie
     }
 
     fun onRefresh(filter: String) {
-        mViewModel?.sort = if (filter == "最新发布") "time.create" else "time.comment"
+        mViewModel?.sort = if (filter == "最新发布") "time.edit" else "time.comment"
         onRefresh()
     }
 
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListViewModel.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListViewModel.kt
index 28691a2b4f..e8ea4d7c9f 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListViewModel.kt
@@ -15,7 +15,7 @@ import io.reactivex.Observable
 
 class ForumArticleListViewModel(application: Application, val path: String) : ListViewModel<ArticleEntity, ArticleEntity>(application) {
 
-    var sort: String = "time.comment"//排序 time.create 最新发布 time.comment 最新回复
+    var sort: String = "time.comment"//排序 time.edit 最新发布 time.comment 最新回复
 
     override fun provideDataObservable(page: Int): Observable<MutableList<ArticleEntity>>? {
         return if (path == "关注") {
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 59a463452e..d960287937 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
@@ -91,7 +91,8 @@ abstract class BaseArticleDetailCommentViewModel(application: Application, var a
                 } else if (commentList.isNullOrEmpty() && mLoadStatusLiveData.value == LoadStatus.INIT_FAILED) {
                     add(CommentItemData(errorConnection = true))
                 } else {
-                    var floor = 1
+                    //从第二楼开始
+                    var floor = 2
                     commentList?.forEach {
                         if (displayFloor) {
                             it.floor = floor