feat:全局性广播飘窗-增加地区隔离逻辑(只展示当前地区的飘屏)

This commit is contained in:
max
2024-04-22 15:20:50 +08:00
parent d3b16529e1
commit 9c63c56488
8 changed files with 49 additions and 3 deletions

View File

@@ -16,4 +16,5 @@ public class LuckyBagNoticeInfo implements Serializable {
private String luckyBagGiftPic;
private String giftPic;
private int giftNum;
private long partitionId;
}

View File

@@ -11,4 +11,5 @@ public class RoomBoxPrizeInfo {
private long roomUid;
private int prizeNum;
private int userLevelLimit;
private long partitionId;
}

View File

@@ -18,6 +18,8 @@ class RoomTemplateNotifyMsgBean : TemplateMessage() {
// SVGA-文本的坑位KEY
private var svgaTextKey: String? = null
val partitionId: Long? = null
fun getSvgaTextKey(): String {
return svgaTextKey ?: "noble_text_tx"
}

View File

@@ -49,6 +49,16 @@ public class AllServiceGiftProtocol extends BaseProtocol<AllServiceGiftProtocol.
private String levelNum;
private boolean isHomeShow;
private long partitionId;
public long getPartitionId() {
return partitionId;
}
public void setPartitionId(long partitionId) {
this.partitionId = partitionId;
}
public String getSendUserNick() {
return sendUserNick;
}

View File

@@ -245,4 +245,5 @@ public interface IUserModel extends IModel {
*/
Single<String> saveArea(String area);
boolean isSamePartition(long partitionId);
}

View File

@@ -838,6 +838,14 @@ public final class UserModel extends BaseModel implements IUserModel {
.compose(RxHelper.handleSchedulers());
}
@Override
public boolean isSamePartition(long partitionId) {
if (currentUserInfo.partitionId == 0) {
return true;
}
return currentUserInfo.partitionId == partitionId;
}
private interface Api {
/**
* 获取某个用户的用户信息

View File

@@ -334,6 +334,10 @@ public class UserInfo implements Serializable {
@Setter
public boolean inOnline;
@Getter
@Setter
public long partitionId;
public UserInfo() {
}
@@ -366,6 +370,7 @@ public class UserInfo implements Serializable {
this.bindType = userInfo.bindType;
this.isReview = userInfo.isReview;
this.newAvatar = userInfo.newAvatar;
this.partitionId = userInfo.partitionId;
}
public Location getUserExpand() {
@@ -713,6 +718,14 @@ public class UserInfo implements Serializable {
this.familyId = familyId;
}
public long getPartitionId() {
return partitionId;
}
public void setPartitionId(long partitionId) {
this.partitionId = partitionId;
}
@Override
public String toString() {
return "UserInfo{" +