Merge pull request #19 from ywmoyue/dev

Dev

README.md

@@ -18,4 +18,12 @@ https://app.bilibili.com/
 
 从逍遥橙子大佬那fork出来，大佬不维护了，群也解散了，要维护只能自己搞了
 
-https://github.com/xiaoyaocz/biliuwp-lite
+https://github.com/xiaoyaocz/biliuwp-lite
+
+## 下载
+
+https://github.com/ywmoyue/biliuwp-lite/releases
+
+## 讨论
+
+https://github.com/ywmoyue/biliuwp-lite/discussions

document/new_version.json

@@ -1,7 +1,7 @@
 {
-    "version": "4.5.0",
-    "version_num": 40500,
-    "version_desc": "更新内容:\r\n\r\n* 支持视频详情页右侧宽度可调整\r\n\r\n* 支持设置鼠标中键行为\r\n\r\n* 修复屏蔽词接口和调用错误问题\r\n\r\n* 修复下载视频导出错误\r\n\r\n* 修复视频评论、回复视频评论、删除回复错误\r\n\r\n\r\n 如果无法打开下载地址，请访问:https://github.com/ywmoyue/biliuwp-lite/releases",
+    "version": "4.5.1",
+    "version_num": 40501,
+    "version_desc": "更新内容:\r\n\r\n* 修复验证码登录\r\n\r\n* 修复未登录时无法使用搜索\r\n\r\n\r\n 如果无法打开下载地址，请访问:https://github.com/ywmoyue/biliuwp-lite/releases",
     "url": "https://github.com/ywmoyue/biliuwp-lite/releases",
     "download_url": "https://github.com/ywmoyue/biliuwp-lite/releases"
 }

src/BiliLite.Packages/Package.appxmanifest

@@ -14,7 +14,7 @@
   <Identity
      Name="5422.502643927C6AD"
     Publisher="CN=muyan"
-    Version="4.5.0.0" />
+    Version="4.5.1.0" />
   <mp:PhoneIdentity PhoneProductId="8bceed6a-7e89-4141-a693-923401d5b2ac" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>

src/BiliLite.UWP/App.xaml.cs

@@ -1,6 +1,6 @@
-using BiliLite.Api;
-using BiliLite.Helpers;
+using BiliLite.Helpers;
 using BiliLite.Modules;
+using BiliLite.Services;
 using FFmpegInteropX;
 using Microsoft.Toolkit.Uwp.Helpers;
 using System;

src/BiliLite.UWP/BiliLite.UWP.csproj

