diff --git a/README.md b/README.md index d032a18..50f5332 100644 --- a/README.md +++ b/README.md @@ -369,8 +369,9 @@ API 文档 | TVStartPackageEvent | 收到 TV_START 数据包 | 小电视抽奖开始 | | UnknownPackageEvent | B站新增了新种类的数据包, 出现此情况请提交 issue | | | ViewerCountPackageEvent | 收到 房间人数 数据包(不是 Json) | | -| WelcomePackageEvent | 收到 WELCOME 数据包 | 欢迎(通常是 VIP) | +| WarningPackageEvent | 收到 WARNING 数据包 | 警告信息 | | WelcomeActivityPackageEvent | 收到 WELCOME_ACTIVITY 数据包 | 欢迎(活动) | +| WelcomePackageEvent | 收到 WELCOME 数据包 | 欢迎(通常是 VIP) | | WelcomeGuardPackageEvent | 收到 WELCOME_GUARD 数据包 | 欢迎(舰队) | | WishBottlePackageEvent | 收到 WISH_BOTTLE 数据包 | 许愿瓶 | diff --git a/build.gradle b/build.gradle index c313e5c..ca52210 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group = 'com.hiczp' -version = '0.0.20' +version = '0.0.21' description = 'Bilibili android client API library written in Java' apply plugin: 'idea' diff --git a/record/bullet_screen_stream_json/WARNING.json b/record/bullet_screen_stream_json/WARNING.json new file mode 100644 index 0000000..5c0abbc --- /dev/null +++ b/record/bullet_screen_stream_json/WARNING.json @@ -0,0 +1,5 @@ +{ + "cmd": "WARNING", + "msg": "违反直播分区规范,请立即更换至游戏区", + "roomid": 1365604 +} diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WarningEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WarningEntity.java new file mode 100644 index 0000000..2a6da3f --- /dev/null +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WarningEntity.java @@ -0,0 +1,43 @@ +package com.hiczp.bilibili.api.live.socket.entity; + +import com.google.gson.annotations.SerializedName; + +public class WarningEntity implements DataEntity { + /** + * cmd : WARNING + * msg : 违反直播分区规范,请立即更换至游戏区 + * roomid : 1365604 + */ + + @SerializedName("cmd") + private String cmd; + @SerializedName("msg") + private String message; + @SerializedName("roomid") + private long roomId; + + @Override + public String getCmd() { + return cmd; + } + + public void setCmd(String cmd) { + this.cmd = cmd; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public long getRoomId() { + return roomId; + } + + public void setRoomId(long roomId) { + this.roomId = roomId; + } +} diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/WarningPackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/WarningPackageEvent.java new file mode 100644 index 0000000..8bc65d3 --- /dev/null +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/WarningPackageEvent.java @@ -0,0 +1,10 @@ +package com.hiczp.bilibili.api.live.socket.event; + +import com.hiczp.bilibili.api.live.socket.LiveClient; +import com.hiczp.bilibili.api.live.socket.entity.WarningEntity; + +public class WarningPackageEvent extends ReceiveDataPackageEvent { + public WarningPackageEvent(LiveClient source, WarningEntity entity) { + super(source, entity); + } +} diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/handler/LiveClientHandler.java b/src/main/java/com/hiczp/bilibili/api/live/socket/handler/LiveClientHandler.java index cbcfbfc..3e0f8e7 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/handler/LiveClientHandler.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/handler/LiveClientHandler.java @@ -70,8 +70,9 @@ public class LiveClientHandler extends SimpleChannelInboundHandler { "SYS_MSG", SysMsgPackageEvent.class, //系统消息(小电视等) "TV_END", TVEndPackageEvent.class, //小电视抽奖结束(大奖的获得者信息) "TV_START", TVStartPackageEvent.class, //小电视抽奖开始 - "WELCOME", WelcomePackageEvent.class, //欢迎(通常是 VIP) + "WARNING", WarningPackageEvent.class, //警告消息 "WELCOME_ACTIVITY", WelcomeActivityPackageEvent.class, //欢迎(活动) + "WELCOME", WelcomePackageEvent.class, //欢迎(通常是 VIP) "WELCOME_GUARD", WelcomeGuardPackageEvent.class, //欢迎(舰队) "WISH_BOTTLE", WishBottlePackageEvent.class //许愿瓶 };