From 64ef9b27ae130ea528d4bf0cf9e1b081149d4e9e Mon Sep 17 00:00:00 2001 From: ningwenqiang Date: Tue, 5 Nov 2024 18:14:06 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9Baner=E5=B0=BA=E5=AF=B8=20?= =?UTF-8?q?=202.=E5=A2=9E=E5=8A=A0=E5=BA=95=E9=83=A8=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbao/common/utils/ProcessImageUtil.java | 1 + .../res/layout/item_home_sud_game_list2.xml | 2 +- live/src/main/res/layout/item_main_com2.xml | 2 + .../main/views/MainHomeViewHolder2.java | 2 +- .../res/layout/item_main_home_live_head.xml | 40 +++++++++---------- .../res/layout/item_main_home_lives_pola.xml | 1 + main/src/main/res/layout/view_main_home2.xml | 2 +- .../layout/view_main_home_sud_game_list2.xml | 2 +- main/src/main/res/layout/view_main_me2.xml | 3 +- 9 files changed, 30 insertions(+), 25 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java b/common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java index 9fd1b52ff..23bee3fe1 100644 --- a/common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java +++ b/common/src/main/java/com/yunbao/common/utils/ProcessImageUtil.java @@ -8,6 +8,7 @@ import android.graphics.ImageDecoder; import android.net.Uri; import android.os.Build; import android.provider.MediaStore; +import android.util.Log; import androidx.activity.result.ActivityResultLauncher; diff --git a/common/src/main/res/layout/item_home_sud_game_list2.xml b/common/src/main/res/layout/item_home_sud_game_list2.xml index a684cb6d2..871c7e34c 100644 --- a/common/src/main/res/layout/item_home_sud_game_list2.xml +++ b/common/src/main/res/layout/item_home_sud_game_list2.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginTop="9dp" + android:layout_marginBottom="9dp" android:layout_marginEnd="16dp" android:background="@drawable/bg_f2edd7_10"> diff --git a/live/src/main/res/layout/item_main_com2.xml b/live/src/main/res/layout/item_main_com2.xml index 4f356c00a..d61e2144b 100644 --- a/live/src/main/res/layout/item_main_com2.xml +++ b/live/src/main/res/layout/item_main_com2.xml @@ -113,6 +113,8 @@ android:layout_marginTop="15dp" android:padding="5dp" android:src="@mipmap/ic_yola_share" + app:layout_constraintBottom_toBottomOf="parent" + android:layout_marginBottom="15dp" app:layout_constraintStart_toStartOf="@+id/content" app:layout_constraintTop_toBottomOf="@+id/nine_grid_layout" /> diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java index 664064c23..8e571836f 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeViewHolder2.java @@ -189,7 +189,7 @@ public class MainHomeViewHolder2 extends AbsMainHomeChildViewHolder implements O } }); mRefreshView.setLayoutManager(gridLayoutManager); - ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 7, 7); + ItemDecoration decoration = new ItemDecoration(mContext, 0x00000000, 7, 0); decoration.setOnlySetItemOffsetsButNoDraw(true); mRefreshView.setItemDecoration(decoration); mAdapter = new MainHomeLiveAdapter(mContext, MainActivity.Height); diff --git a/main/src/main/res/layout/item_main_home_live_head.xml b/main/src/main/res/layout/item_main_home_live_head.xml index 2bc10b407..672fe6e6e 100644 --- a/main/src/main/res/layout/item_main_home_live_head.xml +++ b/main/src/main/res/layout/item_main_home_live_head.xml @@ -1,45 +1,45 @@ - - + - - - \ No newline at end of file + + \ No newline at end of file diff --git a/main/src/main/res/layout/item_main_home_lives_pola.xml b/main/src/main/res/layout/item_main_home_lives_pola.xml index 4fb4ca0b6..199470545 100644 --- a/main/src/main/res/layout/item_main_home_lives_pola.xml +++ b/main/src/main/res/layout/item_main_home_lives_pola.xml @@ -6,6 +6,7 @@ tools:layout_width="170dp" android:layout_height="wrap_content" android:gravity="center" + android:paddingBottom="7dp" android:orientation="vertical"> diff --git a/main/src/main/res/layout/view_main_home2.xml b/main/src/main/res/layout/view_main_home2.xml index d2cc3abda..b106b4a0e 100644 --- a/main/src/main/res/layout/view_main_home2.xml +++ b/main/src/main/res/layout/view_main_home2.xml @@ -100,7 +100,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent" - android:layout_marginTop="7dp" + android:layout_marginTop="15dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" android:layout_width="0dp" diff --git a/main/src/main/res/layout/view_main_home_sud_game_list2.xml b/main/src/main/res/layout/view_main_home_sud_game_list2.xml index e5138f7dd..c480fb161 100644 --- a/main/src/main/res/layout/view_main_home_sud_game_list2.xml +++ b/main/src/main/res/layout/view_main_home_sud_game_list2.xml @@ -171,7 +171,7 @@ android:id="@+id/refreshView" android:layout_width="0dp" android:layout_height="0dp" - android:layout_marginTop="5dp" + android:layout_marginTop="15dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/main/src/main/res/layout/view_main_me2.xml b/main/src/main/res/layout/view_main_me2.xml index c24c816e1..7fb7b0182 100644 --- a/main/src/main/res/layout/view_main_me2.xml +++ b/main/src/main/res/layout/view_main_me2.xml @@ -533,7 +533,8 @@