@@ -127,34 +127,34 @@
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Api\AccountApi.cs" />
-    <Compile Include="Api\ApiHelper.cs" />
-    <Compile Include="Api\CommentApi.cs" />
-    <Compile Include="Api\EmoteApi.cs" />
-    <Compile Include="Api\GitApi.cs" />
-    <Compile Include="Api\Home\AnimeAPI.cs" />
-    <Compile Include="Api\Home\ChannelAPI.cs" />
-    <Compile Include="Api\Home\CinemaAPI.cs" />
-    <Compile Include="Api\Home\HotAPI.cs" />
-    <Compile Include="Api\Home\LiveAPI.cs" />
-    <Compile Include="Api\Home\RecommendAPI.cs" />
-    <Compile Include="Api\Live\LiveAreaAPI.cs" />
-    <Compile Include="Api\Live\LiveCenterAPI.cs" />
-    <Compile Include="Api\Live\LiveRecommendAPI.cs" />
-    <Compile Include="Api\Live\LiveRoomAPI.cs" />
-    <Compile Include="Api\PlayerAPI.cs" />
-    <Compile Include="Api\RankAPI.cs" />
-    <Compile Include="Api\RegionAPI.cs" />
-    <Compile Include="Api\SearchAPI.cs" />
-    <Compile Include="Api\SeasonApi.cs" />
-    <Compile Include="Api\SeasonIndexAPI.cs" />
-    <Compile Include="Api\User\DynamicAPI.cs" />
-    <Compile Include="Api\User\FavoriteAPI.cs" />
-    <Compile Include="Api\User\FollowAPI.cs" />
-    <Compile Include="Api\User\AtAPI.cs" />
-    <Compile Include="Api\User\UserDetailAPI.cs" />
-    <Compile Include="Api\User\WatchLaterAPI.cs" />
-    <Compile Include="Api\VideoAPI.cs" />
+    <Compile Include="Models\Requests\Api\AccountApi.cs" />
+    <Compile Include="Services\ApiHelper.cs" />
+    <Compile Include="Models\Requests\Api\CommentApi.cs" />
+    <Compile Include="Models\Requests\Api\EmoteApi.cs" />
+    <Compile Include="Models\Requests\Api\GitApi.cs" />
+    <Compile Include="Models\Requests\Api\Home\AnimeAPI.cs" />
+    <Compile Include="Models\Requests\Api\Home\ChannelAPI.cs" />
+    <Compile Include="Models\Requests\Api\Home\CinemaAPI.cs" />
+    <Compile Include="Models\Requests\Api\Home\HotAPI.cs" />
+    <Compile Include="Models\Requests\Api\Home\LiveAPI.cs" />
+    <Compile Include="Models\Requests\Api\Home\RecommendAPI.cs" />
+    <Compile Include="Models\Requests\Api\Live\LiveAreaAPI.cs" />
+    <Compile Include="Models\Requests\Api\Live\LiveCenterAPI.cs" />
+    <Compile Include="Models\Requests\Api\Live\LiveRecommendAPI.cs" />
+    <Compile Include="Models\Requests\Api\Live\LiveRoomAPI.cs" />
+    <Compile Include="Models\Requests\Api\PlayerAPI.cs" />
+    <Compile Include="Models\Requests\Api\RankAPI.cs" />
+    <Compile Include="Models\Requests\Api\RegionAPI.cs" />
+    <Compile Include="Models\Requests\Api\SearchAPI.cs" />
+    <Compile Include="Models\Requests\Api\SeasonApi.cs" />
+    <Compile Include="Models\Requests\Api\SeasonIndexAPI.cs" />
+    <Compile Include="Models\Requests\Api\User\DynamicAPI.cs" />
+    <Compile Include="Models\Requests\Api\User\FavoriteAPI.cs" />
+    <Compile Include="Models\Requests\Api\User\FollowAPI.cs" />
+    <Compile Include="Models\Requests\Api\User\AtAPI.cs" />
+    <Compile Include="Models\Requests\Api\User\UserDetailAPI.cs" />
+    <Compile Include="Models\Requests\Api\User\WatchLaterAPI.cs" />
+    <Compile Include="Models\Requests\Api\VideoAPI.cs" />
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
@@ -918,8 +918,8 @@
     <PRIResource Include="Strings\zh-cn\Resources.resw" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Api\Grpc\" />
     <Folder Include="Assets\Tools\" />
+    <Folder Include="Models\Requests\Api\Grpc\" />
   </ItemGroup>
   <ItemGroup>
     <SDKReference Include="WindowsDesktop, Version=10.0.17763.0">

src/BiliLite.UWP/Dialogs/DownloadDialog.xaml.cs

@@ -1,7 +1,7 @@
-using BiliLite.Api;
-using BiliLite.Helpers;
+using BiliLite.Helpers;
 using BiliLite.Modules;
 using BiliLite.Modules.Player.Playurl;
+using BiliLite.Services;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;

src/BiliLite.UWP/Helpers/HttpHelper.cs

