From 6e38ef29628f3ee3d1e06a0aff61dc1a92f6ce0c Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Mon, 7 Nov 2022 14:51:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=91=E9=80=81=E5=92=8C=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E6=88=BF=E9=97=B4=E9=94=99=E8=AF=AF=E5=BC=B9=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/shayu/phonelive/AppContext.java         | 1 +
 config.gradle                                                 | 4 ++--
 .../main/java/com/yunbao/live/socket/SocketRyChatUtil.java    | 2 ++
 live/src/main/java/com/yunbao/live/socket/SocketRyClient.java | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/shayu/phonelive/AppContext.java b/app/src/main/java/com/shayu/phonelive/AppContext.java
index ccb9772e5..9486571a2 100644
--- a/app/src/main/java/com/shayu/phonelive/AppContext.java
+++ b/app/src/main/java/com/shayu/phonelive/AppContext.java
@@ -268,6 +268,7 @@ public class AppContext extends CommonAppContext {
                     mSocketHandler.sendMessage(msg);
                 }
             }
+
         });
         configSPApp();
         //初始化美颜SDK
diff --git a/config.gradle b/config.gradle
index 70ee56319..c7985d37c 100644
--- a/config.gradle
+++ b/config.gradle
@@ -10,9 +10,9 @@ ext {
     manifestPlaceholders = [
             //正式
 
-//            serverHost       : "https://napi.yaoulive.com",
+            serverHost       : "https://napi.yaoulive.com",
             //測試
-            serverHost       : "https://ceshi.yaoulive.com",
+//            serverHost       : "https://ceshi.yaoulive.com",
 
             //腾讯地图
             txMapAppKey      : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java b/live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java
index eee39cd71..4e3deaeff 100644
--- a/live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java
+++ b/live/src/main/java/com/yunbao/live/socket/SocketRyChatUtil.java
@@ -15,6 +15,7 @@ import com.yunbao.common.bean.UserBean;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.live.R;
 import com.yunbao.live.http.LiveHttpUtil;
@@ -155,6 +156,7 @@ public class SocketRyChatUtil {
             @Override
             public void onError(Message message, RongIMClient.ErrorCode errorCode) {
                 Log.e("tx", "aaa" + errorCode.toString());
+                ToastUtil.show(errorCode.code + ":" + errorCode.msg);
             }
         });
 
diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
index ea1fae852..0818c9784 100644
--- a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
+++ b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
@@ -84,7 +84,7 @@ public class SocketRyClient {
             @Override
             public void onError(IRongCoreEnum.CoreErrorCode coreErrorCode) {
                 Log.i("tx", "加入" + "失败" + coreErrorCode);
-
+                ToastUtil.show(coreErrorCode + ":加入失败");
             }
         });
 
@@ -500,7 +500,7 @@ public class SocketRyClient {
                 case Constants.LuckyAngel:
                     Bus.get().post(new LiveAudienceEvent()
                             .setType(LiveAudienceEvent.LiveAudienceType.LUCKY_ANGEL)
-                            .setMsgModel( GsonUtils.fromJson(map.getJSONObject("ct").toString(), MsgModel.class)));
+                            .setMsgModel(GsonUtils.fromJson(map.getJSONObject("ct").toString(), MsgModel.class)));
                     break;
             }
         }

From e059d9bbb2190ecfd7bad0558539be60b24d5cf7 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Mon, 7 Nov 2022 17:33:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=BC=80=E6=92=AD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yunbao/live/views/PortraitLiveManager.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a613dcd6e..0a055d8ff 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -239,7 +239,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                         .setParametersModel(openParametersModel
                                 .setmLiveType(mLiveType)
                                 .setmLiveTypeVal(mLiveTypeVal)));
-                mLivePlayViewHolder = new LivePlayRyViewHolder(mContext, playContainer, mIntent.getIntExtra("landscape", 0));
+                mLivePlayViewHolder = new LivePlayRyViewHolder(mContext, playContainer, mLiveBean.getLandscape());
                 mLivePlayViewHolder.addToParent();
                 mLivePlayViewHolder.subscribeActivityLifeCycle();
                 mLiveRoomViewHolder = new LiveRoomViewHolder(false, 1, mContext, mContainer, mSecondPage.findViewById(R.id.gift_gif), mSecondPage.findViewById(R.id.gift_svga), mContainerWrap, mContext.getWindowManager());