From f83edb1a968f5325b3f4d9d7e071612078d8ec78 Mon Sep 17 00:00:00 2001 From: czp Date: Fri, 23 Feb 2018 22:41:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E7=9B=B4=E6=92=AD=E9=97=B4=E5=BC=B9?= =?UTF-8?q?=E5=B9=95=E6=8E=A8=E9=80=81=E6=9C=89=E5=85=B3=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8C=85=E5=AE=9E=E4=BD=93=E8=AE=BE=E8=AE=A1=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BB=A5=E6=96=B9=E4=BE=BF=E7=BC=96=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/live/socket/entity/ActivityEventEntity.java | 3 ++- .../bilibili/api/live/socket/entity/DanMuMsgEntity.java | 3 ++- .../hiczp/bilibili/api/live/socket/entity/DataEntity.java | 5 +++++ .../bilibili/api/live/socket/entity/GuardMsgEntity.java | 3 ++- .../hiczp/bilibili/api/live/socket/entity/LiveEntity.java | 4 +++- .../bilibili/api/live/socket/entity/PreparingEntity.java | 4 +++- .../api/live/socket/entity/RoomBlockMsgEntity.java | 3 ++- .../api/live/socket/entity/RoomSilentOffEntity.java | 3 ++- .../bilibili/api/live/socket/entity/RoomStatusEntity.java | 7 +++++++ .../bilibili/api/live/socket/entity/SendGiftEntity.java | 3 ++- .../bilibili/api/live/socket/entity/SysGiftEntity.java | 3 ++- .../bilibili/api/live/socket/entity/SysMsgEntity.java | 3 ++- .../bilibili/api/live/socket/entity/WelcomeEntity.java | 3 ++- .../api/live/socket/entity/WelcomeGuardEntity.java | 3 ++- .../bilibili/api/live/socket/entity/WishBottleEntity.java | 3 ++- 15 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/hiczp/bilibili/api/live/socket/entity/DataEntity.java create mode 100644 src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomStatusEntity.java diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/ActivityEventEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/ActivityEventEntity.java index f1e8162..5e14206 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/ActivityEventEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/ActivityEventEntity.java @@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.entity; import com.google.gson.annotations.SerializedName; -public class ActivityEventEntity { +public class ActivityEventEntity implements DataEntity { /** * cmd : ACTIVITY_EVENT * data : {"keyword":"newspring_2018","type":"cracker","limit":300000,"progress":158912} @@ -13,6 +13,7 @@ public class ActivityEventEntity { @SerializedName("data") private Data data; + @Override public String getCmd() { return cmd; } diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/DanMuMsgEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/DanMuMsgEntity.java index 05a5b00..718cd75 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/DanMuMsgEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/DanMuMsgEntity.java @@ -9,7 +9,7 @@ import java.lang.reflect.Type; import java.util.List; import java.util.Optional; -public class DanMuMsgEntity { +public class DanMuMsgEntity implements DataEntity { private static final Gson GSON = new Gson(); private static final Type STRING_LIST_TYPE = new TypeToken>() { }.getType(); @@ -24,6 +24,7 @@ public class DanMuMsgEntity { @SerializedName("info") private JsonArray info; + @Override public String getCmd() { return cmd; } diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/DataEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/DataEntity.java new file mode 100644 index 0000000..eaaf79a --- /dev/null +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/DataEntity.java @@ -0,0 +1,5 @@ +package com.hiczp.bilibili.api.live.socket.entity; + +public interface DataEntity { + String getCmd(); +} diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/GuardMsgEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/GuardMsgEntity.java index 3203607..f283da0 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/GuardMsgEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/GuardMsgEntity.java @@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.entity; import com.google.gson.annotations.SerializedName; -public class GuardMsgEntity { +public class GuardMsgEntity implements DataEntity { /** * cmd : GUARD_MSG * msg : 乘客 :?想不想joice:? 成功购买1313366房间总督船票1张，欢迎登船！ @@ -13,6 +13,7 @@ public class GuardMsgEntity { @SerializedName("msg") private String msg; + @Override public String getCmd() { return cmd; } diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/LiveEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/LiveEntity.java index 2126475..f8078c2 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/LiveEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/LiveEntity.java @@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.entity; import com.google.gson.annotations.SerializedName; -public class LiveEntity { +public class LiveEntity implements RoomStatusEntity { /** * cmd : LIVE * roomid : 1110317 @@ -13,6 +13,7 @@ public class LiveEntity { @SerializedName("roomid") private String roomId; + @Override public String getCmd() { return cmd; } @@ -21,6 +22,7 @@ public class LiveEntity { this.cmd = cmd; } + @Override public String getRoomId() { return roomId; } diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/PreparingEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/PreparingEntity.java index 26833f9..c34a98d 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/PreparingEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/PreparingEntity.java @@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.entity; import com.google.gson.annotations.SerializedName; -public class PreparingEntity { +public class PreparingEntity implements RoomStatusEntity { /** * cmd : PREPARING * roomid : 1110317 @@ -13,6 +13,7 @@ public class PreparingEntity { @SerializedName("roomid") private String roomId; + @Override public String getCmd() { return cmd; } @@ -21,6 +22,7 @@ public class PreparingEntity { this.cmd = cmd; } + @Override public String getRoomId() { return roomId; } diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomBlockMsgEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomBlockMsgEntity.java index d0580f1..f016702 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomBlockMsgEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomBlockMsgEntity.java @@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.entity; import com.google.gson.annotations.SerializedName; -public class RoomBlockMsgEntity { +public class RoomBlockMsgEntity implements DataEntity { /** * cmd : ROOM_BLOCK_MSG * uid : 60244207 @@ -19,6 +19,7 @@ public class RoomBlockMsgEntity { @SerializedName("roomid") private long roomid; + @Override public String getCmd() { return cmd; } diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomSilentOffEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomSilentOffEntity.java index b965836..a5eda18 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomSilentOffEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomSilentOffEntity.java @@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName; import java.util.List; -public class RoomSilentOffEntity { +public class RoomSilentOffEntity implements DataEntity { /** * cmd : ROOM_SILENT_OFF * data : [] @@ -18,6 +18,7 @@ public class RoomSilentOffEntity { @SerializedName("data") private List data; + @Override public String getCmd() { return cmd; } diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomStatusEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomStatusEntity.java new file mode 100644 index 0000000..446c602 --- /dev/null +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomStatusEntity.java @@ -0,0 +1,7 @@ +package com.hiczp.bilibili.api.live.socket.entity; + +public interface RoomStatusEntity { + String getCmd(); + + String getRoomId(); +} diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/SendGiftEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/SendGiftEntity.java index c9897e4..cf16259 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/SendGiftEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/SendGiftEntity.java @@ -6,7 +6,7 @@ import com.google.gson.annotations.SerializedName; import java.util.List; -public class SendGiftEntity { +public class SendGiftEntity implements DataEntity { /** * cmd : SEND_GIFT * data : {"giftName":"辣条","num":64,"uname":"明暗纠结星","rcost":66347035,"uid":12768615,"top_list":[{"uid":9256,"userName":"SSR丶尧","coin":2905900,"face":"http://i0.hdslb.com/bfs/face/eba52abb1daaf3aecd7b986b9731451872d66613.jpg","guard_level":"3","rank":1,"score":2905900},{"uid":4986301,"userName":"乄夏沫丶","coin":1386000,"face":"http://i2.hdslb.com/bfs/face/b3969027a263d2610711317addf437fe59a9b97e.jpg","guard_level":0,"rank":2,"score":1386000},{"uid":5211302,"userName":"朝雾怜","coin":805700,"face":"http://i1.hdslb.com/bfs/face/d366be69d716469514d355642aa324ceba3fa122.jpg","guard_level":0,"rank":3,"score":805700}],"timestamp":1510498496,"giftId":1,"giftType":0,"action":"喂食","super":0,"price":100,"rnd":"1510498460","newMedal":0,"newTitle":0,"medal":[],"title":"","beatId":"0","biz_source":"live","metadata":"","remain":0,"gold":0,"silver":0,"eventScore":0,"eventNum":0,"smalltv_msg":[],"notice_msg":[],"capsule":{"normal":{"coin":13,"change":1,"progress":{"now":4000,"max":10000}},"colorful":{"coin":0,"change":0,"progress":{"now":0,"max":5000}}},"addFollow":0} @@ -17,6 +17,7 @@ public class SendGiftEntity { @SerializedName("data") private DataEntity data; + @Override public String getCmd() { return cmd; } diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/SysGiftEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/SysGiftEntity.java index ded016a..fda4261 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/SysGiftEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/SysGiftEntity.java @@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.entity; import com.google.gson.annotations.SerializedName; -public class SysGiftEntity { +public class SysGiftEntity implements DataEntity { /** * cmd : SYS_GIFT * msg : あさひなみよう在直播间5135178开启了丰收祭典，一起来分享收获的福利吧！ @@ -34,6 +34,7 @@ public class SysGiftEntity { @SerializedName("msgTips") private int msgTips; + @Override public String getCmd() { return cmd; } diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/SysMsgEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/SysMsgEntity.java index e5a03cf..e7c0eff 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/SysMsgEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/SysMsgEntity.java @@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.entity; import com.google.gson.annotations.SerializedName; -public class SysMsgEntity { +public class SysMsgEntity implements DataEntity { /** * cmd : SYS_MSG * msg : 【瑾然-】:?在直播间:?【3939852】:?赠送 小电视一个，请前往抽奖 @@ -38,6 +38,7 @@ public class SysMsgEntity { @SerializedName("tv_id") private String tvId; + @Override public String getCmd() { return cmd; } diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WelcomeEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WelcomeEntity.java index dc98347..4c6f4cf 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WelcomeEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WelcomeEntity.java @@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.entity; import com.google.gson.annotations.SerializedName; -public class WelcomeEntity { +public class WelcomeEntity implements DataEntity { /** * cmd : WELCOME * data : {"uid":516505,"uname":"圣蝎","is_admin":false,"vip":1} @@ -13,6 +13,7 @@ public class WelcomeEntity { @SerializedName("data") private DataEntity data; + @Override public String getCmd() { return cmd; } diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WelcomeGuardEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WelcomeGuardEntity.java index d8be2aa..178c067 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WelcomeGuardEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WelcomeGuardEntity.java @@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.entity; import com.google.gson.annotations.SerializedName; -public class WelcomeGuardEntity { +public class WelcomeGuardEntity implements DataEntity { /** * cmd : WELCOME_GUARD * data : {"uid":23598108,"username":"lovevael","guard_level":3,"water_god":0} @@ -16,6 +16,7 @@ public class WelcomeGuardEntity { @SerializedName("roomid") private long roomId; + @Override public String getCmd() { return cmd; } diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WishBottleEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WishBottleEntity.java index 2d07bbc..c9ac6e6 100644 --- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WishBottleEntity.java +++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/WishBottleEntity.java @@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName; import java.util.List; -public class WishBottleEntity { +public class WishBottleEntity implements DataEntity { /** * cmd : WISH_BOTTLE * data : {"action":"update","id":1832,"wish":{"id":1832,"uid":110631,"type":1,"type_id":7,"wish_limit":99999,"wish_progress":14381,"status":1,"content":"女装直播","ctime":"2018-01-12 17:25:58","count_map":[1,3,5]}} @@ -15,6 +15,7 @@ public class WishBottleEntity { @SerializedName("data") private Data data; + @Override public String getCmd() { return cmd; }