From b9a6d9b9662e464536b9897e5cbc578901c244be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E7=9A=AE?=
 <14840170+lao-pi123@user.noreply.gitee.com>
Date: Sat, 14 Sep 2024 14:55:20 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=BA=A2=E6=A0=87=E3=80=81=E5=A4=B4=E5=83=8F=E8=A3=85=E6=89=AE?=
 =?UTF-8?q?=E3=80=81=E5=A8=B1=E4=B9=90=E9=A1=B6=E9=83=A8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E3=80=81=E7=AD=89UI=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/drawable/background_ff4598.xml   |  3 +-
 .../main/adapter/NewGameRoomTopAdapter.java   |  3 +-
 .../yunbao/main/views/MainMeViewHolder.java   | 32 +++++++-
 .../main/res/drawable/create_room_shape.xml   |  3 +-
 .../main/res/drawable/game_selected_shape.xml |  9 +++
 .../main/res/layout/item_game_room_type_1.xml |  5 +-
 .../main/res/layout/item_game_room_type_2.xml | 74 +++++++++----------
 main/src/main/res/layout/item_main_me_2.xml   | 12 ++-
 .../src/main/res/layout/view_main_message.xml |  2 +-
 main/src/main/res/layout/view_new_main_me.xml | 13 +++-
 10 files changed, 100 insertions(+), 56 deletions(-)
 create mode 100644 main/src/main/res/drawable/game_selected_shape.xml

diff --git a/live/src/main/res/drawable/background_ff4598.xml b/live/src/main/res/drawable/background_ff4598.xml
index a3119f29b..36ffd0bd8 100644
--- a/live/src/main/res/drawable/background_ff4598.xml
+++ b/live/src/main/res/drawable/background_ff4598.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape android:shape="rectangle">
-            <corners android:radius="50dp" />
+        <shape android:shape="oval">
             <solid android:color="#FF4598" />
         </shape>
     </item>
diff --git a/main/src/main/java/com/yunbao/main/adapter/NewGameRoomTopAdapter.java b/main/src/main/java/com/yunbao/main/adapter/NewGameRoomTopAdapter.java
index 74215fee3..8aadfaeb6 100644
--- a/main/src/main/java/com/yunbao/main/adapter/NewGameRoomTopAdapter.java
+++ b/main/src/main/java/com/yunbao/main/adapter/NewGameRoomTopAdapter.java
@@ -2,6 +2,7 @@ package com.yunbao.main.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -9,6 +10,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.cardview.widget.CardView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
@@ -116,7 +118,6 @@ public class NewGameRoomTopAdapter extends RecyclerView.Adapter<RecyclerView.Vie
 class NewGameRoomTopNormalViewHolder extends RecyclerView.ViewHolder {
     ImageView itemImage;
     TextView itemName;
-
     public NewGameRoomTopNormalViewHolder(@NonNull View itemView) {
         super(itemView);
         itemImage = itemView.findViewById(R.id.item_image);
diff --git a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
index df04c3dd1..bd764fcce 100644
--- a/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
+++ b/main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
@@ -111,7 +111,7 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
     private boolean firstInto = true;
     private Banner banner_me;
     private CardView lt_advertisement;
-
+    private SVGAImageView gift_svga;
     public MainMeViewHolder(Context context, ViewGroup parentView) {
         super(context, parentView);
     }
@@ -171,7 +171,14 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
         findViewById(R.id.shouhu_center_tv).setOnClickListener(this);
         findViewById(R.id.shouhu_center_tv2).setOnClickListener(this);
 
-
+        gift_svga = (SVGAImageView) findViewById(com.yunbao.live.R.id.gift_svga);
+        ViewClicksAntiShake.clicksAntiShake(gift_svga, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                MobclickAgent.onEvent(mContext, "my_avatar", "个人头像按钮");
+                RouteUtil.forwardUserHome(mContext, CommonAppConfig.getInstance().getUid(), 2);
+            }
+        });
 
         mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView);
         mRecyclerView.setHasFixedSize(true);
@@ -315,7 +322,28 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
 
         }
         CommonAppConfig appConfig = CommonAppConfig.getInstance();
