From aa580c27cc5e5dfd5b9a509ef6393275aed21e6c Mon Sep 17 00:00:00 2001
From: leafwai <yeziwei@ghzhushou.com>
Date: Thu, 19 May 2022 18:10:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV5?=
 =?UTF-8?q?.10.0=E3=80=91=E6=B8=B8=E6=88=8F=E5=8D=95=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=EF=BC=9A=E6=B8=B8=E6=88=8F=E5=8D=95=E5=BE=81=E9=9B=86=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92vol.1=EF=BC=88=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=B8=B8=E6=88=8F=E5=8D=95=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=B8=B8=E6=88=8F=E7=9A=84=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=EF=BC=89https://git.shanqu.cc/pm/halo-app-issues/-/issues/1779?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../publish/GameCollectionEditActivity.kt     | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt
index dd6d739f6b..8e24c80a07 100644
--- a/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt
@@ -43,6 +43,7 @@ class GameCollectionEditActivity : ToolBarActivity() {
     private var mPatchCommitCount = 0
     private var mActivityId = ""
     private var mActivityName = ""
+    private var mGameEntity: GameEntity? = null
 
     override fun getLayoutId(): Int = R.layout.activity_game_collection_edit
 
@@ -70,14 +71,17 @@ class GameCollectionEditActivity : ToolBarActivity() {
         val gameId = intent.getStringExtra(EntranceConsts.KEY_GAMEID) ?: ""
         if (gameId.isNotEmpty()) {
             mViewModel.getGameDigest(gameId) {
-                mChooseGamesViewModel.chooseGamesLiveData.run {
-                    if (it != null) {
-                        val gamesList = ArrayList<GameEntity>()
-                        if (!value.isNullOrEmpty()) {
-                            gamesList.addAll(value!!)
+                if (it != null) {
+                    val gamesList = ArrayList<GameEntity>()
+                    val simpleGames = mViewModel.gameCollectionPatch?.games?.map { game -> game.toGameEntity() }
+                    if (!simpleGames.isNullOrEmpty()) {
+                        simpleGames.map { gameEntity ->
+                            if (gameEntity.id == gameId) return@getGameDigest
                         }
-                        postValue(gamesList.apply { add(it) })
+                        gamesList.addAll(simpleGames)
                     }
+                    mGameEntity = it
+                    mChooseGamesViewModel.chooseGamesLiveData.postValue(gamesList.apply { add(it) })
                 }
             }
         }
@@ -248,7 +252,11 @@ class GameCollectionEditActivity : ToolBarActivity() {
                 mViewModel.tags = tags ?: arrayListOf()
                 initTagsUI(mViewModel.tags)
                 val simpleGames = games?.map { game -> game.toGameEntity() }
-                mChooseGamesViewModel.chooseGamesLiveData.postValue(ArrayList(simpleGames))
+                mChooseGamesViewModel.chooseGamesLiveData.postValue(ArrayList(simpleGames).apply {
+                    if (mGameEntity != null) {
+                        add(mGameEntity)
+                    }
+                })
             }
             if (!it.activityTags.isNullOrEmpty()) {
                 if (mActivityId.isEmpty() && mActivityName.isEmpty()) {