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

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

View File

@@ -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());
}

View File

@@ -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());

View File

@@ -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";//货架

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
}

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);

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));

View File

@@ -12,132 +12,136 @@
android:name="android.hardware.camera"
android:required="false" />
<!-- <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
<!-- <uses-permission android:name="android.permission.READ_PHONE_STATE" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.GET_ACCOUNTS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.CALL_PHONE"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.READ_LOGS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.READ_CALL_LOG"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.WRITE_CALL_LOG"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.READ_SMS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.SEND_SMS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.WRITE_SMS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.RECEIVE_SMS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.RECEIVE_WAP_PUSH"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.RECEIVE_MMS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.SEND_MMS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.PROCESS_OUTGOING_CALLS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.GET_ACCOUNTS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.CALL_PHONE"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.READ_LOGS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.READ_CALL_LOG"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.WRITE_CALL_LOG"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.READ_SMS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.SEND_SMS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.WRITE_SMS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.RECEIVE_SMS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.RECEIVE_WAP_PUSH"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.RECEIVE_MMS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.SEND_MMS"-->
<!-- tools:node="remove" />-->
<!-- <uses-permission-->
<!-- android:name="android.permission.PROCESS_OUTGOING_CALLS"-->
<!-- tools:node="remove" />-->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<!-- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> 显示系统窗口-->
<!-- <uses-permission android:name="android.permission.NETWORK_PROVIDER" />-->
<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> 访问近似位置-->
<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> 获取精准位置-->
<!-- <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> 显示系统窗口-->
<!-- <uses-permission android:name="android.permission.NETWORK_PROVIDER" />-->
<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> 访问近似位置-->
<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> 获取精准位置-->
<uses-permission android:name="android.permission.VIBRATE" />
<!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> 录音功能-->
<!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> 录音功能-->
<uses-permission android:name="android.permission.CAMERA" />
<!-- <uses-permission android:name="android.permission.FLASHLIGHT" />//闪光灯-->
<!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" <&#45;&#45; 访问存储权限&ndash;&gt;-->
<!-- android:maxSdkVersion="32"-->
<!-- />-->
<!-- <uses-permission android:name="android.permission.GET_TASKS" />-->
<!-- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />-->
<!-- <uses-permission android:name="android.permission.FLASHLIGHT" />//闪光灯-->
<!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" <&#45;&#45; 访问存储权限&ndash;&gt;-->
<!-- android:maxSdkVersion="32"-->
<!-- />-->
<!-- <uses-permission android:name="android.permission.GET_TASKS" />-->
<!-- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />-->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.REORDER_TASKS" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<!-- <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> 管理账户列表-->
<!-- <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" /> 管理账户列表-->
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<!-- <uses-permission android:name="android.permission.WRITE_SETTINGS" />-->
<!-- <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" /> 获取精准位置 -->
<!-- <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />-->
<!-- <uses-permission android:name="android.permission.WRITE_SETTINGS" />-->
<!-- <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" /> 获取精准位置 -->
<!-- <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />-->
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<uses-feature android:glEsVersion="0x00020000" android:required="true" />
<uses-feature
android:glEsVersion="0x00020000"
android:required="true" />
<queries>
<package android:name="com.tencent.mm" />
</queries>
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
tools:ignore="ProtectedPermissions"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.CAMERA"/>
<!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"-->
<!-- android:required="false"-->
<!-- android:maxSdkVersion="32"/>-->
<uses-permission
android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
tools:ignore="ProtectedPermissions" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.CAMERA" />
<!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"-->
<!-- android:required="false"-->
<!-- android:maxSdkVersion="32"/>-->
<!-- <uses-permission android:name="android.permission.BLUETOOTH"/>-->
<!-- <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>-->
<!-- <uses-permission android:name="android.permission.BLUETOOTH"/>-->
<!-- <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>-->
<!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" /> 自定义权限 -->
<!-- <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> 自定义权限 -->
<!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" /> 自定义权限 -->
<!-- <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> 自定义权限 -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
<!-- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" 读写系统安全设置-->
<!-- tools:ignore="ProtectedPermissions" />-->
<!-- <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" 读写系统安全设置-->
<!-- tools:ignore="ProtectedPermissions" />-->
<!-- 声明前台服务权限 -->
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CAMERA" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<application
android:name="com.qxcm.qxlive.AppContext"
android:allowBackup="true"
android:extractNativeLibs="true"
android:largeHeap="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:enableOnBackInvokedCallback="true"
android:extractNativeLibs="true"
android:fullBackupContent="@xml/backup_rules"
android:requestLegacyExternalStorage="true"
android:resizeableActivity="true"
android:icon="@mipmap/ic_launcher_app"
android:label="@string/app_name"
android:largeHeap="true"
android:networkSecurityConfig="@xml/network_security_config"
android:requestLegacyExternalStorage="true"
android:requestRawExternalStorageAccess="true"
android:resizeableActivity="true"
android:roundIcon="@mipmap/ic_launcher_foreground"
android:supportsRtl="true"
android:theme="@style/AppTheme_MAIN"
android:networkSecurityConfig="@xml/network_security_config"
android:usesCleartextTraffic="true"
tools:ignore="SelectedPhotoAccess"
tools:replace="android:theme,android:allowBackup,android:roundIcon,android:icon"
android:enableOnBackInvokedCallback="true"
android:requestRawExternalStorageAccess="true"
tools:targetApi="tiramisu"
>
tools:targetApi="tiramisu">
<activity
android:name=".LaunchPageActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
@@ -148,23 +152,20 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="com.qxcm.qxlive.LAUNCH_PAGE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<!-- 配置APP ID -->
<meta-data
android:name="BUGLY_APPID"
android:value="b45883f58f" />
<!-- &lt;!&ndash; 配置APP版本号 &ndash;&gt;-->
<!-- <meta-data-->
<!-- android:name="BUGLY_APP_VERSION"-->
<!-- android:value="<APP_Version>" />-->
<!-- &lt;!&ndash; 配置APP渠道号 &ndash;&gt;-->
<!-- <meta-data-->
<!-- android:name="BUGLY_APP_CHANNEL"-->
<!-- android:value="<APP_Channel>" />-->
<!-- &lt;!&ndash; 配置APP版本号 &ndash;&gt;-->
<!-- <meta-data-->
<!-- android:name="BUGLY_APP_VERSION"-->
<!-- android:value="<APP_Version>" />-->
<!-- &lt;!&ndash; 配置APP渠道号 &ndash;&gt;-->
<!-- <meta-data-->
<!-- android:name="BUGLY_APP_CHANNEL"-->
<!-- android:value="<APP_Channel>" />-->
<!-- 配置Bugly调试模式true或者false-->
<meta-data
android:name="BUGLY_ENABLE_DEBUG"
@@ -177,20 +178,19 @@
android:launchMode="singleTask"
android:theme="@style/authsdk_activity_dialog" />
<!-- <activity-->
<!-- android:name="com.mobile.auth.gatewayauth.activity.AuthWebVeiwActivity"-->
<!-- android:configChanges="orientation|keyboardHidden|screenSize"-->
<!-- android:exported="false"-->
<!-- android:launchMode="singleTop"-->
<!-- android:screenOrientation="behind" />-->
<!-- <activity-->
<!-- android:name="com.mobile.auth.gatewayauth.activity.AuthWebVeiwActivity"-->
<!-- android:configChanges="orientation|keyboardHidden|screenSize"-->
<!-- android:exported="false"-->
<!-- android:launchMode="singleTop"-->
<!-- android:screenOrientation="behind" />-->
<activity
android:name=".wxapi.WXEntryActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:exported="true"
android:launchMode="singleTask">
</activity>
android:launchMode="singleTask"
android:theme="@android:style/Theme.Translucent.NoTitleBar"></activity>
<!-- 微信支付回调Activity必须放在包名.wxapi路径下 -->
<activity
android:name=".wxapi.WXPayEntryActivity"
@@ -199,22 +199,27 @@
<activity
android:name=".PasswordLoginActivity"
android:exported="true"
/>
android:exported="true">
<intent-filter>
<action android:name="com.qxcm.qxlive.LAUNCH_PAGE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
</application>
<!-- <queries>-->
<!-- &lt;!&ndash; 支付宝 scheme &ndash;&gt;-->
<!-- <intent>-->
<!-- <action android:name="android.intent.action.VIEW" />-->
<!-- <data android:scheme="alipays" />-->
<!-- </intent>-->
<!-- <queries>-->
<!-- &lt;!&ndash; 支付宝 scheme &ndash;&gt;-->
<!-- <intent>-->
<!-- <action android:name="android.intent.action.VIEW" />-->
<!-- <data android:scheme="alipays" />-->
<!-- </intent>-->
<!-- &lt;!&ndash; 微信 scheme &ndash;&gt;-->
<!-- <intent>-->
<!-- <action android:name="android.intent.action.VIEW" />-->
<!-- <data android:scheme="weixin" />-->
<!-- </intent>-->
<!-- </queries>-->
<!-- &lt;!&ndash; 微信 scheme &ndash;&gt;-->
<!-- <intent>-->
<!-- <action android:name="android.intent.action.VIEW" />-->
<!-- <data android:scheme="weixin" />-->
<!-- </intent>-->
<!-- </queries>-->
</manifest>

View File

@@ -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<IPresenter,ActivityLaunc
// 使用videoView获取当前播放位置而不是mediaPlayer
int currentPosition = videoView.getCurrentPosition();
mBinding.progress.setCurProgress(currentPosition);
// 继续更新进度
handler.postDelayed(this, 100); // 每100毫秒更新一次
}
@@ -324,6 +324,12 @@ public class LaunchPageActivity extends BaseMvpActivity<IPresenter,ActivityLaunc
setViodeo();
}
@Override
protected void onStop() {
super.onStop();
setEnter();
}
@Override
protected int getLayoutId() {
return R.layout.activity_launch_page;