Explorar o código

弹幕区没有持续滚到底部的问题
去掉 视频 语音 房切换

jlin hai 1 mes
pai
achega
f58ccb4491

+ 3 - 0
baselibrary/src/main/java/com/yc/baselibrary/view/MessageRvExtend.kt

@@ -1,5 +1,6 @@
 package com.yc.baselibrary.view
 
+import android.util.Log
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 
@@ -17,6 +18,7 @@ fun RecyclerView.isBottom() : Boolean{
 }
 
 fun RecyclerView.isBottom2(): Boolean {
+    Log.v("isBottom", "")
     val layoutManager = layoutManager as? LinearLayoutManager ?: return false
 
     val lastItemPosition = layoutManager.itemCount - 1
@@ -25,6 +27,7 @@ fun RecyclerView.isBottom2(): Boolean {
     val lastVisiblePosition = layoutManager.findLastVisibleItemPosition()
     if (lastVisiblePosition == RecyclerView.NO_POSITION) return false // 确保有可见项
 
+    Log.v("isBottom 1111111", "$lastItemPosition ----- $lastVisiblePosition")
     // 如果最后一个可见项是最后一个数据项或倒数第二个数据项,则判断为已经到底部
     return lastVisiblePosition >= lastItemPosition - 1
 }

+ 2 - 2
module_live/src/main/java/com/yc/module_live/view/live/livetop/TopLiveLayerFragment.kt

@@ -922,7 +922,7 @@ class TopLiveLayerFragment : TopLiveLayerClickFragment<TopLayerVm>(),
     fun scrollToBottom(fromUserId: Long?) {
 
         val inBottom = recyclerMessage.isBottom2()
-        Log.v("TTTTTTTTTinBottomIndex", "${inBottom}${recyclerMessage.adapter?.itemCount}")
+        Log.v("isBottom 2222222", "${inBottom}, ${recyclerMessage.adapter?.itemCount}")
 
         if (fromUserId == userId || inBottom) {
             if (recyclerMessage != null && viewModel.publicChatList.size > 1) {
@@ -1098,7 +1098,7 @@ class TopLiveLayerFragment : TopLiveLayerClickFragment<TopLayerVm>(),
                     rlGiftContainer.addGift(gift)
                 }
             }
-            insertWinPublicChat(it)//插入公聊
+//            insertWinPublicChat(it)//插入公聊
         }
 
     }

+ 7 - 8
module_live/src/main/java/com/yc/module_live/view/toplayer/TopLayerVm.kt

@@ -164,7 +164,7 @@ class TopLayerVm(
 
     fun insertPublicChatRoomNotice(notice: String?) {
         if (notice.isNullOrEmpty()) return
-        publicChatList.add(PublicChatNoticeWrap(notice))
+//        publicChatList.add(PublicChatNoticeWrap(notice))
     }
 
     fun insertPublicChatOther(content: String?) {
@@ -177,16 +177,15 @@ class TopLayerVm(
     }
 
     fun insertWinLuckyMsg(gift: Gift?) {
-        gift?.let {
-            publicChatList.add(PublicChatWinWrap(gift))
-        }
-
+//        gift?.let {
+//            publicChatList.add(PublicChatWinWrap(gift))
+//        }
     }
 
     fun insertEmojiMsg(emoji: Emoji?) {
-        emoji?.let {
-            publicChatList.add(emoji)
-        }
+//        emoji?.let {
+//            publicChatList.add(emoji)
+//        }
 
     }
 

+ 1 - 0
module_live/src/main/res/layout/module_room_live_diaglog_fragment.xml

@@ -175,6 +175,7 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_36"
+                android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"

+ 11 - 10
module_live/src/main/res/layout/module_room_voice_pre_fragment.xml

@@ -25,16 +25,16 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-<!--            <ImageView-->
-<!--                android:id="@+id/iv_cover"-->
-<!--                android:layout_width="@dimen/dp_56"-->
-<!--                android:layout_height="@dimen/dp_56"-->
-<!--                android:scaleType="centerInside"-->
-<!--                android:src="@drawable/icon_cover"-->
-<!--                app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                app:layout_constraintDimensionRatio="1:1"-->
-<!--                app:layout_constraintStart_toStartOf="parent"-->
-<!--                app:layout_constraintTop_toTopOf="parent" />-->
+            <!--            <ImageView-->
+            <!--                android:id="@+id/iv_cover"-->
+            <!--                android:layout_width="@dimen/dp_56"-->
+            <!--                android:layout_height="@dimen/dp_56"-->
+            <!--                android:scaleType="centerInside"-->
+            <!--                android:src="@drawable/icon_cover"-->
+            <!--                app:layout_constraintBottom_toBottomOf="parent"-->
+            <!--                app:layout_constraintDimensionRatio="1:1"-->
+            <!--                app:layout_constraintStart_toStartOf="parent"-->
+            <!--                app:layout_constraintTop_toTopOf="parent" />-->
 
             <EditText
                 android:id="@+id/tvRoomTitle"
@@ -319,6 +319,7 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_36"
+                android:visibility="gone"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"