@@ -98,8 +98,9 @@ public static async Task<HttpResults> GetWithWebCookie(string url, IDictionary<s
                 //没有Cookie
                 if(cookies==null|| cookies.Count == 0)
                 {
-                    //访问一遍bilibili.com
-                    await GetAsync("https://www.bilibili.com");
+                    //访问一遍bilibili.com拿Cookie
+                    var getCookieResult = await GetAsync("https://www.bilibili.com");
+                    Utils.SaveCookie(getCookieResult.cookies);
                 }
                 cookies = fiter.CookieManager.GetCookies(new Uri(Constants.COOKIE_DOMAIN));
                 var cookiesCollection = cookies.ToDictionary(x => x.Name, x => x.Value);

src/BiliLite.UWP/Helpers/MessageCenter.cs

@@ -1,5 +1,6 @@
 using BiliLite.Controls;
 using BiliLite.Models;
+using BiliLite.Models.Common;
 using BiliLite.Pages;
 using BiliLite.Pages.Other;
 using BiliLite.Pages.User;
@@ -73,7 +74,8 @@ private static void ClaerCookie()
                     "http://biligame.com",
                     "http://bigfun.cn",
                     "http://bigfunapp.cn",
-                    "http://dreamcast.hk"
+                    "http://dreamcast.hk",
+                    Constants.COOKIE_DOMAIN,
                 };
                 //删除Cookie
                 HttpBaseProtocolFilter httpBaseProtocolFilter = new HttpBaseProtocolFilter();

src/BiliLite.UWP/Helpers/Utils.cs

@@ -24,6 +24,8 @@
 using System.Net.Http;
 using Windows.Web.Http.Filters;
 using BiliLite.Models.Common;
+using BiliLite.Services;
+using BiliLite.Models;
 
 namespace BiliLite.Helpers
 {
@@ -470,6 +472,24 @@ public static string ChooseProxyServer(string area)
             }
             return proxyUrl;
         }
