From 051000e4a8d00ab116a13bf64821962faf5de51a Mon Sep 17 00:00:00 2001
From: Jack <1484288157@qq.com>
Date: Fri, 8 May 2020 11:47:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.0.0-?=
=?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD20200508=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=982=20https:?=
=?UTF-8?q?//gitlab.ghzs.com/pm/halo-app-issues/-/issues/832?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../gamecenter/gamedetail/desc/DescAdapter.kt | 34 ++++++++++---------
1 file changed, 18 insertions(+), 16 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 2487585ed4..95d49aa2ae 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
@@ -62,19 +62,19 @@ class DescAdapter(context: Context,
override fun getItemViewType(position: Int): Int {
val descItemData = descItemList[position]
return when (descItemData.type) {
- "gallery" -> IMAGE_GALLERY
- "video" -> VIDEOS
- "comment" -> COMMENTS
- "info" -> GAME_DETAIL
- "update" -> UPDATE_CONTENT
- "server" -> LATEST_SERVICE
- "related_version" -> RELATED_VERSION
- "image_recommend" -> IMAGE
- "libao" -> LIBAO
- "article" -> INFO_RAIDERS
- "related_game" -> RECOMMENDED_GAMES
- "custom_column" -> CUSTOM_COLUMN
- "notice" -> NOTICE
+ DetailEntity.Type.IMAGE_GALLERY.value -> IMAGE_GALLERY
+ DetailEntity.Type.VIDEOS.value -> VIDEOS
+ DetailEntity.Type.COMMENTS.value -> COMMENTS
+ DetailEntity.Type.GAME_INFO.value -> GAME_DETAIL
+ DetailEntity.Type.UPDATE_CONTENT.value -> UPDATE_CONTENT
+ DetailEntity.Type.LATEST_SERVER.value -> LATEST_SERVICE
+ DetailEntity.Type.RELATED_VERSION.value -> RELATED_VERSION
+ DetailEntity.Type.IMAGE.value -> IMAGE
+ DetailEntity.Type.LIBAO.value -> LIBAO
+ DetailEntity.Type.INFO_GUIDE.value -> INFO_RAIDERS
+ DetailEntity.Type.RECOMMENDED_GAMES.value -> RECOMMENDED_GAMES
+ DetailEntity.Type.CUSTOM_COLUMN.value -> CUSTOM_COLUMN
+ DetailEntity.Type.NOTICE.value -> NOTICE
DetailEntity.Type.INFERIOR_CUSTOM_COLUMN.value -> INFERIOR_CUSTOM_COLUMN
else -> FOOTER
}
@@ -233,7 +233,8 @@ class DescAdapter(context: Context,
detailEntity.shouldBoundTogetherWithPreviousItem,
detailEntity.shouldBoundTogetherWithNextItem)
- viewHolder.binding.contentTv.setTextWithHighlightedTextWrappedInsideWrapper(customColumn.des ?: "", copyClickedText = true)
+ viewHolder.binding.contentTv.setTextWithHighlightedTextWrappedInsideWrapper(customColumn.des
+ ?: "", copyClickedText = true)
viewHolder.binding.recyclerview.isNestedScrollingEnabled = false
viewHolder.binding.recyclerview.layoutManager = if (customColumn.showInfoTagDes == true) {
@@ -289,7 +290,8 @@ class DescAdapter(context: Context,
viewHolder.binding.contentTv.setExpandMaxLines(maxDesLines)
viewHolder.binding.contentTv.setIsExpanded(Int.MAX_VALUE == maxDesLines)
viewHolder.binding.customColumn = customColumn
- viewHolder.binding.contentTv.setTextWithHighlightedTextWrappedInsideWrapper(customColumn.des ?: "", copyClickedText = true)
+ viewHolder.binding.contentTv.setTextWithHighlightedTextWrappedInsideWrapper(customColumn.des
+ ?: "", copyClickedText = true)
viewHolder.binding.recyclerview.isNestedScrollingEnabled = false
viewHolder.binding.recyclerview.layoutManager = if (customColumn.showInfoTagDes == true) {
LinearLayoutManager(mContext)
@@ -480,7 +482,7 @@ class DescAdapter(context: Context,
?: GameEntity(), mEntrance, "更新内容")
mContext.startActivity(intent)
}
- holder.binding.historyVersionTv.goneIf(updateContent?.historyApkStatus != "on")
+ holder.binding.historyVersionTv.goneIf(updateContent?.historyApkCount == 0)
holder.binding.contentTv.setExpandCallback {
MtaHelper.onEvent("游戏详情_新", "展开更新内容", gameName)
}
From 60f21f61130a63d6ac75a64b1e091432d9d48740 Mon Sep 17 00:00:00 2001
From: Jack <1484288157@qq.com>
Date: Fri, 8 May 2020 15:12:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.0.0-?=
=?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=A4=A7=E4=BA=8B=E4=BB=B6=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?20200508=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=981,2=20https://gitla?=
=?UTF-8?q?b.ghzs.com/pm/halo-app-issues/-/issues/828?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/gh/gamecenter/gamedetail/GameDetailFragment.kt | 8 ++++++--
app/src/main/res/drawable/scroll_line.xml | 6 ------
app/src/main/res/drawable/scroll_line_drawable.xml | 9 ---------
app/src/main/res/drawable/scroll_thumb.xml | 9 ---------
app/src/main/res/drawable/scroll_thumb_drawable.xml | 9 ---------
app/src/main/res/layout/dialog_game_big_event.xml | 8 ++------
app/src/main/res/values/dimens.xml | 2 --
7 files changed, 8 insertions(+), 43 deletions(-)
delete mode 100644 app/src/main/res/drawable/scroll_line.xml
delete mode 100644 app/src/main/res/drawable/scroll_line_drawable.xml
delete mode 100644 app/src/main/res/drawable/scroll_thumb.xml
delete mode 100644 app/src/main/res/drawable/scroll_thumb_drawable.xml
diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt
index a611b5725d..8f440f63ad 100644
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt
@@ -669,13 +669,17 @@ class GameDetailFragment : NormalFragment() {
gameBigEvent.background = ContextCompat.getDrawable(requireContext(), R.drawable.bg_game_big_event_light)
gameBigEvent.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(requireContext(), R.drawable.ic_game_detail_big_event), null,
ContextCompat.getDrawable(requireContext(), R.drawable.ic_game_detail_big_event_arrow), null)
- gameBigEvent.text = "${TimeUtils.getFormatTime(it.time, "MM-dd")}今天：${it.content}"
+ var eventStr = "${TimeUtils.getFormatTime(it.time, "MM-dd")}今天：${it.content}"
+ if (eventStr.contains("\n")) eventStr = eventStr.substring(0, eventStr.indexOf("\n"))
+ gameBigEvent.text = eventStr
} else {
gameBigEvent.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_999999))
gameBigEvent.background = ContextCompat.getDrawable(requireContext(), R.drawable.bg_game_big_event)
gameBigEvent.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(requireContext(), R.drawable.ic_game_detail_big_event_gray), null,
ContextCompat.getDrawable(requireContext(), R.drawable.ic_game_detail_big_event_arrow_gray), null)
- gameBigEvent.text = "${TimeUtils.getFormatTime(it.time, "MM-dd")}：${it.content}"
+ var eventStr = "${TimeUtils.getFormatTime(it.time, "MM-dd")}：${it.content}"
+ if (eventStr.contains("\n")) eventStr = eventStr.substring(0, eventStr.indexOf("\n"))
+ gameBigEvent.text = eventStr
}
gameBigEvent.setOnClickListener {
MtaHelper.onEvent("游戏详情_新", "游戏大事件", mViewModel.game?.name ?: "")
diff --git a/app/src/main/res/drawable/scroll_line.xml b/app/src/main/res/drawable/scroll_line.xml
deleted file mode 100644
index 7ecbeb850d..0000000000
--- a/app/src/main/res/drawable/scroll_line.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/scroll_line_drawable.xml b/app/src/main/res/drawable/scroll_line_drawable.xml
deleted file mode 100644
index 0868692376..0000000000
--- a/app/src/main/res/drawable/scroll_line_drawable.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-