From bb31bafa5596f5ad7fab85b85b1fa1495bd63467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Thu, 25 Dec 2025 10:31:47 +0800 Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E7=BB=83=E6=AD=8C=E6=88=BF?= =?UTF-8?q?=E7=82=B9=E6=AD=8C=E5=90=8E=EF=BC=8C=E6=9F=90=E4=BA=9B=E6=AD=8C?= =?UTF-8?q?=E6=9B=B2=E8=BF=94=E5=9B=9E=E7=9A=84=E7=B1=BB=E5=9E=8B=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=202:=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E9=A1=B5=E6=92=AD=E6=94=BE=E8=A7=86=E9=A2=91=EF=BC=8C=E9=BB=91?= =?UTF-8?q?=E5=B1=8F=E5=90=8E=E7=9B=B4=E6=8E=A5=E8=B7=B3=E8=BF=87=E6=92=AD?= =?UTF-8?q?=E6=94=BE=203=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=80=80=E5=87=BA?= =?UTF-8?q?=E5=85=B3=E9=97=ADmqtt=204=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E5=BA=94=E7=94=A8=EF=BC=8C=E4=BC=9A=E5=9C=A8=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=92=8C=E7=BC=96=E8=BE=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=BC=B9=E8=B5=B7=E5=BC=B9=E6=A1=86=E5=92=8C=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E7=9A=84=E9=97=AE=E9=A2=98=205:=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=88=BF=E9=97=B4=EF=BC=8C=E5=9C=A8=E6=8E=A8=E9=80=81=E4=BA=86?= =?UTF-8?q?=E7=A4=BC=E7=89=A9=E5=90=8E=EF=BC=8C=E5=A4=9A=E6=AC=A1=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E5=B8=83=E5=B1=80=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xscm/moduleutil/http/RetrofitClient.java | 2 +- .../xscm/moduleutil/service/MqttConnect.java | 2 +- .../xscm/moduleutil/utils/SPConstants.java | 2 +- .../java/com/xscm/modulemain/Application.kt | 5 +- .../activity/room/activity/RoomActivity.kt | 10 +- .../room/fragment/RequestFragment.java | 2 +- app/src/main/AndroidManifest.xml | 239 +++++++++--------- .../com/qxcm/qxlive/LaunchPageActivity.java | 8 +- 8 files changed, 145 insertions(+), 125 deletions(-) diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index bc7b7f34..012b4181 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -2893,7 +2893,7 @@ public class RetrofitClient { observer.onNext(indexRecommendRoomBaseModel.getData()); } } else if (indexRecommendRoomBaseModel.getCode() == 0) { - ToastUtils.showShort(indexRecommendRoomBaseModel.getMsg()); +// ToastUtils.showShort(indexRecommendRoomBaseModel.getMsg()); } else if (indexRecommendRoomBaseModel.getCode() == 301) { setCode301(indexRecommendRoomBaseModel.getMsg()); } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/service/MqttConnect.java b/BaseModule/src/main/java/com/xscm/moduleutil/service/MqttConnect.java index 70499211..31b624e8 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/service/MqttConnect.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/service/MqttConnect.java @@ -139,8 +139,8 @@ public class MqttConnect { public void close() { if (mqttClient != null && mqttClient.isConnected()) { try { - mqttClient.close(); mqttClient.disconnect(); + mqttClient.close(); mqttClient = null; } catch (MqttException e) { LogUtils.e(Tag, "关闭MQTT连接报错：" + e.getMessage()); diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/utils/SPConstants.java b/BaseModule/src/main/java/com/xscm/moduleutil/utils/SPConstants.java index 0d53a0b7..b513b2d5 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/utils/SPConstants.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/utils/SPConstants.java @@ -32,7 +32,7 @@ public class SPConstants { public static final String USER_INFO = "userInfo"; - public static final String FLOATING_SCREEN = "floatingScreen"; + public static final String FLOATING_SCREEN = "floatingScreen";//飘屏开关 public static final String SHELF = "shelf";//货架 diff --git a/MainModule/src/main/java/com/xscm/modulemain/Application.kt b/MainModule/src/main/java/com/xscm/modulemain/Application.kt index d60ba55d..729348d1 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/Application.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/Application.kt @@ -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() { 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 } 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 e97be8dd..2473cd53 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 @@ -1317,6 +1317,9 @@ class RoomActivity : BaseMvpActivity(), 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(), } 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(), } 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(), 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); diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestFragment.java index 5fd7e97c..a7b82c61 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestFragment.java @@ -161,7 +161,7 @@ public class RequestFragment extends BaseMvpFragment - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - + - - - - - - + + + + + + - + - - - + + + - + - - + + - + + - - - - - - + + + + + + - - + + - - + + - - + + - + + + tools:targetApi="tiramisu"> - - - - + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - + android:launchMode="singleTask" + android:theme="@android:style/Theme.Translucent.NoTitleBar"> + android:exported="true"> + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java index 49f05690..11517bf4 100644 --- a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java +++ b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java @@ -19,6 +19,7 @@ import androidx.annotation.Nullable; import com.alibaba.android.arouter.launcher.ARouter; import com.blankj.utilcode.util.LogUtils; +import com.blankj.utilcode.util.ScreenUtils; import com.qxcm.qxlive.databinding.ActivityLaunchPageBinding; import com.tencent.qgame.animplayer.AnimConfig; import com.tencent.qgame.animplayer.inter.IAnimListener; @@ -303,7 +304,6 @@ public class LaunchPageActivity extends BaseMvpActivity