+
+        public static void SaveCookie(List<HttpCookieItem> cookies)
+        {
+            if (cookies != null)
+            {
+                var filter = new HttpBaseProtocolFilter();
+                foreach (var cookieItem in cookies)
+                {
+                    filter.CookieManager.SetCookie(new Windows.Web.Http.HttpCookie(cookieItem.Name, cookieItem.Domain, "/")
+                    {
+                        HttpOnly = cookieItem.HttpOnly,
+                        Secure = cookieItem.Secure,
+                        Expires = cookieItem.Expires,
+                        Value = cookieItem.Value,
+                    });
+                }
+            }
+        }
     }
     public class NewVersion
     {

src/BiliLite.UWP/Api/AccountApi.cs → src/BiliLite.UWP/Models/Requests/Api/AccountApi.cs

@@ -1,4 +1,5 @@
 using BiliLite.Helpers;
+using BiliLite.Services;
 using System;
 
 namespace BiliLite.Api

src/BiliLite.UWP/Api/CommentApi.cs → src/BiliLite.UWP/Models/Requests/Api/CommentApi.cs

@@ -1,5 +1,6 @@
 using System;
 using BiliLite.Helpers;
+using BiliLite.Services;
 
 namespace BiliLite.Api
 {

src/BiliLite.UWP/Api/EmoteApi.cs → src/BiliLite.UWP/Models/Requests/Api/EmoteApi.cs

@@ -1,4 +1,5 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/BiliLite.UWP/Api/GitApi.cs → src/BiliLite.UWP/Models/Requests/Api/GitApi.cs

@@ -1,4 +1,5 @@
 using BiliLite.Helpers;
+using BiliLite.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/BiliLite.UWP/Api/Home/AnimeAPI.cs → src/BiliLite.UWP/Models/Requests/Api/Home/AnimeAPI.cs

@@ -3,11 +3,11 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using BiliLite.Api;
+using BiliLite.Services;
 
 namespace BiliLite.Api.Home
 {
-   
+
     public class AnimeAPI
     {
 

src/BiliLite.UWP/Api/Home/CinemaAPI.cs → src/BiliLite.UWP/Models/Requests/Api/Home/CinemaAPI.cs

@@ -1,12 +1,13 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace BiliLite.Api.Home
 {
-   public class CinemaAPI
+    public class CinemaAPI
     {
         public ApiModel CinemaHome()
         {

src/BiliLite.UWP/Api/Home/HotApi.cs → src/BiliLite.UWP/Models/Requests/Api/Home/HotApi.cs

@@ -1,4 +1,5 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/BiliLite.UWP/Api/Home/LiveAPI.cs → src/BiliLite.UWP/Models/Requests/Api/Home/LiveAPI.cs

@@ -1,4 +1,5 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/BiliLite.UWP/Api/Home/RecommendAPI.cs → src/BiliLite.UWP/Models/Requests/Api/Home/RecommendAPI.cs

@@ -1,4 +1,5 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/BiliLite.UWP/Api/Live/LiveAreaAPI.cs → src/BiliLite.UWP/Models/Requests/Api/Live/LiveAreaAPI.cs

@@ -1,4 +1,5 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/BiliLite.UWP/Api/Live/LiveCenterAPI.cs → src/BiliLite.UWP/Models/Requests/Api/Live/LiveCenterAPI.cs

@@ -1,4 +1,5 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/BiliLite.UWP/Api/Live/LiveRecommendAPI.cs → src/BiliLite.UWP/Models/Requests/Api/Live/LiveRecommendAPI.cs

@@ -1,4 +1,5 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/BiliLite.UWP/Api/Live/LiveRoomAPI.cs → src/BiliLite.UWP/Models/Requests/Api/Live/LiveRoomAPI.cs

@@ -1,4 +1,5 @@
 using BiliLite.Helpers;
+using BiliLite.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/BiliLite.UWP/Api/PlayerAPI.cs → src/BiliLite.UWP/Models/Requests/Api/PlayerAPI.cs

@@ -1,5 +1,6 @@
 using BiliLite.Helpers;
 using BiliLite.Models;
+using BiliLite.Services;
 using System;
 
 namespace BiliLite.Api

src/BiliLite.UWP/Api/RankAPI.cs → src/BiliLite.UWP/Models/Requests/Api/RankAPI.cs

@@ -1,4 +1,5 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/BiliLite.UWP/Api/RegionAPI.cs → src/BiliLite.UWP/Models/Requests/Api/RegionAPI.cs

@@ -1,4 +1,5 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/BiliLite.UWP/Api/SearchAPI.cs → src/BiliLite.UWP/Models/Requests/Api/SearchAPI.cs

@@ -1,4 +1,5 @@
 using BiliLite.Helpers;
+using BiliLite.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/BiliLite.UWP/Api/SeasonApi.cs → src/BiliLite.UWP/Models/Requests/Api/SeasonApi.cs

@@ -1,4 +1,5 @@
 using BiliLite.Helpers;
+using BiliLite.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/BiliLite.UWP/Api/SeasonIndexAPI.cs → src/BiliLite.UWP/Models/Requests/Api/SeasonIndexAPI.cs

@@ -1,4 +1,5 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/BiliLite.UWP/Api/User/AtAPI.cs → src/BiliLite.UWP/Models/Requests/Api/User/AtAPI.cs

@@ -1,12 +1,13 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace BiliLite.Api.User
 {
-   
+
     public class AtApi
     {
         public ApiModel RecommendAt(int page = 1,int pagesize = 20)

src/BiliLite.UWP/Api/User/DynamicAPI.cs → src/BiliLite.UWP/Models/Requests/Api/User/DynamicAPI.cs

@@ -1,4 +1,5 @@
 using BiliLite.Helpers;
+using BiliLite.Services;
 using System;
 
 namespace BiliLite.Api.User

src/BiliLite.UWP/Api/User/FavoriteAPI.cs → src/BiliLite.UWP/Models/Requests/Api/User/FavoriteAPI.cs

@@ -1,4 +1,5 @@
 using BiliLite.Helpers;
+using BiliLite.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/BiliLite.UWP/Api/User/FollowAPI.cs → src/BiliLite.UWP/Models/Requests/Api/User/FollowAPI.cs

@@ -1,4 +1,5 @@
 using BiliLite.Helpers;
+using BiliLite.Services;
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/BiliLite.UWP/Api/User/UserDetailAPI.cs → src/BiliLite.UWP/Models/Requests/Api/User/UserDetailAPI.cs

@@ -1,4 +1,5 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/BiliLite.UWP/Api/User/WatchLaterAPI.cs → src/BiliLite.UWP/Models/Requests/Api/User/WatchLaterAPI.cs

@@ -1,4 +1,5 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

src/BiliLite.UWP/Api/VideoAPI.cs → src/BiliLite.UWP/Models/Requests/Api/VideoAPI.cs

@@ -1,4 +1,5 @@
-using System;
+using BiliLite.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;