迁移实体文件位置

BarrageGrab/Modles/BusinessExecption.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarrageGrab.Modles
+{
+    /// <summary>
+    /// 业务异常
+    /// </summary>
+    public class BusinessExecption : Exception
+    {
+        /// <summary>
+        /// 错误码
+        /// </summary>
+        public int Code { get; set; } = -1;
+
+        /// <summary>
+        /// 异常附加数据
+        /// </summary>
+        public object ErrorTarget { get; set; } = null;
+
+        public BusinessExecption()
+        {
+
+        }
+
+        public BusinessExecption(string msg) : base(msg)
+        {
+            this.Code = -1;
+        }
+
+        public BusinessExecption(string msg,object data) : base(msg)
+        {
+            this.ErrorTarget = data;
+        }
+
+        public BusinessExecption(string msg, int code) : this(msg)
+        {
+            this.Code = code;
+        }
+    }
+}

BarrageGrab/Modles/JsonEntity/BarrageMessages.cs

@@ -0,0 +1,306 @@
+namespace BarrageGrab.Modles.JsonEntity
+{
+    /// <summary>
+    /// 弹幕消息类型
+    /// </summary>
+    public enum BarrageMsgType
+    {
+        无 = 0,
+        弹幕消息 = 1,
+        点赞消息 = 2,
+        进直播间 = 3,
+        关注消息 = 4,
+        礼物消息 = 5,
+        直播间统计 = 6,
+        粉丝团消息 = 7,
+        直播间分享 = 8,
+        下播 = 9
+    }
+
+    /// <summary>
+    /// 粉丝团消息类型
+    /// </summary>
+    public enum FansclubType
+    {
+        无 = 0,
+        粉丝团升级 = 1,
+        加入粉丝团 = 2
+    }
+
+    /// <summary>
+    /// 直播间分享目标
+    /// </summary>
+    public enum ShareType
+    {
+        未知 = 0,
+        微信 = 1,
+        朋友圈 = 2,
+        微博 = 3,
+        QQ空间 = 4,
+        QQ = 5,
+        抖音好友 = 112
+    }
+
+
+    /// <summary>
+    /// 数据包装器
+    /// </summary>
+    public class BarrageMsgPack
+    {
+        /// <summary>
+        /// 消息类型
+        /// </summary>
+        public BarrageMsgType Type { get; set; }
+
+        /// <summary>
+        /// 消息对象
+        /// </summary>
+        public string Data { get; set; }
+
+        public BarrageMsgPack()
+        {
+
+        }
+
+        public BarrageMsgPack(string data, BarrageMsgType type)
+        {
+            Data = data;
+            Type = type;
+        }
+    }
+
+    /// <summary>
+    /// 消息
+    /// </summary>
+    public class Msg
+    {
+        /// <summary>
+        /// 弹幕ID
+        /// </summary>
+        public long MsgId { get; set; }
+
+        /// <summary>
+        /// 用户数据
+        /// </summary>
+        public MsgUser User { get; set; }
+
+        /// <summary>
+        /// 消息内容
+        /// </summary>
+        public string Content { get; set; }
+
+        /// <summary>
+        /// 房间号
+        /// </summary>
+        public long RoomId { get; set; }
+    }
+
+    /// <summary>
+    /// 粉丝团信息
+    /// </summary>
+    public class FansClubInfo
+    {
+        /// <summary>
+        /// 粉丝团名称
+        /// </summary>
+        public string ClubName { get; set; }
+
+        /// <summary>
+        /// 粉丝团等级，没加入则0
+        /// </summary>
+        public int Level { get; set; }
+    }
+
+    /// <summary>
+    /// 用户弹幕信息
+    /// </summary>
+    public class MsgUser
+    {
+        /// <summary>
+        /// 真实ID
+        /// </summary>
+        public long Id { get; set; }
+
+        /// <summary>
+        /// ShortId
+        /// </summary>
+        public long ShortId { get; set; }
+
+        /// <summary>
+        /// 自定义ID
+        /// </summary>
+        public string DisplayId { get; set; }
+
+        /// <summary>
+        /// 昵称
+        /// </summary>
+        public string Nickname { get; set; }
+
+        /// <summary>
+        /// 未知
+        /// </summary>
+        public int Level { get; set; }
+
+        /// <summary>
+        /// 支付等级
+        /// </summary>
+        public int PayLevel { get; set; }
+
+        /// <summary>
+        /// 性别 1男 2女
+        /// </summary>
+        public int Gender { get; set; }
+
+        /// <summary>
+        /// 头像地址
+        /// </summary>
+        public string HeadImgUrl { get; set; }
+
+        /// <summary>
+        /// 用户主页地址
+        /// </summary>
+        public string SecUid { get; set; }
+
+        /// <summary>
+        /// 粉丝团信息
+        /// </summary>
+        public FansClubInfo FansClub { get; set; }
+
+        /// <summary>
+        /// 粉丝数
+        /// </summary>
+        public long FollowerCount { get; set; }
+
+        /// <summary>
+        /// 关注状态 0 未关注 1 已关注 2,不明
+        /// </summary>
+        public long FollowStatus { get; set; }
+
+        /// <summary>
+        /// 关注数
+        /// </summary>
+        public long FollowingCount;
+
+
+        public string GenderToString()
+        {
+            return Gender == 1 ? "男" : Gender == 2 ? "女" : "妖";
+        }
+    }
+
+    /// <summary>
+    /// 礼物消息
+    /// </summary>
+    public class GiftMsg : Msg
+    {
+        /// <summary>
+        /// 礼物ID
+        /// </summary>
+        public long GiftId { get; set; }
+
+        /// <summary>
+        /// 礼物名称
+        /// </summary>
+        public string GiftName { get; set; }
+
+        /// <summary>
+        /// 礼物分组ID
+        /// </summary>
+        public long GroupId { get; set; }
+
+        /// <summary>
+        /// 本次(增量)礼物数量
+        /// </summary>
+        public long GiftCount { get; set; }
+
+        /// <summary>
+        /// 礼物数量(连续的)
+        /// </summary>
+        public long RepeatCount { get; set; }
+
+        /// <summary>
+        /// 抖币价格
+        /// </summary>
+        public int DiamondCount { get; set; }
+    }
+
+    /// <summary>
+    /// 点赞消息
+    /// </summary>
+    public class LikeMsg : Msg
+    {
+        /// <summary>
+        /// 点赞数量
+        /// </summary>
+        public long Count { get; set; }
+
+        /// <summary>
+        /// 总共点赞数量
+        /// </summary>
+        public long Total { get; set; }
+    }
+
+    /// <summary>
+    /// 直播间统计消息
+    /// </summary>
+    public class UserSeqMsg : Msg
+    {
+        /// <summary>
+        /// 当前直播间用户数量
+        /// </summary>
+        public long OnlineUserCount { get; set; }
+
+        /// <summary>
+        /// 累计直播间用户数量
+        /// </summary>
+        public long TotalUserCount { get; set; }
+
+        /// <summary>
+        /// 累计直播间用户数量 显示文本
+        /// </summary>
+        public string TotalUserCountStr { get; set; }
+
+        /// <summary>
+        /// 当前直播间用户数量 显示文本
+        /// </summary>
+        public string OnlineUserCountStr { get; set; }
+    }
+
+    /// <summary>
+    /// 粉丝团消息
+    /// </summary>
+    public class FansclubMsg : Msg
+    {
+        /// <summary>
+        /// 粉丝团消息类型,升级1，加入2
+        /// </summary>
+        public int Type { get; set; }
+
+        /// <summary>
+        /// 粉丝团等级
+        /// </summary>
+        public int Level { get; set; }
+    }
+
+    /// <summary>
+    /// 来了消息
+    /// </summary>
+    public class MemberMessage : Msg
+    {
+        /// <summary>
+        /// 当前直播间人数
+        /// </summary>
+        public long CurrentCount { get; set; }
+    }
+
+    /// <summary>
+    /// 直播间分享
+    /// </summary>
+    public class ShareMessage : Msg
+    {
+        /// <summary>
+        /// 分享目标
+        /// </summary>
+        public ShareType ShareType { get; set; }
+    }
+}

