From d50f29b3dc55cf5fff79f4e6af99b546a99763a5 Mon Sep 17 00:00:00 2001
From: juntao <chenjuntao@ghzhushou.com>
Date: Wed, 29 Apr 2020 10:00:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=B8=E6=88=8F=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=8F=E7=9B=AE=E8=A1=8C?=
 =?UTF-8?q?=E6=95=B0=E8=AE=BE=E7=BD=AE=E4=B8=BA0=E4=BC=9A=E9=97=AA?=
 =?UTF-8?q?=E9=80=80=E7=9A=84=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/common/view/ExpandTextView.java  |  1 -
 .../com/gh/gamecenter/gamedetail/desc/DescAdapter.kt  | 11 ++++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/gh/common/view/ExpandTextView.java b/app/src/main/java/com/gh/common/view/ExpandTextView.java
index becf21376a..f79e135cd7 100644
--- a/app/src/main/java/com/gh/common/view/ExpandTextView.java
+++ b/app/src/main/java/com/gh/common/view/ExpandTextView.java
@@ -96,7 +96,6 @@ public class ExpandTextView extends AppCompatTextView {
         CharSequence content = mSnapshotText.subSequence(start, lastLineEnd);
 
         if (viewWidth - lastLineRight > expandTextWidth) {
-            // TODO 可能最后一行只有一个字符，这里的 -ADDITIONAL_END_TEXT_COUNT 有隐藏问题
             if (mUseGradientAlphaEndText) {
                 finalEndText = content.toString().substring(content.length() - additionalEndTextCount, content.length()) + mEndText;
                 finalEndText = finalEndText.replace("\n", " ");
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 269578aaf1..2b220c202e 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
@@ -203,7 +203,16 @@ class DescAdapter(context: Context,
     private fun bindCustomColumnViewHolder(viewHolder: GameDetailCustomColumnViewHolder, detailEntity: DetailEntity) {
         val customColumn = detailEntity.customColumn!!
         val tags = if (customColumn.showInfoTag == true) customColumn.infoTag else arrayListOf()
-        val maxDesLines = if (mExpandSparseBooleanArray.get(viewHolder.adapterPosition)) Int.MAX_VALUE else customColumn.showDesRowNum!!
+        val maxDesLines = if (mExpandSparseBooleanArray.get(viewHolder.adapterPosition)) { Int.MAX_VALUE } else {
+            when {
+                customColumn.showDesType == "all" || customColumn.showDesRowNum == 0 -> {
+                    Int.MAX_VALUE
+                }
+                else -> {
+                    customColumn.showDesRowNum!!
+                }
+            }
+        }
 
         viewHolder.binding.titleHintTv.paint?.isUnderlineText = true
         viewHolder.binding.contentTv.setExpandMaxLines(maxDesLines)