From 80a1508dfcaae17d6ba36ba8781d13154f0b23e6 Mon Sep 17 00:00:00 2001
From: 18401019693 <https://gitee.com/xxkp/NEWPDLIVE.git>
Date: Thu, 1 Dec 2022 13:34:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=8B=E6=9C=BA=E5=BC=80?=
 =?UTF-8?q?=E6=92=ADPk=E7=95=8C=E9=9D=A2=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E8=81=8A=E5=A4=A9=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E8=87=B3=E5=BA=95=E9=83=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/custom_drawer_popup.xml   |  1 +
 config.gradle                                 |  4 ++--
 .../yunbao/live/adapter/LiveChatAdapter.java  | 21 +++++++++++++++----
 .../live/views/PortraitLiveManager.java       | 14 ++++++++++++-
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/common/src/main/res/layout/custom_drawer_popup.xml b/common/src/main/res/layout/custom_drawer_popup.xml
index e7e390913..d80a71d15 100644
--- a/common/src/main/res/layout/custom_drawer_popup.xml
+++ b/common/src/main/res/layout/custom_drawer_popup.xml
@@ -108,6 +108,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:visibility="gone"
                 android:id="@+id/system_notice"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/config.gradle b/config.gradle
index 7a26c388d..5038d9923 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,7 +4,7 @@ ext {
             buildToolsVersion: "28.0.3",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
-            versionCode      : 308,
+            versionCode      : 310,
             versionName      : "6.4.5"
     ]
     manifestPlaceholders = [
@@ -25,7 +25,7 @@ ext {
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 
 //            true表示谷歌支付 false
-            isGooglePlay     :  true,
+            isGooglePlay     :  false,
             //是否上报异常日志
             isUploadLog      :  true
     ]
diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
index a410ef698..b06320ed3 100644
--- a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
+++ b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
@@ -320,9 +320,9 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
 
             } else if (bean.getType() == -2) {//自动消息，点击发言
 
-                    mBg.setBackgroundResource(R.drawable.bg_chat_automatic_item);
-                    mTextView.setText(R.string.automatic_chat);
-                    bean.setHeart(position);
+                mBg.setBackgroundResource(R.drawable.bg_chat_automatic_item);
+                mTextView.setText(R.string.automatic_chat);
+                bean.setHeart(position);
             } else if (bean.getType() == MSG_HOUR_RANK_CHANGE) {
                 mBg.setBackgroundResource(R.drawable.bg_chat_automatic_item);
                 mTextView.setText(bean.getContent());
@@ -381,7 +381,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
         mList.add(bean);
 
         if (isSlideToBottom(mRecyclerView)) {
-            mRecyclerView.smoothScrollToPosition(getItemCount() - 1);
+            scrollToBottom(mRecyclerView);
         } else {
             Bus.get().post(new LiveAudienceEvent()
                     .setType(LiveAudienceEvent.LiveAudienceType.NEW_MESSAGE_REMINDER));
@@ -396,6 +396,19 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
 
     }
 
+    private void scrollToBottom(final RecyclerView recyclerView) {
+        // scroll to last item to get the view of last item
+        final LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+        final int lastItemPosition = getItemCount() - 1;
+        recyclerView.post(new Runnable() {
+            @Override
+            public void run() {
+                layoutManager.scrollToPositionWithOffset(lastItemPosition, Integer.MIN_VALUE);
+
+            }
+        });
+    }
+
     /**
      * 判断是否滚到底部
      *
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 0b603240e..bc966da83 100644
--- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
+++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
@@ -185,6 +185,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
 
     private View loading;
 
+    private int landscape;
+
     public PortraitLiveManager setQuitF(boolean quitF) {
         isQuitF = quitF;
         return this;
@@ -341,7 +343,8 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                 .enterRoomNew(mLiveBean.getStream(), mLiveBean.getUid(), mLiveBean.getCity(), new com.yunbao.common.http.base.HttpCallback<EnterRoomNewModel>() {
                     @Override
                     public void onSuccess(EnterRoomNewModel data) {
-                        mLivePlayViewHolder.setLiveBeanLandscape(data.getLiveInfo().getLandscape());
+                        landscape = data.getLiveInfo().getLandscape();
+                        mLivePlayViewHolder.setLiveBeanLandscape(landscape);
                         //是否热度卡加成
                         liveHandler.postDelayed(() -> mLiveRoomViewHolder.getIsHot(data.getIsUseHotCard()), 700);
 
@@ -1228,6 +1231,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
             }, 4000);//3秒后执行Runnable中的run方法
 
         }
+        if (mLivePlayViewHolder!=null){
+            mLivePlayViewHolder.setLiveBeanLandscape(1);
+        }
     }
 
     @Override
@@ -1239,6 +1245,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                 mLiveRoomViewHolder.resetViewGone();
             }
         }
+        if (mLiveRoomViewHolder != null) {
+            mLivePlayViewHolder.setLiveBeanLandscape(landscape);
+        }
     }
 
     @Override
@@ -1262,6 +1271,9 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
             mLiveRyLinkMicPkPresenter.onLinkMicPkEnd(winUid);
             mLiveRoomViewHolder.setDelOtherInfo();
         }
+        if (mLiveRoomViewHolder != null) {
+            mLivePlayViewHolder.setLiveBeanLandscape(landscape);
+        }
     }
 
     @Override