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

fix bugs.2

Browse Source
This commit is contained in:
骆召亮
2025-12-03 17:33:30 +08:00
parent 9a4b9b973b
commit 8e9f6fa23c
5 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
BaseModule/src/main/java/com/xscm/moduleutil/listener/MessageListenerSingleton.java
View File

@@ -35,6 +35,7 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
@@ -92,6 +93,7 @@ public class MessageListenerSingleton {
// 同时修改 removePublicScreenMessageListener 方法
public void removePublicScreenMessageListener(PublicScreenMessageListener listener) {
mRoomId = "";
if (listener == null) {
return;
}
@@ -203,7 +205,8 @@ public class MessageListenerSingleton {
if (TextUtils.isEmpty(roomId)) {
return;
}
mRoomId = roomId;
if (Objects.equals(mRoomId, roomId))
return;
synchronized (groupOperationLock) {
if (isGroupOperationInProgress) {
// 如果有操作正在进行，延迟执行
@@ -214,7 +217,7 @@ public class MessageListenerSingleton {
isGroupOperationInProgress = true;
}
mRoomId = roomId;
new Thread(() -> {
try {
// 先退出当前群组（如果需要）

22
BaseModule/src/main/java/com/xscm/moduleutil/widget/BaseWheatView.java
View File

@@ -179,16 +179,7 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
setCardiac(pitBean.getCharm(), getTzbl());
if (bean.getUser_id() != null && !bean.getUser_id().equals("0") && !bean.getUser_id().isEmpty()) {
// if (CommonAppContext.getInstance().getOnlineMap() != null && CommonAppContext.getInstance().getOnlineMap().get(bean.getUser_id()) != null) {
// iv_on_line.setVisibility(CommonAppContext.getInstance().getOnlineMap().get(bean.getUser_id()) == 1 ? GONE : VISIBLE);
// } else {
// iv_on_line.setVisibility(GONE);
// }
if (bean.getIs_online()== 1) {
iv_on_line.setVisibility(GONE);
}else {
iv_on_line.setVisibility(VISIBLE);
}
iv_on_line.setVisibility(pitBean.getIs_online() == 1 ? GONE : VISIBLE);
} else {
iv_on_line.setVisibility(GONE);
}
@@ -429,16 +420,7 @@ public abstract class BaseWheatView extends ConstraintLayout implements IBaseWhe
public void setOnlineStatus() {
if (pitBean.getUser_id() != null && !pitBean.getUser_id().equals("0") && !pitBean.getUser_id().isEmpty()) {
// if (CommonAppContext.getInstance().getOnlineMap() != null && CommonAppContext.getInstance().getOnlineMap().get(pitBean.getUser_id()) != null) {
// iv_on_line.setVisibility(CommonAppContext.getInstance().getOnlineMap().get(pitBean.getUser_id()) == 1 ? GONE : VISIBLE);
// } else {
// iv_on_line.setVisibility(GONE);
// }
if(pitBean.getIs_online()==1){
iv_on_line.setVisibility(GONE);
}else {
iv_on_line.setVisibility(VISIBLE);
}
iv_on_line.setVisibility(pitBean.getIs_online() == 1 ? GONE : VISIBLE);
} else {
iv_on_line.setVisibility(GONE);
}