From 900a4de743b4d1d53216e38599c7febecbc47c4e Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Fri, 10 Nov 2023 12:24:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=8C=E6=88=90=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E9=A1=B5UI=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/user/activity/UserInfoActivity.java    |  6 +-
 .../adapter/UserInfoIndicatorAdapter.java     | 10 +--
 .../main/res/drawable/user_info_bg_live.xml   | 11 +++
 .../main/res/layout/activity_user_info.xml    | 78 +++++++++----------
 app/src/main/res/layout/fragment_me.xml       | 36 ++++-----
 .../res/layout/user_info_bottom_layout.xml    |  6 +-
 6 files changed, 71 insertions(+), 76 deletions(-)
 create mode 100644 app/src/main/res/drawable/user_info_bg_live.xml

diff --git a/app/src/main/java/com/pikolive/app/ui/user/activity/UserInfoActivity.java b/app/src/main/java/com/pikolive/app/ui/user/activity/UserInfoActivity.java
index a1693909f..481ee0bba 100644
--- a/app/src/main/java/com/pikolive/app/ui/user/activity/UserInfoActivity.java
+++ b/app/src/main/java/com/pikolive/app/ui/user/activity/UserInfoActivity.java
@@ -200,7 +200,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
         mBinding.ivUserBack.setOnClickListener(this);
         mBinding.ivEdit.setOnClickListener(this);
         mBinding.tvEdit.setOnClickListener(this);
-        mBinding.viewLive.setOnClickListener(this);
+        mBinding.tvLive.setOnClickListener(this);
         mBinding.ivTagArrow.setOnClickListener(this);
     }
 
@@ -324,7 +324,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
 
             VipHelper.loadVipIcon(mBinding.ivVipIcon, userInfo.getUserVipInfoVO());
 
-            initVoiceShow(userInfo.getAudioCard());
+//            initVoiceShow(userInfo.getAudioCard());
 
             initLabel(userInfo.getLabels());
 
@@ -585,7 +585,7 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
                     PraiseModel.get().praise(userInfo.getUid(), true).subscribe();
                 }
                 break;