BarrageGrab/Modles/JsonEntity/Command.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BarrageGrab.Modles.JsonEntity
+{
+    public enum CommandCode
+    {
+        /// <summary>
+        /// 空指令
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// 安全关闭程序
+        /// </summary>
+        Close = 1,
+    }
+
+    public class Command
+    {
+        /// <summary>
+        /// 指令标识
+        /// </summary>
+        public CommandCode Cmd { get; set; }
+
+        /// <summary>
+        /// 附加数据
+        /// </summary>
+        public object Data { get; set; }
+    }
+}

BarrageGrab/Modles/ProtoEntity/Messages.cs

@@ -7,8 +7,9 @@
 
 
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
-namespace BarrageGrab.ProtoEntity
+namespace BarrageGrab.Modles.ProtoEntity
 {
 #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192
     [global::ProtoBuf.ProtoContract()]
@@ -892,6 +893,7 @@ namespace BarrageGrab.ProtoEntity
     }
 
     [global::ProtoBuf.ProtoContract()]
+    // 使用自定义的JsonConverter    
     public partial class User : global::ProtoBuf.IExtensible
     {        
         private global::ProtoBuf.IExtension __pbn__extensionData;

BarrageGrab/Modles/ProtoEntity/Wss.cs

@@ -4,7 +4,7 @@
 //   Input: my.proto
 // </auto-generated>
 
-namespace BarrageGrab.ProtoEntity
+namespace BarrageGrab.Modles.ProtoEntity
 {
     #region Designer generated code
 #pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192