YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1:修改练歌房点歌后，某些歌曲返回的类型错误，

Browse Source 
2:修改启动页播放视频，黑屏后直接跳过播放
3：修改退出关闭mqtt
4：修改进入应用，会在登录页面和编辑页面弹起弹框和推荐的问题
5:修改房间，在推送了礼物后，多次判断是否布局打开
This commit is contained in:
梁小江
2025-12-25 10:31:47 +08:00
parent 826469178e
commit bb31bafa55
8 changed files with 145 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MainModule/src/main/java/com/xscm/modulemain/Application.kt
View File

@@ -13,6 +13,7 @@ import com.opensource.svgaplayer.utils.log.SVGALogger
import com.scwang.smartrefresh.layout.SmartRefreshLayout
import com.scwang.smartrefresh.layout.footer.ClassicsFooter
import com.scwang.smartrefresh.layout.header.ClassicsHeader
import com.xscm.modulemain.activity.login.activity.ImproveInfoActivity
import com.xscm.modulemain.activity.room.activity.RoomActivity
import com.xscm.modulemain.dialog.InviteDialog
import com.xscm.modulemain.manager.RoomManager
@@ -240,7 +241,7 @@ open class Application : CommonAppContext() {
fun bgToForeground() {
AppUtils.registerAppStatusChangedListener(object : Utils.OnAppStatusChangedListener {
override fun onForeground(activity: Activity?) {//应用切换到前台
if (!CommonAppContext.getInstance().isPlaying) {
if (!CommonAppContext.getInstance().isPlaying && activity !is ImproveInfoActivity ) {
RetrofitClient.getInstance()
.index_recommend_room(object : BaseObserver<IndexRecommendRoom>() {
override fun onSubscribe(d: Disposable) {
@@ -265,7 +266,7 @@ open class Application : CommonAppContext() {
fun showInviteDialog(activity: Activity?, t: IndexRecommendRoom) {
if (isKeepScreenOn)
return
if (activity != null && activity == getCurDialogActivity() && inviteDialog != null) {
if (activity != null && activity == getCurDialogActivity() && inviteDialog != null && activity !is ImproveInfoActivity) {
inviteDialog?.setData(t)
return
}

10
MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

@@ -1317,6 +1317,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
val text = messageEvent.text
if (msgType == EMMessageInfo.QXRoomMessageTypeGift) {
GiftDisplayManager.getInstance().setupDisplayView(mBinding?.giftContainer)
LogUtils.e("@@@@" + "EventBusnujm2" + "playQueue.size()====" + messageEvent.text.giftInfo)
val playQueue = Arrays.asList(
*messageEvent.text.giftInfo.play_image.split(",".toRegex())
@@ -1500,6 +1503,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
} else if (msgType == EMMessageInfo.QXRoomMessageTypeCPText) {
LogUtils.e("CPText", messageEvent.text.rights_icon)
if (messageEvent.text.rights_icon.isNotEmpty()) {
GiftDisplayManager.getInstance().setupDisplayView(mBinding?.giftContainer)
QXGiftPlayerManager.getInstance(this).displayCPView(
messageEvent.text.fromUserInfo.avatar,
messageEvent.text.toUserInfo.avatar,
@@ -1519,6 +1523,9 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
} else if (msgType == EMMessageInfo.QXRoomMessageTypeSignTipText) {
roomFragment?.handleRoomMessage(messageEvent)
} else if (msgType == EMMessageInfo.QXRoomMessageTypeSignChat) {//暴币展示
GiftDisplayManager.getInstance().setupDisplayView(mBinding?.giftContainer)
QXGiftPlayerManager.getInstance(this)
.displayChatEffectView(messageEvent.text.play_image)
}
@@ -3423,7 +3430,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
override fun onResume() {
super.onResume()
//在后台关闭礼物弹出，前台恢复礼物弹出
GiftDisplayManager.getInstance().setupDisplayView(mBinding?.giftContainer)
// GiftDisplayManager.getInstance().setupDisplayView(mBinding?.giftContainer) 2025年12月24日19:50:16，测试将这段放在推送过来的时候，看会不会出现礼物不展示的情况
// AgoraManager.getInstance().cleanup()
// AgoraManager.getInstance()
// .joinRoom(SpUtil.getRtmToken(), roomId, SpUtil.getUserId(), false, false);

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestFragment.java
View File

@@ -161,7 +161,7 @@ public class RequestFragment extends BaseMvpFragment<RequestPresenter, FragmentR
protected void convert(BaseViewHolder helper, Music item) {
LogUtils.e("@@@", item);
helper.setText(R.id.muis_name, item.getName());
helper.setText(R.id.muis_desc, TimeUtils.formatDuration(item.getReleaseTime().isEmpty() ? 0 : Long.parseLong(item.getReleaseTime())));
// helper.setText(R.id.muis_desc, TimeUtils.formatDuration(item.getReleaseTime().isEmpty() ? 0 : Long.parseLong(item.getReleaseTime())));
helper.setText(R.id.muis_desc, "\t" + item.getSinger());
ImageUtils.loadHeadCC(item.getPoster(), helper.getView(R.id.muis_avatar));