Skip to content

Commit

Permalink
Merge pull request #371 from ywmoyue/dev
Browse files Browse the repository at this point in the history
4.6.18
  • Loading branch information
ywmoyue authored Oct 29, 2023
2 parents 1aeaf45 + fbaa4e7 commit 074a2ef
Show file tree
Hide file tree
Showing 51 changed files with 972 additions and 660 deletions.
19 changes: 11 additions & 8 deletions src/BiliLite.UWP/BiliLite.UWP.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
Expand Down Expand Up @@ -178,12 +176,19 @@
<Compile Include="Models\Common\Live\GuardBuyMsgModel.cs" />
<Compile Include="Models\Common\Live\RoomChangeMsgModel.cs" />
<Compile Include="Models\Exceptions\PlayerException.cs" />
<Compile Include="Models\Requests\Api\BaseApi.cs" />
<Compile Include="Player\Controllers\BasePlayerController.cs" />
<Compile Include="Player\Controllers\LivePlayerController.cs" />
<Compile Include="Player\Controllers\PlayerControllerFactory.cs" />
<Compile Include="Player\Controllers\PlayerType.cs" />
<Compile Include="Player\IBiliPlayer2.cs" />
<Compile Include="Player\LivePlayer.cs" />
<Compile Include="Player\MediaInfos\BaseCollectInfoHandler.cs" />
<Compile Include="Player\MediaInfos\CollectInfo.cs" />
<Compile Include="Player\MediaInfos\FFMpegInteropMssCollectInfoHandler.cs" />
<Compile Include="Player\MediaInfos\MediaInfo.cs" />
<Compile Include="Player\MediaInfos\MediaInfoDoNotToStringAttribute.cs" />
<Compile Include="Player\MediaInfos\MediaInfosCollector.cs" />
<Compile Include="Player\States\BaseStateChangedEventArgs.cs" />
<Compile Include="Player\States\ContentStates\ContentStateChangedEventArgs.cs" />
<Compile Include="Player\States\ContentStates\FullWindowContentState.cs" />
Expand Down Expand Up @@ -1252,12 +1257,10 @@
<Name>Windows Desktop Extensions for the UWP</Name>
</SDKReference>
</ItemGroup>
<PropertyGroup
Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<Import
Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
3 changes: 2 additions & 1 deletion src/BiliLite.UWP/Dialogs/LoginDialog.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ private async void webView_NavigationStarting(WebView sender, WebViewNavigationS
{
var access = Regex.Match(args.Uri.AbsoluteUri, "access_key=(.*?)&").Groups[1].Value;
var mid = Regex.Match(args.Uri.AbsoluteUri, "mid=(.*?)&").Groups[1].Value;
await loginVM.account.SaveLogin(access, "", 0, long.Parse(mid), null, null);
var appKey = SettingConstants.Account.DefaultLoginAppKeySecret;
await loginVM.account.SaveLogin(access, "", 0, long.Parse(mid), null, null, appKey);
this.Hide();
return;
}
Expand Down
5 changes: 5 additions & 0 deletions src/BiliLite.UWP/Models/Common/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ public static class Constants
/// </summary>
public const string BILIBILI_DOMAIN = "https://www.bilibili.com";

/// <summary>
/// b站Host
/// </summary>
public const string BILIBILI_HOST = ".bilibili.com";

/// <summary>
/// 评论中匹配特殊文本正则表达式
/// </summary>
Expand Down
11 changes: 11 additions & 0 deletions src/BiliLite.UWP/Models/Common/SettingConstants.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using BiliLite.Services;

namespace BiliLite.Models.Common
{
Expand Down Expand Up @@ -140,6 +141,16 @@ public class Account
/// Cookies
/// </summary>
public const string BILIBILI_COOKIES = "BiliBiliCookies";

/// <summary>
/// 登录用AppKey
/// </summary>
public const string LOGIN_APP_KEY_SECRET = "LoginAppKeySecret";

/// <summary>
/// 默认登录用AppKey
/// </summary>
public static ApiKeyInfo DefaultLoginAppKeySecret = ApiHelper.AndroidKey;
}

public class VideoDanmaku
Expand Down
Loading

0 comments on commit 074a2ef

Please sign in to comment.