From f5abd7e07502ec01ce0399440edaae3f2984abaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Wed, 20 May 2020 09:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.0.1-?=
 =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=86=85=E5=AE=B9=E7=BD=91=E7=BB=9C=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=8E=92=E6=9F=A5=E4=B8=8E=E4=BA=A4=E4=BA=92=E4=BC=98?=
 =?UTF-8?q?=E5=8C=961=20https://gitlab.ghzs.com/pm/halo-app-issues/-/issue?=
 =?UTF-8?q?s/869?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gh/common/databind/BindingAdapters.java   |  7 +++++++
 .../com/gh/gamecenter/amway/AmwayAdapter.kt   | 18 +++++++---------
 .../main/res/layout/amway_comment_item.xml    | 18 ++++++----------
 app/src/main/res/layout/comment_item.xml      | 21 +++++++++----------
 .../layout/layout_video_detail_surface.xml    | 20 +++++++++++-------
 .../main/res/layout/rating_comment_item.xml   | 21 +++++++++----------
 app/src/main/res/layout/rating_reply_item.xml | 21 ++++++++-----------
 7 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java
index 7f21865761..52cc8c5561 100644
--- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java
+++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java
@@ -236,6 +236,13 @@ public class BindingAdapters {
     public static void lazyPaddingTop(View view, int paddingTopInDp) {
         view.setPadding(view.getPaddingLeft(), DisplayUtils.dip2px(paddingTopInDp), view.getPaddingRight(), view.getPaddingBottom());
     }
+    /**
+     * lazy 的 paddingBottom
+     */
+    @BindingAdapter("lazyPaddingBottom")
+    public static void lazyPaddingBottom(View view, int paddingBottomInDp) {
+        view.setPadding(view.getPaddingLeft(), view.getPaddingTop(), view.getPaddingRight(), DisplayUtils.dip2px(paddingBottomInDp));
+    }
 
     @BindingAdapter("visibleInvisible")
     public static void visibleInvisible(View view, Boolean show) {
diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt
index 5e481cfe1f..9e98c9dc6c 100644
--- a/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt
@@ -208,24 +208,22 @@ class AmwayAdapter(context: Context, private var mViewModel: AmwayViewModel, pri
             }
 
             if (amway.comment.me.isVoted) {
-                binding.likeIv.setImageResource(R.drawable.ic_amway_liked)
+                binding.likeCountTv.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(context,R.drawable.ic_amway_liked),null,null,null)
                 binding.likeCountTv.setTextColor(R.color.theme_font.toColor())
-                binding.likeCountTv.setOnClickListener { binding.likeIv.performClick() }
-                binding.likeIv.setOnClickListener {
-                    debounceActionWithInterval(binding.likeIv.id, 1000L) {
-                        binding.likeIv.context.ifLogin("安利墙") {
+                binding.likeCountTv.setOnClickListener {
+                    debounceActionWithInterval(binding.likeCountTv.id, 1000L) {
+                        binding.likeCountTv.context.ifLogin("安利墙") {
                             viewModel.undoLikeAmwayComment(amway.game.id, amway.comment.id)
                             MtaHelper.onEvent("安利墙", "点击", "评论${blockPosition}_${amway.game.name}_取消点赞")
                         }
                     }
                 }
             } else {
-                binding.likeIv.setImageResource(R.drawable.ic_amway_like)
+                binding.likeCountTv.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(context,R.drawable.ic_amway_like),null,null,null)
                 binding.likeCountTv.setTextColor(R.color.text_B3B3B3.toColor())
-                binding.likeCountTv.setOnClickListener { binding.likeIv.performClick() }
-                binding.likeIv.setOnClickListener {
-                    debounceActionWithInterval(binding.likeIv.id, 1000L) {
-                        binding.likeIv.context.ifLogin("安利墙") {
+                binding.likeCountTv.setOnClickListener {
+                    debounceActionWithInterval(binding.likeCountTv.id, 1000L) {
+                        binding.likeCountTv.context.ifLogin("安利墙") {
                             viewModel.likeAmwayComment(amway.game.id, amway.comment.id)
                             MtaHelper.onEvent("安利墙", "点击", "评论${blockPosition}_${amway.game.name}_点赞")
                         }
diff --git a/app/src/main/res/layout/amway_comment_item.xml b/app/src/main/res/layout/amway_comment_item.xml
index 2207822c4a..55e7e7b376 100644
--- a/app/src/main/res/layout/amway_comment_item.xml
+++ b/app/src/main/res/layout/amway_comment_item.xml
@@ -110,7 +110,6 @@
                     android:paddingLeft="16dp"
                     android:paddingTop="10dp"
                     android:paddingRight="16dp"
-                    android:paddingBottom="16dp"
                     app:layout_constraintLeft_toLeftOf="@id/gameContainer"
                     app:layout_constraintTop_toBottomOf="@id/gameContainer">
 
@@ -200,25 +199,20 @@
                     <TextView
                         android:id="@+id/likeCountTv"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_height="48dp"
                         android:text="@{amway.comment.vote > 0? NumberUtils.transSimpleCount(amway.comment.vote) : `0`}"
                         android:textColor="@color/text_B3B3B3"
                         android:textSize="12sp"
                         app:layout_constraintBottom_toBottomOf="@id/userIconContainer"
                         app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintTop_toTopOf="@id/userIconContainer"
+                        android:drawableLeft="@drawable/ic_amway_like"
+                        android:gravity="center"
+                        android:drawablePadding="4dp"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
                         tools:text="1" />
 
-                    <ImageView
-                        android:id="@+id/likeIv"
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:layout_marginRight="4dp"
-                        android:src="@drawable/ic_amway_like"
-                        app:layout_constraintBottom_toBottomOf="@id/userIconContainer"
-                        app:layout_constraintRight_toLeftOf="@id/likeCountTv"
-                        app:layout_constraintTop_toTopOf="@id/userIconContainer" />
-
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/comment_item.xml b/app/src/main/res/layout/comment_item.xml
index 076d77896b..d4de6f0929 100644
--- a/app/src/main/res/layout/comment_item.xml
+++ b/app/src/main/res/layout/comment_item.xml
@@ -157,18 +157,19 @@
 
                 <LinearLayout
                     android:id="@+id/comment_like_container"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:paddingBottom="4dp"
+                    android:paddingTop="4dp"
                     android:orientation="vertical">
 
                     <ImageView
                         android:id="@+id/comment_like"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
-                        android:paddingRight="10dp"
-                        android:paddingBottom="4dp"
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
                         android:src="@drawable/comment_vote_unselect" />
 
                     <TextView
@@ -185,11 +186,9 @@
 
                 <ImageView
                     android:id="@+id/comment_more"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="8dp"
-                    android:paddingTop="8dp"
-                    android:paddingRight="8dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="20dp"
+                    android:scaleType="centerInside"
                     android:src="@drawable/community_comment_more" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/layout_video_detail_surface.xml b/app/src/main/res/layout/layout_video_detail_surface.xml
index 21b5149496..d300df7f01 100644
--- a/app/src/main/res/layout/layout_video_detail_surface.xml
+++ b/app/src/main/res/layout/layout_video_detail_surface.xml
@@ -273,16 +273,16 @@
 
                     <RelativeLayout
                         android:id="@+id/userContainer"
-                        android:layout_width="40dp"
-                        android:layout_height="45dp"
+                        android:layout_width="44dp"
+                        android:layout_height="49dp"
                         android:clickable="true"
                         android:gravity="center_horizontal">
 
                         <com.facebook.drawee.view.SimpleDraweeView
                             android:id="@+id/userIconIv"
                             style="@style/frescoCircleStyle"
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
+                            android:layout_width="44dp"
+                            android:layout_height="44dp"
                             app:roundAsCircle="true"
                             app:roundingBorderColor="@color/white"
                             app:roundingBorderWidth="1dp" />
@@ -309,7 +309,9 @@
                         android:id="@+id/likeContainer"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
+                        android:layout_marginTop="8dp"
+                        android:paddingBottom="12dp"
+                        android:paddingTop="4dp"
                         android:gravity="center"
                         android:orientation="vertical">
 
@@ -333,7 +335,9 @@
                         android:id="@+id/commentContainer"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
+                        android:layout_marginTop="8dp"
+                        android:paddingBottom="12dp"
+                        android:paddingTop="4dp"
                         android:gravity="center"
                         android:orientation="vertical">
 
@@ -358,8 +362,10 @@
                         android:id="@+id/shareContainer"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
+                        android:layout_marginTop="8dp"
                         android:gravity="center"
+                        android:paddingBottom="4dp"
+                        android:paddingTop="4dp"
                         android:orientation="vertical">
 
                         <ImageView
diff --git a/app/src/main/res/layout/rating_comment_item.xml b/app/src/main/res/layout/rating_comment_item.xml
index d5e8599256..2c1429927e 100644
--- a/app/src/main/res/layout/rating_comment_item.xml
+++ b/app/src/main/res/layout/rating_comment_item.xml
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:background="@android:color/white"
         android:paddingLeft="16dp"
-        android:paddingBottom="16dp">
+        lazyPaddingBottom="@{!data.active||data.replyData != null ? 16 : 0}">
 
         <RelativeLayout
             android:id="@+id/user_icon_container"
@@ -231,15 +231,15 @@
         <TextView
             android:id="@+id/comment"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="48dp"
             android:drawableLeft="@drawable/community_comment_count"
             android:drawablePadding="4dp"
-            android:paddingTop="2dp"
-            android:paddingRight="20dp"
-            android:paddingBottom="2dp"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
             android:text="@{data.reply > 0? NumberUtils.transSimpleCount(data.reply) : ``}"
             android:textColor="@color/vote_selector"
             android:textSize="13sp"
+            android:gravity="center_vertical"
             app:layout_constraintBottom_toBottomOf="@+id/vote"
             app:layout_constraintRight_toLeftOf="@+id/vote"
             app:layout_constraintRight_toRightOf="parent"
@@ -249,14 +249,14 @@
         <CheckedTextView
             android:id="@+id/vote"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_height="48dp"
             android:layout_marginRight="16dp"
             android:checked="@{data.me.isVoted}"
             android:drawableLeft="@drawable/comment_vote_selector"
             android:drawablePadding="4dp"
-            android:paddingTop="2dp"
-            android:paddingBottom="2dp"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:gravity="center_vertical"
             android:text="@{data.vote > 0? NumberUtils.transSimpleCount(data.vote) : ``}"
             android:textColor="@color/vote_selector"
             android:textSize="13sp"
@@ -293,8 +293,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/vote"
             android:background="@color/text_eeeeee"
-            android:layout_marginRight="16dp"
-            android:layout_marginTop="16dp"/>
+            android:layout_marginRight="16dp"/>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/reply_container"
diff --git a/app/src/main/res/layout/rating_reply_item.xml b/app/src/main/res/layout/rating_reply_item.xml
index b44d5b9c68..cb7c1eac51 100644
--- a/app/src/main/res/layout/rating_reply_item.xml
+++ b/app/src/main/res/layout/rating_reply_item.xml
@@ -30,8 +30,7 @@
             android:layout_height="wrap_content"
             android:background="@android:color/white"
             android:paddingLeft="20dp"
-            android:paddingRight="20dp"
-            android:paddingBottom="12dp">
+            android:paddingRight="20dp">
 
             <RelativeLayout
                 android:id="@+id/user_icon_container"
@@ -140,13 +139,11 @@
             <TextView
                 android:id="@+id/reply_button"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="9dp"
+                android:layout_height="48dp"
                 android:drawablePadding="7dp"
-                android:paddingLeft="10dp"
-                android:paddingTop="2dp"
-                android:paddingRight="10dp"
-                android:paddingBottom="2dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:gravity="center"
                 android:text="回复"
                 android:textColor="@color/vote_selector"
                 android:textSize="12sp"
@@ -159,13 +156,13 @@
             <CheckedTextView
                 android:id="@+id/vote"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
+                android:layout_height="48dp"
                 android:checked="@{data.me.isVoted}"
                 android:drawableLeft="@drawable/comment_vote_selector"
                 android:drawablePadding="7dp"
-                android:paddingTop="2dp"
-                android:paddingBottom="2dp"
+                android:paddingLeft="8dp"
+                android:paddingRight="8dp"
+                android:gravity="center_vertical"
                 android:text="@{data.vote > 0? NumberUtils.transSimpleCount(data.vote) : ``}"
                 android:textColor="@color/vote_selector"
                 android:textSize="13sp"