+        if (u.getDress().getAvatar_frame() != null) {
+            if (u.getDress().getAvatar_frame().contains("svga")) {
+                try {
+                    new SVGAParser(mContext).parse(new URL(u.getDress().getAvatar_frame()), new SVGAParser.ParseCompletion() {
+                        @Override
+                        public void onComplete(SVGAVideoEntity videoItem) {
+                            SVGADrawable drawable = new SVGADrawable(videoItem);
+                            gift_svga.setImageDrawable(drawable);
+                            SVGAViewUtils.playEndClear(gift_svga, false);
+                        }
 
+                        @Override
+                        public void onError() {
+                        }
+                    });
+                } catch (MalformedURLException e) {
+                    e.printStackTrace();
+                }
+            } else {
+                ImgLoader.display(mContext, u.getDress().getAvatar_frame(), gift_svga);
+            }
+        }
 
         if (u.getDress().getMedal() != null) {
             Log.e("tag", u.getDress().getMedal());
diff --git a/main/src/main/res/drawable/create_room_shape.xml b/main/src/main/res/drawable/create_room_shape.xml
index 71de119f9..dd11065e1 100644
--- a/main/src/main/res/drawable/create_room_shape.xml
+++ b/main/src/main/res/drawable/create_room_shape.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <corners android:radius="16dp"/>
-    <solid android:color="#FF3482"/>
-
+    <solid android:color="#FF4598"/>
 </shape>
\ No newline at end of file
diff --git a/main/src/main/res/drawable/game_selected_shape.xml b/main/src/main/res/drawable/game_selected_shape.xml
new file mode 100644
index 000000000..d1ade161d
--- /dev/null
+++ b/main/src/main/res/drawable/game_selected_shape.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ffffffff" />
+    <corners android:topLeftRadius="15dp" android:topRightRadius="15dp" android:bottomLeftRadius="15dp" android:bottomRightRadius="15dp" />
+    <item android:name="android:shadowColor">#26ff56a5</item>
+    <item android:name="android:shadowDx">0</item>
+    <item android:name="android:shadowDy">0</item>
+</shape>
\ No newline at end of file
diff --git a/main/src/main/res/layout/item_game_room_type_1.xml b/main/src/main/res/layout/item_game_room_type_1.xml
index 9db99762d..4d45dba84 100644
--- a/main/src/main/res/layout/item_game_room_type_1.xml
+++ b/main/src/main/res/layout/item_game_room_type_1.xml
@@ -3,7 +3,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="90dp"
+    android:layout_width="72dp"
+    android:layout_marginEnd="10dp"
     android:layout_height="90dp">
 
     <androidx.cardview.widget.CardView
@@ -12,7 +13,7 @@
         app:cardBackgroundColor="@color/white"
         app:cardCornerRadius="15dp"
         app:cardElevation="0dp"
-        android:layout_marginStart="10dp"
+        android:id="@+id/card_view"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/main/src/main/res/layout/item_game_room_type_2.xml b/main/src/main/res/layout/item_game_room_type_2.xml
index ff0f7960e..ac36facd5 100644
--- a/main/src/main/res/layout/item_game_room_type_2.xml
+++ b/main/src/main/res/layout/item_game_room_type_2.xml
@@ -1,47 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="90dp"
-    android:layout_height="90dp"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:cardBackgroundColor="@color/white"
-    app:cardCornerRadius="15dp"
-    app:cardElevation="0dp"
-    android:layout_marginStart="10dp"
-    >
+    android:background="@drawable/game_selected_shape"
+    android:layout_marginEnd="10dp"
+    android:layout_height="90dp">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    <ImageView
+        android:layout_width="45dp"
+        android:layout_height="45dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="10dp"
+        android:id="@+id/item_image"
+        />
 
-        <ImageView
-            android:layout_width="45dp"
-            android:layout_height="45dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="10dp"
-            android:id="@+id/item_image"
-            />
+    <TextView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="所有游戏"
+        android:textColor="#111111"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginBottom="14dp"
+        android:id="@+id/item_name"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:gravity="center"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:ellipsize="end"
+        />
 
-        <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="所有游戏"
-            android:textColor="#111111"
-            android:textSize="13sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginBottom="14dp"
-            android:id="@+id/item_name"
-            android:layout_marginStart="4dp"
-            android:layout_marginEnd="4dp"
-            android:gravity="center"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:ellipsize="end"
-            />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.cardview.widget.CardView>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/main/src/main/res/layout/item_main_me_2.xml b/main/src/main/res/layout/item_main_me_2.xml
index cabd6755e..eea6eaaac 100644
--- a/main/src/main/res/layout/item_main_me_2.xml
+++ b/main/src/main/res/layout/item_main_me_2.xml
@@ -13,8 +13,9 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:id="@+id/thumb"
-        android:layout_width="24dp"
-        android:layout_height="24dp" />
+        android:layout_marginTop="11dp"
+        android:layout_width="22dp"
+        android:layout_height="22dp" />
 
     <TextView
         android:id="@+id/name"
@@ -35,11 +36,14 @@
         android:layout_width="20dp"
         android:layout_height="20dp"
         android:background="@drawable/background_ff4598"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toEndOf="@id/thumb"
         android:gravity="center"
         android:textColor="@color/white"
-        android:textSize="10dp"
+        android:textSize="10sp"
+        android:autoSizeMaxTextSize="10sp"
+        android:autoSizeMinTextSize="7sp"
+        android:autoSizeTextType="uniform"
         android:visibility="gone" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/main/src/main/res/layout/view_main_message.xml b/main/src/main/res/layout/view_main_message.xml
index 542f13ef4..0ebc1be3e 100644
--- a/main/src/main/res/layout/view_main_message.xml
+++ b/main/src/main/res/layout/view_main_message.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingTop="20dp">
+    android:paddingTop="40dp">
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/main/src/main/res/layout/view_new_main_me.xml b/main/src/main/res/layout/view_new_main_me.xml
index 75399c3aa..f507ff8f7 100644
--- a/main/src/main/res/layout/view_new_main_me.xml
+++ b/main/src/main/res/layout/view_new_main_me.xml
@@ -224,6 +224,7 @@
                 android:layout_width="86dp"
                 android:layout_height="86dp"
                 android:layout_marginStart="18dp"
+                android:layout_marginTop="9dp"
                 android:scaleType="centerCrop"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -231,6 +232,16 @@
                 app:riv_border_width="2dp"
                 app:riv_oval="true" />
 
+            <com.opensource.svgaplayer.SVGAImageView
+                android:id="@+id/gift_svga"
+                android:layout_width="104dp"
+                android:layout_height="104dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:layout_marginStart="9dp"
+                android:scaleType="centerCrop"
+                app:autoPlay="true" />
+
 
             <TextView
                 android:id="@+id/name"
@@ -264,7 +275,7 @@
                 android:layout_height="17dp"
                 app:layout_constraintBottom_toBottomOf="@id/avatar"
                 app:layout_constraintStart_toStartOf="@id/name"
-                android:layout_marginBottom="16dp"
+                android:layout_marginBottom="18dp"
                 app:cardElevation="0dp"
                 app:cardBackgroundColor="@color/color_FF8D8D"
                 app:cardCornerRadius="10dp"