From 96f86ff0ebe61d9c04f30bae27f996cdeb4775e8 Mon Sep 17 00:00:00 2001
From: kehaoyuan <kehaoyuan@ghzhushou.com>
Date: Wed, 9 Oct 2019 18:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E7=A4=BE=E5=8C=BA=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../search/AskSearchNormalItemViewHolder.java |  2 ++
 .../qa/search/artilce/ArticleAdapter.kt       | 22 +++++++++++----
 .../qa/search/hottest/HottestAdapter.kt       |  6 ++--
 .../qa/search/newest/NewestAdapter.kt         | 28 +++++++++++++------
 app/src/main/res/layout/ask_search_item.xml   |  8 +++++-
 5 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchNormalItemViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchNormalItemViewHolder.java
index ea24511b9b..eb1eb09f42 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchNormalItemViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/qa/search/AskSearchNormalItemViewHolder.java
@@ -26,6 +26,8 @@ public class AskSearchNormalItemViewHolder extends BaseRecyclerViewHolder<Search
     public TextView mAnswerCount;
     @BindView(R.id.ask_search_item_image)
     public SimpleDraweeView mImage;
+    @BindView(R.id.ask_search_item_image_container)
+    public View mImageContainer;
     @BindView(R.id.ask_search_item_votecount)
     public TextView mVoteCount;
     @BindView(R.id.ask_search_item_type_icon)
diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleAdapter.kt
index 98bccc2fb3..e334c53739 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/search/artilce/ArticleAdapter.kt
@@ -27,11 +27,23 @@ class ArticleAdapter(context: Context,
     override fun onBindBodyViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         if (holder is AskSearchNormalItemViewHolder) {
             val entity = mEntityList[position]
-            if (entity.images.isNotEmpty()) {
-                holder.mImage.visibility = View.VISIBLE
-                ImageUtils.display(holder.mImage, entity.images[0])
-            } else {
-                holder.mImage.visibility = View.GONE
+            val videos = entity.videos
+            when {
+                videos.isNotEmpty() -> {
+                    holder.mImageContainer.visibility = View.VISIBLE
+                    holder.mVideoDuration.visibility = View.VISIBLE
+                    holder.mVideoDuration.text = videos[0].duration
+                    ImageUtils.display(holder.mImage, videos[0].poster)
+                }
+                entity.images.isNotEmpty() -> {
+                    holder.mImageContainer.visibility = View.VISIBLE
+                    holder.mVideoDuration.visibility = View.GONE
+                    ImageUtils.display(holder.mImage, entity.images[0])
+                }
+                else -> {
+                    holder.mImageContainer.visibility = View.GONE
+                    holder.mVideoDuration.visibility = View.GONE
+                }
             }
             holder.mAnswerCount.visibility = View.GONE
             holder.mVoteCount.text = mContext.getString(R.string.ask_vote_count, NumberUtils.transSimpleCount(entity.count.vote))
diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt
index a145f38d46..77a24d0a85 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/search/hottest/HottestAdapter.kt
@@ -94,18 +94,18 @@ class HottestAdapter(context: Context,
                 val videos = entity.videos
                 when {
                     videos.isNotEmpty() -> {
-                        holder.mImage.visibility = View.VISIBLE
+                        holder.mImageContainer.visibility = View.VISIBLE
                         holder.mVideoDuration.visibility = View.VISIBLE
                         holder.mVideoDuration.text = videos[0].duration
                         ImageUtils.display(holder.mImage, videos[0].poster)
                     }
                     entity.images.isNotEmpty() -> {
-                        holder.mImage.visibility = View.VISIBLE
+                        holder.mImageContainer.visibility = View.VISIBLE
                         holder.mVideoDuration.visibility = View.GONE
                         ImageUtils.display(holder.mImage, entity.images[0])
                     }
                     else -> {
-                        holder.mImage.visibility = View.GONE
+                        holder.mImageContainer.visibility = View.GONE
                         holder.mVideoDuration.visibility = View.GONE
                     }
                 }
diff --git a/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestAdapter.kt
index f871c5520e..77890515f5 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/search/newest/NewestAdapter.kt
@@ -43,18 +43,18 @@ class NewestAdapter(context: Context,
             val videos = searchEntity.videos
             when {
                 videos.isNotEmpty() -> {
-                    holder.mImage.visibility = View.VISIBLE
+                    holder.mImageContainer.visibility = View.VISIBLE
                     holder.mVideoDuration.visibility = View.VISIBLE
                     holder.mVideoDuration.text = videos[0].duration
                     ImageUtils.display(holder.mImage, videos[0].poster)
                 }
                 searchEntity.images.isNotEmpty() -> {
-                    holder.mImage.visibility = View.VISIBLE
+                    holder.mImageContainer.visibility = View.VISIBLE
                     holder.mVideoDuration.visibility = View.GONE
                     ImageUtils.display(holder.mImage, searchEntity.images[0])
                 }
                 else -> {
-                    holder.mImage.visibility = View.GONE
+                    holder.mImageContainer.visibility = View.GONE
                     holder.mVideoDuration.visibility = View.GONE
                 }
             }
@@ -68,11 +68,23 @@ class NewestAdapter(context: Context,
         } else if (getItemViewType(position) == HottestAdapter.ARTICLE_TYPE) {
             holder as AskSearchNormalItemViewHolder
             val entity = mEntityList[position]
-            if (entity.images.isNotEmpty()) {
-                holder.mImage.visibility = View.VISIBLE
-                ImageUtils.display(holder.mImage, entity.images[0])
-            } else {
-                holder.mImage.visibility = View.GONE
+            val videos = entity.videos
+            when {
+                videos.isNotEmpty() -> {
+                    holder.mImageContainer.visibility = View.VISIBLE
+                    holder.mVideoDuration.visibility = View.VISIBLE
+                    holder.mVideoDuration.text = videos[0].duration
+                    ImageUtils.display(holder.mImage, videos[0].poster)
+                }
+                entity.images.isNotEmpty() -> {
+                    holder.mImageContainer.visibility = View.VISIBLE
+                    holder.mVideoDuration.visibility = View.GONE
+                    ImageUtils.display(holder.mImage, entity.images[0])
+                }
+                else -> {
+                    holder.mImageContainer.visibility = View.GONE
+                    holder.mVideoDuration.visibility = View.GONE
+                }
             }
             holder.mAnswerCount.visibility = View.GONE
             holder.mAnswerCount.text = mContext.getString(R.string.ask_answer_count, NumberUtils.transSimpleCount(entity.count.comment))
diff --git a/app/src/main/res/layout/ask_search_item.xml b/app/src/main/res/layout/ask_search_item.xml
index 8c0728750d..bfc1bca51b 100644
--- a/app/src/main/res/layout/ask_search_item.xml
+++ b/app/src/main/res/layout/ask_search_item.xml
@@ -75,7 +75,13 @@
                 android:layout_alignParentRight="true"
                 android:layout_alignParentBottom="true"
                 android:layout_marginRight="4dp"
-                android:layout_marginBottom="4dp" />
+                android:layout_marginBottom="4dp"
+                android:paddingLeft="4dp"
+                android:paddingTop="2dp"
+                android:paddingRight="4dp"
+                android:paddingBottom="2dp"
+                android:textColor="@color/white"
+                android:textSize="10sp" />
 
         </RelativeLayout>
     </RelativeLayout>