From 06b5f999300968c495030bf26279e3ddfc6d37c2 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Thu, 29 Dec 2022 18:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=86=E8=BE=A8=E7=8E=87?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=20=E7=A7=BB=E9=99=A4=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yunbao/live/views/LiveRoomPlayViewHolder.java | 5 +++--
 .../java/com/yunbao/live/views/LiveRoomViewHolder.java     | 7 +------
 .../java/com/yunbao/live/views/PortraitLiveManager.java    | 3 ---
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomPlayViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomPlayViewHolder.java
index aa28c3378..78df9fb2f 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomPlayViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomPlayViewHolder.java
@@ -20,8 +20,8 @@ public abstract class LiveRoomPlayViewHolder extends AbsViewHolder implements IL
     public static final int PLAY_MODEL_1080 = 2;
     public static int PLAY_MODEL = PLAY_MODEL_DEF;
 
-    public static final String[] videoRatioHorizontal = new String[]{"_640_480", "_1280_720", "_1920_1080", "_180_180"};
-    public static final String[] videoRatioVertical = new String[]{"_480_640", "_720_1280", "_1080_1920", "_180_180"};
+    public static final String[] videoRatioHorizontal = new String[]{"_848_480", "_1280_720", "_1920_1080"};
+    public static final String[] videoRatioVertical = new String[]{"_480_848", "_720_1280", "_1080_1920"};
     public static final String[] videoFps = new String[]{"_24", "_30"};
     OnMicCallback onMicCallback;//连麦回调
     public EnterRoomNewModel roomModel;
@@ -31,6 +31,7 @@ public abstract class LiveRoomPlayViewHolder extends AbsViewHolder implements IL
     }
 
     public abstract void play(String url, int playModel);
+
     public abstract void switchStream(String url, int playModel);
 
     public abstract void stopPlay();
diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
index 13075c098..6fa9eaa4a 100644
--- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
+++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
@@ -837,12 +837,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
         mLiveUserAdapter.setOnItemClickListener(new OnItemClickListener<UserBean>() {
             @Override
             public void onItemClick(UserBean bean, int position) {
-                if (position < 4) {
-                    ToastUtil.show("切换：" + LiveRoomPlayViewHolder.videoRatioVertical[position]);
-                    PortraitLiveManager.portraitLiveManager.test(position);
-                } else {
-                    showUserDialog(bean.getId());
-                }
+                showUserDialog(bean.getId());
             }
         });
         mUserRecyclerView.setAdapter(mLiveUserAdapter);
diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
index f91dcd5db..6f9d9d03a 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -330,9 +330,6 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
 
     }
 
-    public void test(int model) {
-        mLivePlayViewHolder.play(mLiveBean.getPull(), model);
-    }
 
     private Runnable sendFIm = new Runnable() {
         @Override