diff --git a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
index 9657ff8a..e297f9e1 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/BaseMvpActivity.java
@@ -749,7 +749,7 @@ public abstract class BaseMvpActivity
{
// 播放完成后重置,以便下次重新播放
try {
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
index 0b026229..347f88c6 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
@@ -1639,10 +1639,11 @@ class RoomActivity : BaseMvpActivity(),
// if (mRoomInfoResp?.user_info?.pit_number != 0) {
// MvpPre?.downPit(roomId, mRoomInfoResp?.user_info?.pit_number.toString())
// }
+
AgoraManager.getInstance().lastRoomId = roomId
MvpPre?.getRoomIn(messageEvent.text.room_id, "")
+ MessageExListenerSingleton.getInstance().joinGroup(messageEvent.text.room_id)
if (publicScreenFragment != null) {
- MessageExListenerSingleton.getInstance().joinGroup(messageEvent.text.room_id)
publicScreenFragment?.setupExMessageListener()
publicScreenFragment?.setIsPriRoom(
true,
@@ -4037,6 +4038,12 @@ class RoomActivity : BaseMvpActivity(),
publicScreenFragment?.clearExMessageListener()
publicScreenFragment?.setIsPriRoom(false, arrayListOf())
}
+
+// if (publicScreenFragment != null) {
+// publicScreenFragment!!.onFragmentShowDestroy()
+// publicScreenFragment = null
+// }
+
// MvpPre?.getRoomIn(AgoraManager.getInstance().lastRoomId, "")
// AgoraManager.getInstance().lastRoomId = ""
}
diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
index 11f0130e..5e2b190a 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/ChatRoomFragment.java
@@ -179,6 +179,9 @@ public class ChatRoomFragment extends BaseMvpFragment {
diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
index 289fb6fc..e7b15d6c 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
@@ -561,9 +561,9 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter 100) {
- int removeCount = mData.size() - 100;
- mData.subList(0, removeCount).clear();
+ if (mData.size() > 200) {
+ int removeCount = mData.size() - 200;
+ mData.subList(0, 100).clear();
notifyDataSetChanged();
}
}
@@ -595,9 +595,9 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter list) {
- if (list.size() > 100) {
- int removeCount = list.size() - 100;
- list.subList(0, removeCount).clear();
+ if (list.size() > 200) {
+ int removeCount = list.size() - 200;
+ list.subList(0, 100).clear();
}
}
diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java
index 6cdc1e0b..998b78b1 100644
--- a/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java
+++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/GiftLotteryDialog.java
@@ -759,7 +759,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment