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

踢出房间限制进房bugfix

Browse Source
This commit is contained in:
huangjian
2022-09-07 15:32:27 +08:00
parent cf2a1bf8ea
commit 1d3a1fcab1
4 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/libs/arm64-v8a/libc++_shared.so
View File

Binary file not shown.

BIN
core/libs/armeabi-v7a/libc++_shared.so
View File

Binary file not shown.

4
core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java
View File

@@ -307,7 +307,7 @@ public class DemoCache {
@Nullable
public static Map<String, Long> readKickOutRoom() {
String string = SettingsPref.instance().getString(KEY_KICK_OUT_ROOM, null);
String string = SettingsPref.instance().getString(KEY_KICK_OUT_ROOM + AuthModel.get().getCurrentUid(), null);
if (TextUtils.isEmpty(string)) return null;
return new Gson().fromJson(string,
new TypeToken<Map<String, Long>>() {
@@ -323,7 +323,7 @@ public class DemoCache {
}
}
map.put(roomUid, CurrentTimeUtils.getCurrentTime());
SettingsPref.instance().putString(KEY_KICK_OUT_ROOM, new Gson().toJson(map));
SettingsPref.instance().putString(KEY_KICK_OUT_ROOM + AuthModel.get().getCurrentUid(), new Gson().toJson(map));
}

17
core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
View File

@@ -229,8 +229,6 @@ public final class AvRoomDataManager {
dragons = new ArrayList<>();
mHeadWearMap = new HashMap<>();
observerChatRoomMessage();
kickOutRoomUids = DemoCache.readKickOutRoom();
if (kickOutRoomUids == null) kickOutRoomUids = new HashMap<>();
}
public static AvRoomDataManager get() {
@@ -248,6 +246,10 @@ public final class AvRoomDataManager {
if (UserModel.get().getCacheLoginUserInfo() != null) {
UserModel.get().getCacheLoginUserInfo().setGameStatus(GameStatus.STATUS_NOT_JOIN);
}
if (kickOutRoomUids != null) {
kickOutRoomUids.clear();
kickOutRoomUids = null;
}
LogUtils.d("---------清除AvRoomDataManager数据完成---------");
}
@@ -1303,17 +1305,28 @@ public final class AvRoomDataManager {
}
public boolean isLimitEnterRoom(String roomUid) {
initKickOutRoomUids();
Long limitTime = kickOutRoomUids.get(roomUid);
return limitTime != null && CurrentTimeUtils.getCurrentTime() - limitTime < XChatConstants.KICK_OUT_ROOM_LIMIT_ENTER_TIME;
}
public void addCurrentRoomLimitEnter() {
if (mCurrentRoomInfo == null) return;
initKickOutRoomUids();
String roomUid = String.valueOf(getRoomUid());
kickOutRoomUids.put(roomUid, CurrentTimeUtils.getCurrentTime());
DemoCache.saveKickOutRoom(roomUid);
}
private void initKickOutRoomUids() {
if (kickOutRoomUids == null) {
kickOutRoomUids = DemoCache.readKickOutRoom();
}
if (kickOutRoomUids == null) {
kickOutRoomUids = new HashMap<>();
}
}
private static final class Helper {
private static final AvRoomDataManager INSTANCE = new AvRoomDataManager();
}