From b5978e63b8ad8ee202fe3940e4fac30be071f172 Mon Sep 17 00:00:00 2001
From: Ted Zyzsdy <zyzsdy@gmail.com>
Date: Fri, 1 Mar 2019 15:33:50 +0800
Subject: [PATCH] fix new api (#26)

---
 BiLiRoku/Bililivelib/Downloader.cs     | 2 ++
 BiLiRoku/Bililivelib/PathFinder.cs     | 6 +++---
 BiLiRoku/Commentlib/CommentProvider.cs | 2 +-
 BiLiRoku/MainWindow.xaml               | 4 ++--
 BiLiRoku/Properties/AssemblyInfo.cs    | 8 ++++----
 BiLiRoku/Version.cs                    | 8 ++++----
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/BiLiRoku/Bililivelib/Downloader.cs b/BiLiRoku/Bililivelib/Downloader.cs
index 271ff3f..c9afb8a 100644
--- a/BiLiRoku/Bililivelib/Downloader.cs
+++ b/BiLiRoku/Bililivelib/Downloader.cs
@@ -197,6 +197,8 @@ private async void CommentProvider_OnReceivedComment(object sender, ReceivedComm
         {
             try
             {
+                //DEBUG: 弹幕显示测试
+                _mw.AppendLogln("收到弹幕", e.Comment.CommentUser + ": " + e.Comment.CommentText);
                 //接收到弹幕时的处理。
                 if (e.Comment.MsgType != MsgTypeEnum.LiveStart)
                 {
diff --git a/BiLiRoku/Bililivelib/PathFinder.cs b/BiLiRoku/Bililivelib/PathFinder.cs
index 6efd5d4..97a4559 100644
--- a/BiLiRoku/Bililivelib/PathFinder.cs
+++ b/BiLiRoku/Bililivelib/PathFinder.cs
@@ -73,7 +73,7 @@ internal Task<string> GetTrueUrl(string roomid)
                     AddInfo("ERROR", "房间号获取错误。");
                     throw new Exception("No roomid");
                 }
-                var apiUrl = "https://api.live.bilibili.com/api/playurl?cid=" + roomid + "&otype=json&quality=0&platform=web";
+                var apiUrl = "https://api.live.bilibili.com/room/v1/Room/playUrl?cid=" + roomid + "&otype=json&quality=0&platform=web";
                 SendStat(roomid);
 
                 //访问API获取结果
@@ -98,13 +98,13 @@ internal Task<string> GetTrueUrl(string roomid)
                 try
                 {
                     var jsonResult = JObject.Parse(resultString);
-                    var trueUrl = jsonResult["durl"][0]["url"].ToString();
+                    var trueUrl = jsonResult["data"]["durl"][0]["url"].ToString();
                     AddInfo("INFO", "地址解析成功：" + trueUrl);
                     return trueUrl;
                 }
                 catch (Exception e)
                 {
-                    AddInfo("ERROR", "解析XML失败：" + e.Message);
+                    AddInfo("ERROR", "视频流地址解析失败：" + e.Message);
                     throw;
                 }
             });
diff --git a/BiLiRoku/Commentlib/CommentProvider.cs b/BiLiRoku/Commentlib/CommentProvider.cs
index 79dd350..768f47e 100644
--- a/BiLiRoku/Commentlib/CommentProvider.cs
+++ b/BiLiRoku/Commentlib/CommentProvider.cs
@@ -14,7 +14,7 @@ namespace BiliRoku.Commentlib
 {
     internal class CommentProvider
     {
-        private const int CmtPort = 788;
+        private const int CmtPort = 2243;
         private readonly string _roomid;
         private readonly MainWindow _mw;
         private bool _connected; //连接情况
diff --git a/BiLiRoku/MainWindow.xaml b/BiLiRoku/MainWindow.xaml
index a062e88..7f616f0 100644
--- a/BiLiRoku/MainWindow.xaml
+++ b/BiLiRoku/MainWindow.xaml
@@ -17,7 +17,7 @@
             </TextBox.SelectionBrush>
         </TextBox>
         <Label x:Name="roomIdTextLabel" Content="房间号：http://live.bilibili.com/" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top"/>
-        <TextBox x:Name="roomIdBox" HorizontalAlignment="Left" Height="25" Margin="196,15,0,0" Text="10112" VerticalAlignment="Top" Width="124" VerticalContentAlignment="Center" TextChanged="roomIdBox_TextChanged"/>
+        <TextBox x:Name="roomIdBox" HorizontalAlignment="Left" Height="25" Margin="196,15,0,0" Text="12564" VerticalAlignment="Top" Width="124" VerticalContentAlignment="Center" TextChanged="roomIdBox_TextChanged"/>
         <Label x:Name="savepathTextLabel" Content="保存路径：" HorizontalAlignment="Left" Margin="10,54,0,0" VerticalAlignment="Top" Cursor="Hand" MouseLeftButtonUp="savepathTextLabel_MouseLeftButtonUp"/>
         <TextBox x:Name="savepathBox" HorizontalAlignment="Left" Height="25" Margin="80,54,0,0" VerticalAlignment="Top" Width="199" VerticalContentAlignment="Center" IsReadOnly="True" TextChanged="savepathBox_TextChanged"/>
         <Button x:Name="openSavepathConfigDialogButton" Content="设置..." HorizontalAlignment="Left" Margin="284,54,0,0" VerticalAlignment="Top" Width="63" Height="25" Click="openSavepathConfigDialogButton_Click"/>
@@ -39,7 +39,7 @@
                     <Label Content="录制时间"/>
                     <Label Content="比特率"/>
                     <Label Content="传输大小"/>
-                    <Label Content="直播间人数"/>
+                    <Label Content="人气值"/>
                 </StackPanel>
                 <StackPanel Height="127" Canvas.Left="73" Width="72">
                     <Label x:Name="LiveStatus" Content="检测中" HorizontalContentAlignment="Right"/>
diff --git a/BiLiRoku/Properties/AssemblyInfo.cs b/BiLiRoku/Properties/AssemblyInfo.cs
index 8ef7645..cf16b4a 100644
--- a/BiLiRoku/Properties/AssemblyInfo.cs
+++ b/BiLiRoku/Properties/AssemblyInfo.cs
@@ -8,11 +8,11 @@
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
 [assembly: AssemblyTitle("BiLiRoku")]
-[assembly: AssemblyDescription("bilibili生放送录制")]
+[assembly: AssemblyDescription("bilibili直播录制")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Zyzsdy")]
 [assembly: AssemblyProduct("BiLiRoku")]
-[assembly: AssemblyCopyright("Copyright © Zyzsdy 2015-2017")]
+[assembly: AssemblyCopyright("Copyright © Zyzsdy 2015-2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,7 +51,7 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.1.0")]
+[assembly: AssemblyFileVersion("1.5.1.0")]
 [assembly: Guid("0e57f63c-b0b9-4430-95de-c066caa9cc1e")]
 
diff --git a/BiLiRoku/Version.cs b/BiLiRoku/Version.cs
index 32b6909..e1ac716 100644
--- a/BiLiRoku/Version.cs
+++ b/BiLiRoku/Version.cs
@@ -10,11 +10,11 @@ namespace BiliRoku
     [SuppressMessage("ReSharper", "InconsistentNaming")]
     internal static class Ver
     {
-        public const string VER = "1.5.0";
-        public const string DATE = "(2017-11-3)";
-        public const string DESC = "B站新版对应升级。";
+        public const string VER = "1.5.1";
+        public const string DATE = "(2019-3-1)";
+        public const string DESC = "修改API";
         public static readonly string OS_VER = "(" + WinVer.SystemVersion.Major + "." + WinVer.SystemVersion.Minor + "." + WinVer.SystemVersion.Build + ")";
-        public static readonly string UA = "FeelyBlog/1.1 (zyzsdy@foxmail.com) BiliRoku/1.5.0 " + OS_VER + " AppleWebKit/537.36 (KHTML, like Gecko) Chrome/43.0.2357.124 Safari/537.36";
+        public static readonly string UA = "FeelyBlog/1.1 (zyzsdy@foxmail.com) BiliRoku/1.5.1 " + OS_VER + " AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.119 Safari/537.36";
     }
 
     // 检查更新