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

fix bugs.1

Browse Source
This commit is contained in:
骆召亮
2025-12-05 14:26:38 +08:00
parent 4136077e98
commit 3a193da90d
7 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2091,8 +2091,12 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
}
// 将视图放回池中
currentMqttView?.visibility = View.GONE
floatingViewPool.add(currentMqttView!!)
currentMqttView = null
try {
floatingViewPool.add(currentMqttView!!)
currentMqttView = null
}catch (e:Exception){
LogUtils.e("飘屏显示异常", e)
}
})
}
}
@@ -3777,7 +3781,7 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
super.onWindowFocusChanged(hasFocus)
LogUtils.e("RoomActivity", "onWindowFocusChanged")
if (hasFocus && !isLayoutAdjusted) {
adjustLayoutHeights()
// adjustLayoutHeights()
isLayoutAdjusted = true
}
}

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

@@ -119,7 +119,7 @@ public class ChatRoomFragment extends BaseMvpFragment<ChatRoomPresenter, RoomFra
this.roomId = roomInfoResp.getRoom_info().getRoom_id();
RoomMessageEvent.T t = new RoomMessageEvent.T();
t.setText("羽声严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。");
t.setText("羽声语音严禁未成年人进行直播或打赏，官方将24小时在线巡查。我们提倡绿色直播，直播间严禁出现涉政、涉恐、涉黄、涉赌等违法违规内容，严禁宣传封建迷信、宗教极端思想、出现低俗色情、吸烟酗酒等内容，严禁违反社会主义核心价值观、践踏社会道德底线、诱导打赏、低俗 PK 、买卖金币等行为，请大家共同遵守、监督并及时举报。请勿相信各类刷钻、购买礼包、游戏币及电商贩卖等非官方广告信息，谨防网络诈骗。");
// 加入群组成功
handleRoomMessage(new RoomMessageEvent(1000, roomId, t));
onChatRoomViewCreation();

3
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomBackgroundDialogFragment.java
View File

@@ -277,8 +277,9 @@ public class RoomBackgroundDialogFragment extends BaseMvpDialogFragment<RoomBack
listWithAddBtn.add(addBg);
listWithAddBtn.addAll(myBgList);
mAdapter.setNewData(listWithAddBtn); // 更新 adapter 数据并刷新
}else {
mAdapter.setNewData(publicBgList);
}
mAdapter.setNewData(publicBgList);
}
private static class MyAdapter extends BaseQuickAdapter<RoomBgBean.RoomBg, BaseViewHolder> {

1
MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/MyRoomActivity.java
View File

@@ -162,6 +162,7 @@ public class MyRoomActivity extends BaseMvpActivity<MyRoomPresenter, RoomActivit
mBinding.ll.setVisibility(View.INVISIBLE);
CommonAppContext.getInstance().isShow = false;
CommonAppContext.getInstance().isPlaying = false;
CommonAppContext.getInstance().isRoomJoininj = false;
EventBus.getDefault().post(new RoomOutEvent());
});
initListener();

1
MainModule/src/main/java/com/xscm/modulemain/adapter/MyCreateAdapter.java
View File

@@ -18,6 +18,7 @@ import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.blankj.utilcode.util.LogUtils;
import com.xscm.modulemain.R;
import com.xscm.modulemain.activity.room.activity.RoomActivity;
import com.xscm.modulemain.activity.user.activity.MyRoomActivity;

13
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
View File

@@ -488,9 +488,11 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
if (userInfo.getIs_follow() == 1) {
// mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_ygz));
mBinding.imRoomGz.setText("已关注");
mBinding.imRoomGz.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#ff999999")));
} else {
// mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_gz));
mBinding.imRoomGz.setText("+ 关注");
mBinding.imRoomGz.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#ff52FF96")));
}
if (userInfo.getIs_room_owner().equals("1")) {
@@ -918,16 +920,15 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
@Override
public void userGuanzSuccess(String s) {
LogUtils.e("userGuanzSuccess :"+userInfo.getIs_follow());
if (userInfo.getIs_follow() == 1) {
userInfo.setIs_follow(0);
// mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_gz));
mBinding.imRoomGz.setText("已关注");
mBinding.imRoomGz.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#ff999999")));
} else {
userInfo.setIs_follow(1);
// mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_ygz));
mBinding.imRoomGz.setText("+ 关注");
mBinding.imRoomGz.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#ff52FF96")));
} else {
userInfo.setIs_follow(1);
mBinding.imRoomGz.setText("已关注");
mBinding.imRoomGz.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#ff999999")));
}
}

1
MainModule/src/main/java/com/xscm/modulemain/manager/RoomManager.java
View File

@@ -123,6 +123,7 @@ public class RoomManager {
@Override
public void onNext(@NotNull RoomInfoResp roomInfoResp) {
CommonAppContext.getInstance().isRoomJoininj = false;
navigateToRoom(context, roomId, password, roomInfoResp, false, taskId);
}
});