完善窗体逻辑;

添加弹幕日志;
修复房间信息获取正则表达式;
This commit is contained in:
梅浩东
2023-11-23 16:43:21 +08:00
parent 37b9da6d38
commit 873608f534
25 changed files with 1278 additions and 481 deletions
@@ -1,19 +1,31 @@
namespace BarrageGrab.Modles.JsonEntity
using System.ComponentModel;
namespace BarrageGrab.Modles.JsonEntity
{
/// <summary>
/// 弹幕消息类型
/// </summary>
public enum PackMsgType
{
无 = 0,
[Description("无")]
无 = 0,
[Description("消息")]
弹幕消息 = 1,
[Description("点赞")]
点赞消息 = 2,
[Description("进房")]
进直播间 = 3,
[Description("关注")]
关注消息 = 4,
[Description("礼物")]
礼物消息 = 5,
[Description("统计")]
直播间统计 = 6,
[Description("粉团")]
粉丝团消息 = 7,
[Description("分享")]
直播间分享 = 8,
[Description("下播")]
下播 = 9
}
+4 -3
View File
@@ -519,7 +519,8 @@ namespace BarrageGrab.Modles
}
//var roomDataReg = new Regex(@"(?<=self\.__pace_f\.push\(\[1,""a:)\[.+?\](?=\\n?""\]\)[\s\n\r]*?<\/script>)");
//var roomDataReg = new Regex(@"(?<=self\.__pace_f\.push\(\[1,\s*""0:)\[.+?\](?=\\n""?\]\)[\s\n\r]*?<\/script>)");
var roomDataReg = new Regex(@"(?<=self\.__pace_f\.push\(\[1,\s*""9:)\[.+?\](?=\\n""?\]\)[\s\n\r]*?<\/script>)");
//var roomDataReg = new Regex(@"(?<=self\.__pace_f\.push\(\[1,\s*""9:)\[.+?\](?=\\n""?\]\)[\s\n\r]*?<\/script>)");
var roomDataReg = new Regex(@"(?<=self\.__pace_f\.push\(\[\d,\s*""\w:.+)\{\\""state.+?\}(?=\]\\n""\]\)[\s\n\r]*?<\/script>)");
//字符串转义符号版本
var match = roomDataReg.Match(html);
@@ -530,10 +531,10 @@ namespace BarrageGrab.Modles
}
var matchData = Regex.Unescape(match.Value);
JToken jsonObject = null;
JObject jsonObject = null;
try
{
jsonObject = JsonConvert.DeserializeObject<JArray>(matchData)[3];
jsonObject = JObject.Parse(matchData);
}
catch (Exception ex)
{