From 20ae9fe0ecb09423b49f28cdd9eebda19e63547c Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Mon, 29 Jun 2020 20:51:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=95=9C=E5=83=8F=E6=B8=B8?=
 =?UTF-8?q?=E6=88=8F=E7=9A=84=E9=95=9C=E5=83=8F=E4=B8=8B=E8=BD=BD=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/common/view/ExpandTextView.java    |  4 +--
 .../com/gh/gamecenter/entity/GameEntity.kt    | 26 ++++++++++++++++---
 2 files changed, 25 insertions(+), 5 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 78232f2781..1d7df082b7 100644
--- a/app/src/main/java/com/gh/common/view/ExpandTextView.java
+++ b/app/src/main/java/com/gh/common/view/ExpandTextView.java
@@ -82,8 +82,8 @@ public class ExpandTextView extends AppCompatTextView {
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
-        if ((mShowExpandTextRegardlessOfMaxLines && !mIsExpanded)
-                || (mInitLayout && !mIsExpanded && getLineCount() > mMaxLines && mMaxLines > 0)) {
+        if (mMaxLines > 0
+                && (mShowExpandTextRegardlessOfMaxLines && !mIsExpanded) || (mInitLayout && !mIsExpanded && getLineCount() > mMaxLines)) {
             mSnapshotText = getText();
             mInitLayout = false;
             showExpandButton();
diff --git a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt
index ee8a4e02be..eeec8a105f 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt
@@ -65,10 +65,10 @@ data class GameEntity(
         private var mDownloadOffText: String? = null,
 
         @SerializedName("download_off_status")
-        var downloadOffStatus: String? = null, // "off/dialog/toast", 只关闭、关闭且弹窗、关闭且toast
+        private var mDownloadOffStatus: String? = null, // "off/dialog/toast", 只关闭、关闭且弹窗、关闭且toast
 
         @SerializedName("download_off_dialog")
-        var downloadOffDialog: Dialog? = null,
+        private var mDownloadOffDialog: Dialog? = null,
 
         @SerializedName("libao_exists")
         var isLibaoExists: Boolean = false,
@@ -180,7 +180,7 @@ data class GameEntity(
         var directComment: Boolean = false,
         // xxx人想玩
         @SerializedName("h5_link")
-        var h5Link: LinkEntity? = null,
+        private var mH5Link: LinkEntity? = null,
         val visit: Int = 0,
         @SerializedName("played_time")
         val playedTime: Long = 0,
@@ -233,6 +233,26 @@ data class GameEntity(
         }
 
     @IgnoredOnParcel
+    var h5Link: LinkEntity?
+        get() = if (shouldUseMirrorInfo()) { mirrorData?.mH5Link } else mH5Link
+        set(value) {
+            mH5Link = value
+        }
+
+    @IgnoredOnParcel
+    var downloadOffStatus: String?
+        get() = if (shouldUseMirrorInfo()) mirrorData?.mDownloadOffStatus else mDownloadOffStatus
+        set(value) {
+            mDownloadOffStatus = value
+        }
+
+    @IgnoredOnParcel
+    var downloadOffDialog: Dialog?
+        get() = if (shouldUseMirrorInfo()) mirrorData?.mDownloadOffDialog else mDownloadOffDialog
+        set(value) {
+            mDownloadOffDialog = value
+        }
+    @IgnoredOnParcel
     val nameWithoutSuffix: String?
         get() = if (shouldUseMirrorInfo()) mirrorData?.mName else mName