From 9f2d164c705074281f620415eebfa2ddaabe53cf Mon Sep 17 00:00:00 2001
From: jack <1484288157@qq.com>
Date: Mon, 28 Jun 2021 14:53:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV5.0.0-?=
 =?UTF-8?q?=E6=96=B0=E7=A4=BE=E5=8C=BA=E5=B1=95=E7=A4=BA=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?(0628=20=E4=BA=A7=E5=93=81=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=981?=
 =?UTF-8?q?,2)=20https://git.ghzs.com/pm/halo-app-issues/-/issues/1253?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/common/util/DisplayUtils.java | 12 ++++++++
 .../com/gh/common/view/AvatarBorderView.kt    |  2 +-
 .../qa/editor/FullScreenVideoActivity.kt      |  1 +
 .../detail/desc/VideoDescTopViewHolder.kt     |  1 +
 .../main/res/layout/item_video_desc_top.xml   | 29 +++++++++++--------
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/gh/common/util/DisplayUtils.java b/app/src/main/java/com/gh/common/util/DisplayUtils.java
index 2429054493..972aebdd2b 100644
--- a/app/src/main/java/com/gh/common/util/DisplayUtils.java
+++ b/app/src/main/java/com/gh/common/util/DisplayUtils.java
@@ -240,6 +240,18 @@ public class DisplayUtils {
         return defaultValue;
     }
 
+    public static void hideNavigationBar(Activity activity) {
+        Window window = activity.getWindow();
+        View decorView = window.getDecorView();
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN && Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) { // lower api
+            decorView.setSystemUiVisibility(View.GONE);
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | View.SYSTEM_UI_FLAG_FULLSCREEN;
+            decorView.setSystemUiVisibility(uiOptions);
+        }
+    }
+
     public static int retrieveNavigationHeight(Context context) {
         Resources resources = context.getResources();
         int resourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
diff --git a/app/src/main/java/com/gh/common/view/AvatarBorderView.kt b/app/src/main/java/com/gh/common/view/AvatarBorderView.kt
index af83d167ea..e9c757b480 100644
--- a/app/src/main/java/com/gh/common/view/AvatarBorderView.kt
+++ b/app/src/main/java/com/gh/common/view/AvatarBorderView.kt
@@ -148,7 +148,7 @@ class AvatarBorderView : ConstraintLayout {
         }
     }
 
-    fun displayUserBadge(badgeUrl: String? = "") {
+    private fun displayUserBadge(badgeUrl: String? = "") {
         if (badgeUrl.isNullOrEmpty()) {
             badgeView?.setImageURI("")
             badgeView?.visibility = View.GONE
diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt
index 338381d491..9e3841bfa0 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/editor/FullScreenVideoActivity.kt
@@ -20,6 +20,7 @@ class FullScreenVideoActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         DisplayUtils.transparentStatusBar(this)
+        DisplayUtils.hideNavigationBar(this)
         mBinding = ActivityFullScreenVideoBinding.bind(mContentView)
 
         val url = intent.getStringExtra(EntranceUtils.KEY_URL) ?: ""
diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt
index 35e62bf8fd..fd24ac8042 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/desc/VideoDescTopViewHolder.kt
@@ -21,6 +21,7 @@ class VideoDescTopViewHolder(val binding: ItemVideoDescTopBinding, var mIsExpand
     private var mIsAnimationFinish = true
     fun bindData(entity: ForumVideoEntity) {
         binding.entity = entity
+        binding.userAvatar.display(entity.user.border, entity.user.icon, entity.user.auth?.icon)
         binding.executePendingBindings()
         initAnimation(entity)
 
diff --git a/app/src/main/res/layout/item_video_desc_top.xml b/app/src/main/res/layout/item_video_desc_top.xml
index 4c1cfaaeb3..bcef14e106 100644
--- a/app/src/main/res/layout/item_video_desc_top.xml
+++ b/app/src/main/res/layout/item_video_desc_top.xml
@@ -17,24 +17,28 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/white"
-        android:paddingLeft="16dp"
-        android:paddingTop="24dp"
+        android:paddingLeft="8dp"
+        android:paddingTop="16dp"
         android:paddingRight="16dp">
 
-        <com.facebook.drawee.view.SimpleDraweeView
+
+        <com.gh.common.view.AvatarBorderView
             android:id="@+id/userAvatar"
-            style="@style/frescoCircleStyle"
-            imageUrl="@{entity.user.icon}"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:avatar_width="32dp"
+            app:badge_width="8dp"
+            app:border_color="@color/transparent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            tools:layout_height="48dp"
+            tools:layout_width="48dp" />
 
         <TextView
             android:id="@+id/userNameTv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
             android:includeFontPadding="false"
             android:text="@{entity.user.name}"
             android:textColor="@{entity.user.auth != null ? @color/theme_font : @color/text_333333}"
@@ -47,8 +51,8 @@
             android:id="@+id/fansAndTimeTv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
             android:includeFontPadding="false"
+            android:layout_marginBottom="8dp"
             android:text="@{entity.user.count.fans +`粉丝 · `+ CommentUtils.getCommentTime(entity.time.upload)}"
             android:textColor="@color/text_999999"
             android:textSize="11sp"
@@ -73,8 +77,9 @@
             android:id="@+id/contentContainer"
             android:layout_width="match_parent"
             android:layout_height="16dp"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="12dp"
             android:orientation="horizontal"
+            android:layout_marginLeft="8dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/userAvatar">
@@ -146,7 +151,7 @@
             android:layout_marginTop="20dp"
             android:gravity="center_horizontal"
             android:orientation="vertical"
-            android:paddingLeft="8dp"
+            android:paddingLeft="16dp"
             android:paddingRight="8dp"
             app:layout_constraintEnd_toStartOf="@+id/collectContainer"
             app:layout_constraintHorizontal_chainStyle="spread_inside"