From cb7d9851953ffca485252191fcd7d775b84f1d01 Mon Sep 17 00:00:00 2001
From: juntao <chenjuntao@ghzhushou.com>
Date: Thu, 14 May 2020 10:22:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E8=B7=B3=E8=BD=AC=E5=8F=8D=E9=A6=88=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gamecenter/gamedetail/desc/DescAdapter.kt | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt
index f21fa5517a..49b731e3b0 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt
@@ -26,6 +26,7 @@ import com.gh.gamecenter.adapter.viewholder.FooterViewHolder
 import com.gh.gamecenter.databinding.*
 import com.gh.gamecenter.entity.CommunityEntity
 import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.entity.LinkEntity
 import com.gh.gamecenter.eventbus.EBReuse
 import com.gh.gamecenter.game.horizontal.GameHorizontalAdapter
 import com.gh.gamecenter.gamedetail.GameDetailFragment
@@ -648,25 +649,30 @@ class DescAdapter(context: Context,
             MtaHelper.onEvent("游戏详情_新", "自定义栏目正文_图片", "${gameName}-${customColumn.name}")
             titleHintTv.performClick()
         }
+
+        val linkClosure: (LinkEntity) -> Unit =  {
+            // 当配置的是不需要 id 也能跳转的时候直接跳转，否则都得根据是否有 ID 判断跳不跳
+            if (it.type == "top_game_comment"
+                    || it.type == "server"
+                    || it.type == "feedback") {
+                it.name = gameName
+                it.text = mViewModel.game?.getGameCategory().toString()
+                DirectUtils.directToLinkPage(mContext, it, StringUtils.buildString(mEntrance, "游戏详情[", gameName, "]:自定义栏目"), "")
+            } else if (!it.link.isNullOrEmpty()) {
+                DirectUtils.directToLinkPage(mContext, it, StringUtils.buildString(mEntrance, "游戏详情[", gameName, "]:自定义栏目"), "")
+            }
+        }
+
         titleHintTv.setOnClickListener {
             MtaHelper.onEvent("游戏详情_新", "自定义栏目标题后跳转", "${gameName}-${customColumn.name}-${customColumn.nameLink?.value}")
-            // 当配置的是不需要 id 也能跳转的时候直接跳转，否则都得根据是否有 ID 判断跳不跳
-            if (customColumn.nameLink?.type == "top_game_comment"
-                    || customColumn.nameLink?.type == "server"
-                    || customColumn.nameLink?.type == "feedback") {
-                customColumn.nameLink?.name = gameName
-                customColumn.nameLink?.text = mViewModel.game?.getGameCategory().toString()
-                DirectUtils.directToLinkPage(mContext, customColumn.nameLink!!, StringUtils.buildString(mEntrance, "游戏详情[", gameName, "]:自定义栏目"), "")
-            } else if (!customColumn.nameLink?.link.isNullOrEmpty()) {
-                DirectUtils.directToLinkPage(mContext, customColumn.nameLink!!, StringUtils.buildString(mEntrance, "游戏详情[", gameName, "]:自定义栏目"), "")
-            }
+            linkClosure(customColumn.nameLink ?: LinkEntity())
         }
 
         linkHintIv.setOnClickListener { linkHintTv.performClick() }
         linkHintArrowIv.setOnClickListener { linkHintTv.performClick() }
         linkHintTv.setOnClickListener {
             MtaHelper.onEvent("游戏详情_新", "自定义栏目右上角跳转", "${gameName}-${customColumn.name}-${customColumn.link?.value}")
-            DirectUtils.directToLinkPage(mContext, customColumn.link!!, StringUtils.buildString(mEntrance, "游戏详情[", gameName, "]:自定义栏目"), "")
+            linkClosure(customColumn.link ?: LinkEntity())
         }
     }