From 13b1ba613dec021489364ae7a337f533d8c6e4ad Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Sun, 1 Dec 2019 23:54:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90(20191129-1730)=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E9=97=AE=E9=A2=98=E6=B1=87=E6=80=BB=E7=9A=8420191201?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=20https://gitlab.ghzs.com/pm/halo-app-issues?=
 =?UTF-8?q?/issues/712?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/gamecenter/amway/AmwayAdapter.kt  |  2 +-
 .../gamedetail/rating/RatingReplyActivity.kt      | 15 +++++++++++++++
 .../gamedetail/rating/RatingReplyViewModel.kt     | 12 ++++++++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt
index 1d9ab53f93..a31c385ac9 100644
--- a/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt
@@ -189,7 +189,7 @@ class AmwayAdapter(context: Context, private var mViewModel: AmwayViewModel, pri
             }
 
             binding.commentContainer.setOnClickListener {
-                val intent = RatingReplyActivity.getIntent(context, amway.game.id, amway.comment.id, false, "(安利墙)", "")
+                val intent = RatingReplyActivity.getIntent(context, amway.game.id, amway.comment, false, "(安利墙)", "")
                 SyncDataBetweenPageHelper.startActivityForResult(binding.root.context, intent, RatingFragment.RATING_REPLAY_REQUEST, adapterPosition)
                 MtaHelper.onEvent("安利墙", "点击", "评论${blockPosition}_${amway.game.name}_评论")
             }
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt
index a6e6f5348f..121024a2bb 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt
@@ -233,6 +233,21 @@ class RatingReplyActivity : ListActivity<RatingReplyEntity, RatingReplyViewModel
             return intent
         }
 
+        @JvmStatic
+        fun getIntent(context: Context,
+                      gameId: String,
+                      comment: RatingComment,
+                      showKeyboardIfReplyListIsEmpty: Boolean,
+                      entrance: String,
+                      path: String): Intent {
+            val intent = Intent(context, RatingReplyActivity::class.java)
+            intent.putExtra(EntranceUtils.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path))
+            intent.putExtra(EntranceUtils.KEY_GAMEID, gameId)
+            intent.putExtra(RatingComment::class.java.simpleName, comment)
+            intent.putExtra(EntranceUtils.KEY_SHOW_KEYBOARD_IF_NEEDED, showKeyboardIfReplyListIsEmpty)
+            return intent
+        }
+
         @JvmStatic
         fun getIntent(context: Context, gameId: String, commentId: String, entrance: String, path: String): Intent {
             return getIntent(context, gameId, commentId, true, entrance, path)
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt
index d3da7a80c9..66ce8aa45b 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt
@@ -58,7 +58,9 @@ class RatingReplyViewModel(application: Application,
     }
 
     fun initData() {
-        if (game != null && comment != null) {
+        if (!gameId.isNullOrEmpty()) {
+            getGameDigest()
+        } else if (game != null && comment != null) {
             mListLiveData.postValue(null) // init Head
             load(LoadType.REFRESH)
         } else {
@@ -117,7 +119,12 @@ class RatingReplyViewModel(application: Application,
                 .subscribe(object : Response<GameEntity>() {
                     override fun onResponse(response: GameEntity?) {
                         game = response
-                        getCommentDigest()
+                        if (comment == null) {
+                            getCommentDigest()
+                        } else {
+                            load(LoadType.REFRESH)
+                            headDataLiveData.postValue(true)
+                        }
                     }
 
                     override fun onFailure(e: HttpException?) {
@@ -238,6 +245,7 @@ class RatingReplyViewModel(application: Application,
                     }
                 })
     }
+
     fun unvoteComment(callback: () -> Unit) {
         mApi.unvoteGameComment(game?.id, comment?.id)
                 .subscribeOn(Schedulers.io())