1:修改红包声音和转盘声音,变成0.04
2:修改消息列表展示的时候,展示的事200条,清除的时候,清除前100条
This commit is contained in:
@@ -749,7 +749,7 @@ public abstract class BaseMvpActivity<P extends IPresenter, VDB extends ViewData
|
|||||||
isRedPacketMediaPrepared = true;
|
isRedPacketMediaPrepared = true;
|
||||||
mp.start();
|
mp.start();
|
||||||
});
|
});
|
||||||
redPacketMediaPlayer.setVolume(0.2f, 0.2f); // 设置音量
|
redPacketMediaPlayer.setVolume(0.1f, 0.1f); // 设置音量
|
||||||
redPacketMediaPlayer.setOnCompletionListener(mp -> {
|
redPacketMediaPlayer.setOnCompletionListener(mp -> {
|
||||||
// 播放完成后重置,以便下次重新播放
|
// 播放完成后重置,以便下次重新播放
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -1639,10 +1639,11 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
|
|||||||
// if (mRoomInfoResp?.user_info?.pit_number != 0) {
|
// if (mRoomInfoResp?.user_info?.pit_number != 0) {
|
||||||
// MvpPre?.downPit(roomId, mRoomInfoResp?.user_info?.pit_number.toString())
|
// MvpPre?.downPit(roomId, mRoomInfoResp?.user_info?.pit_number.toString())
|
||||||
// }
|
// }
|
||||||
|
|
||||||
AgoraManager.getInstance().lastRoomId = roomId
|
AgoraManager.getInstance().lastRoomId = roomId
|
||||||
MvpPre?.getRoomIn(messageEvent.text.room_id, "")
|
MvpPre?.getRoomIn(messageEvent.text.room_id, "")
|
||||||
|
MessageExListenerSingleton.getInstance().joinGroup(messageEvent.text.room_id)
|
||||||
if (publicScreenFragment != null) {
|
if (publicScreenFragment != null) {
|
||||||
MessageExListenerSingleton.getInstance().joinGroup(messageEvent.text.room_id)
|
|
||||||
publicScreenFragment?.setupExMessageListener()
|
publicScreenFragment?.setupExMessageListener()
|
||||||
publicScreenFragment?.setIsPriRoom(
|
publicScreenFragment?.setIsPriRoom(
|
||||||
true,
|
true,
|
||||||
@@ -4037,6 +4038,12 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
|
|||||||
publicScreenFragment?.clearExMessageListener()
|
publicScreenFragment?.clearExMessageListener()
|
||||||
publicScreenFragment?.setIsPriRoom(false, arrayListOf())
|
publicScreenFragment?.setIsPriRoom(false, arrayListOf())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// if (publicScreenFragment != null) {
|
||||||
|
// publicScreenFragment!!.onFragmentShowDestroy()
|
||||||
|
// publicScreenFragment = null
|
||||||
|
// }
|
||||||
|
|
||||||
// MvpPre?.getRoomIn(AgoraManager.getInstance().lastRoomId, "")
|
// MvpPre?.getRoomIn(AgoraManager.getInstance().lastRoomId, "")
|
||||||
// AgoraManager.getInstance().lastRoomId = ""
|
// AgoraManager.getInstance().lastRoomId = ""
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -179,6 +179,9 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
|
|||||||
MessageExListenerSingleton.getInstance().removePublicScreenMessageListener(messageExListener);
|
MessageExListenerSingleton.getInstance().removePublicScreenMessageListener(messageExListener);
|
||||||
messageListener = null;
|
messageListener = null;
|
||||||
}
|
}
|
||||||
|
if (easeChatAdapter != null){
|
||||||
|
easeChatAdapter.clearData();
|
||||||
|
}
|
||||||
mIsPriRoom = true;
|
mIsPriRoom = true;
|
||||||
// 创建并添加监听器
|
// 创建并添加监听器
|
||||||
messageExListener = message -> {
|
messageExListener = message -> {
|
||||||
|
|||||||
@@ -561,9 +561,9 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
|
|||||||
if (shouldAddToAdapter(data)) {
|
if (shouldAddToAdapter(data)) {
|
||||||
super.addData(data);
|
super.addData(data);
|
||||||
// 确保适配器数据量也不超过限制
|
// 确保适配器数据量也不超过限制
|
||||||
if (mData.size() > 100) {
|
if (mData.size() > 200) {
|
||||||
int removeCount = mData.size() - 100;
|
int removeCount = mData.size() - 200;
|
||||||
mData.subList(0, removeCount).clear();
|
mData.subList(0, 100).clear();
|
||||||
notifyDataSetChanged();
|
notifyDataSetChanged();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -595,9 +595,9 @@ public class EaseChatAdapter extends BaseMultiItemQuickAdapter<EMMessageInfo, Ba
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void trimListToMaxSize(List<EMMessageInfo> list) {
|
private void trimListToMaxSize(List<EMMessageInfo> list) {
|
||||||
if (list.size() > 100) {
|
if (list.size() > 200) {
|
||||||
int removeCount = list.size() - 100;
|
int removeCount = list.size() - 200;
|
||||||
list.subList(0, removeCount).clear();
|
list.subList(0, 100).clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -759,7 +759,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment<GiftLotteryPresente
|
|||||||
// 从assets目录加载音频文件
|
// 从assets目录加载音频文件
|
||||||
AssetFileDescriptor afd = getContext().getAssets().openFd(fileName);
|
AssetFileDescriptor afd = getContext().getAssets().openFd(fileName);
|
||||||
player = new MediaPlayer();
|
player = new MediaPlayer();
|
||||||
player.setVolume(0.2f,0.2f);
|
player.setVolume(0.04f,0.04f);
|
||||||
player.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
|
player.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
|
||||||
player.prepare();
|
player.prepare();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
|
|||||||
Reference in New Issue
Block a user