-            case R.id.viewLive:
+            case R.id.tvLive:
                 if (userInfo == null) {
                     toast(getString(R.string.me_user_information_is_empty));
                     return;
diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoIndicatorAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoIndicatorAdapter.java
index 510b34a54..9c17667c1 100644
--- a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoIndicatorAdapter.java
+++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoIndicatorAdapter.java
@@ -13,16 +13,8 @@ import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil;
 import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
 import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
 import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
-import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator;
 import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
 import com.pikolive.app.R;
-import com.pikolive.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView;
-import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil;
-import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
-import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
-import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
-import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator;
-import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
 import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.ThemePagerIndicator;
 
 import java.util.List;
@@ -74,7 +66,7 @@ public class UserInfoIndicatorAdapter extends CommonNavigatorAdapter {
         indicator.setRoundRadius(UIUtil.dip2px(mContext, 360));
         FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         lp.gravity = Gravity.END;
-        lp.bottomMargin = UIUtil.dip2px(mContext, 0);
+        lp.bottomMargin = UIUtil.dip2px(mContext, 2);
         indicator.setLayoutParams(lp);
         return indicator;
     }
diff --git a/app/src/main/res/drawable/user_info_bg_live.xml b/app/src/main/res/drawable/user_info_bg_live.xml
new file mode 100644
index 000000000..07f1d2db2
--- /dev/null
+++ b/app/src/main/res/drawable/user_info_bg_live.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/color_theme" />
+    <corners
+        android:bottomLeftRadius="100dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="100dp"
+        android:topRightRadius="0dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
index ad0f8369c..ba4968ce3 100644
--- a/app/src/main/res/layout/activity_user_info.xml
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -184,49 +184,6 @@
                                 app:layout_constraintStart_toStartOf="parent"
                                 app:layout_constraintTop_toTopOf="parent" />
 
-                            <View
-                                android:id="@+id/viewLive"
-                                android:layout_width="0dp"
-                                android:layout_height="@dimen/dp_22"
-                                android:layout_marginStart="7dp"
-                                android:layout_marginEnd="7dp"
-                                android:background="@drawable/ic_live_bottom"
-                                app:layout_constraintBottom_toBottomOf="@+id/iv_user_head"
-                                app:layout_constraintEnd_toEndOf="@+id/iv_user_head"
-                                app:layout_constraintStart_toStartOf="@+id/iv_user_head" />
-
-                            <com.opensource.svgaplayer.SVGAImageView
-                                android:id="@+id/svgLive"
-                                android:layout_width="@dimen/dp_12"
-                                android:layout_height="@dimen/dp_12"
-                                android:src="@drawable/ic_live"
-                                app:autoPlay="true"
-                                app:clearsAfterDetached="true"
-                                app:layout_constraintBottom_toBottomOf="@+id/viewLive"
-                                app:layout_constraintEnd_toStartOf="@+id/tvLive"
-                                app:layout_constraintHorizontal_chainStyle="packed"
-                                app:layout_constraintStart_toStartOf="@+id/viewLive"
-                                app:layout_constraintTop_toTopOf="@+id/viewLive" />
-
-                            <androidx.appcompat.widget.AppCompatTextView
-                                android:id="@+id/tvLive"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/me_in_live"
-                                android:textColor="@color/white"
-                                android:textSize="@dimen/sp_10"
-                                app:layout_constraintBottom_toBottomOf="@+id/viewLive"
-                                app:layout_constraintEnd_toEndOf="@+id/viewLive"
-                                app:layout_constraintStart_toEndOf="@+id/svgLive"
-                                app:layout_constraintTop_toTopOf="@+id/viewLive" />
-
-                            <androidx.constraintlayout.widget.Group
-                                android:id="@+id/groupLive"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:visibility="gone"
-                                app:constraint_referenced_ids="viewLive,tvLive,svgLive" />
-
                             <ImageView
                                 android:id="@+id/iv_vip_icon"
                                 android:layout_width="wrap_content"
@@ -484,6 +441,41 @@
                                 app:layout_constraintTop_toBottomOf="@id/tvEditLabel"
                                 tools:text="@string/layout_activity_user_info_04" />
 
+                            <androidx.appcompat.widget.AppCompatTextView
+                                android:id="@+id/tvLive"
+                                android:layout_width="wrap_content"
+                                android:layout_height="@dimen/dp_24"
+                                android:background="@drawable/user_info_bg_live"
+                                android:paddingStart="@dimen/dp_24"
+                                android:gravity="center_vertical"
+                                android:paddingEnd="@dimen/dp_7"
+                                android:text="@string/me_in_live"
+                                android:textColor="@color/white"
+                                android:textSize="@dimen/sp_12"
+                                app:layout_constraintBottom_toBottomOf="@+id/ll_level"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintTop_toTopOf="@+id/ll_level" />
+
+                            <com.opensource.svgaplayer.SVGAImageView
+                                android:id="@+id/svgLive"
+                                android:layout_width="@dimen/dp_12"
+                                android:layout_height="@dimen/dp_12"
+                                android:src="@drawable/ic_live"
+                                app:autoPlay="true"
+                                android:layout_marginStart="@dimen/dp_6"
+                                app:clearsAfterDetached="true"
+                                app:layout_constraintBottom_toBottomOf="@+id/tvLive"
+                                app:layout_constraintStart_toStartOf="@+id/tvLive"
+                                app:layout_constraintTop_toTopOf="@+id/tvLive" />
+
+                            <androidx.constraintlayout.widget.Group
+                                android:id="@+id/groupLive"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:visibility="gone"
+                                app:constraint_referenced_ids="tvLive,svgLive"
+                                tools:visibility="visible" />
+
                         </androidx.constraintlayout.widget.ConstraintLayout>
 
                     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index 021d8dc7b..dedbd342a 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -467,8 +467,8 @@
                     android:paddingHorizontal="@dimen/dp_20">
 
                     <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="@dimen/dp_24"
+                        android:layout_height="@dimen/dp_24"
                         android:src="@drawable/me_ic_room" />
 
                     <TextView
@@ -481,7 +481,7 @@
                         android:textSize="@dimen/dp_15" />
 
                     <ImageView
-                        android:layout_width="wrap_content"
+                        android:layout_width="@dimen/dp_9"
                         android:layout_height="wrap_content"
                         android:src="@drawable/base_ic_arrow_right_d3d3d3" />
                 </LinearLayout>
@@ -495,8 +495,8 @@
                     android:paddingHorizontal="@dimen/dp_20">
 
                     <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="@dimen/dp_24"
+                        android:layout_height="@dimen/dp_24"
                         android:src="@drawable/me_ic_earnings" />
 
                     <TextView
@@ -509,7 +509,7 @@
                         android:textSize="@dimen/dp_15" />
 
                     <ImageView
-                        android:layout_width="wrap_content"
+                        android:layout_width="@dimen/dp_9"
                         android:layout_height="wrap_content"
                         android:src="@drawable/base_ic_arrow_right_d3d3d3" />
                 </LinearLayout>
@@ -523,8 +523,8 @@
                     android:paddingHorizontal="@dimen/dp_20">
 
                     <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="@dimen/dp_24"
+                        android:layout_height="@dimen/dp_24"
                         android:src="@drawable/me_ic_collect" />
 
                     <TextView
@@ -537,7 +537,7 @@
                         android:textSize="@dimen/dp_15" />
 
                     <ImageView
-                        android:layout_width="wrap_content"
+                        android:layout_width="@dimen/dp_9"
                         android:layout_height="wrap_content"
                         android:src="@drawable/base_ic_arrow_right_d3d3d3" />
                 </LinearLayout>
@@ -551,8 +551,8 @@
                     android:paddingHorizontal="@dimen/dp_20">
 
                     <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="@dimen/dp_24"
+                        android:layout_height="@dimen/dp_24"
                         android:src="@drawable/me_ic_level" />
 
                     <TextView
@@ -565,7 +565,7 @@
                         android:textSize="@dimen/dp_15" />
 
                     <ImageView
-                        android:layout_width="wrap_content"
+                        android:layout_width="@dimen/dp_9"
                         android:layout_height="wrap_content"
                         android:src="@drawable/base_ic_arrow_right_d3d3d3" />
                 </LinearLayout>
@@ -579,8 +579,8 @@
                     android:paddingHorizontal="@dimen/dp_20">
 
                     <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="@dimen/dp_24"
+                        android:layout_height="@dimen/dp_24"
                         android:src="@drawable/me_ic_decoration" />
 
                     <TextView
@@ -593,7 +593,7 @@
                         android:textSize="@dimen/dp_15" />
 
                     <ImageView
-                        android:layout_width="wrap_content"
+                        android:layout_width="@dimen/dp_9"
                         android:layout_height="wrap_content"
                         android:src="@drawable/base_ic_arrow_right_d3d3d3" />
                 </LinearLayout>
@@ -607,8 +607,8 @@
                     android:paddingHorizontal="@dimen/dp_20">
 
                     <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                        android:layout_width="@dimen/dp_24"
+                        android:layout_height="@dimen/dp_24"
                         android:src="@drawable/me_ic_setting" />
 
                     <TextView
@@ -621,7 +621,7 @@
                         android:textSize="@dimen/dp_15" />
 
                     <ImageView
-                        android:layout_width="wrap_content"
+                        android:layout_width="@dimen/dp_9"
                         android:layout_height="wrap_content"
                         android:src="@drawable/base_ic_arrow_right_d3d3d3" />
                 </LinearLayout>
diff --git a/app/src/main/res/layout/user_info_bottom_layout.xml b/app/src/main/res/layout/user_info_bottom_layout.xml
index 9c659ff7e..89f45c3ed 100644
--- a/app/src/main/res/layout/user_info_bottom_layout.xml
+++ b/app/src/main/res/layout/user_info_bottom_layout.xml
@@ -13,10 +13,10 @@
         android:layout_weight="1"
         android:layout_height="45dp"
         android:layout_marginStart="@dimen/dp_15"
-        android:background="@drawable/bg_gradient_cc66ff_9cb3ff_30"
+        android:background="@drawable/decoration_bg_give"
         android:gravity="center"
         android:text="@string/send_msg"
-        android:textColor="@color/color_9168FA"
+        android:textColor="@color/color_theme"
         android:textSize="@dimen/sp_16" />
 
     <com.pikolive.library.widget.DrawableCenterTextView
@@ -26,7 +26,7 @@
         android:layout_height="45dp"
         android:layout_marginStart="18dp"
         android:layout_marginEnd="@dimen/dp_15"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_theme_btn_24"
         android:gravity="center"
         android:text="@string/attention"
         android:textColor="@color/white"