diff --git a/TencentVideoEnhanced/Data/rules.json b/TencentVideoEnhanced/Data/rules.json index b5655ab..9f99c16 100644 --- a/TencentVideoEnhanced/Data/rules.json +++ b/TencentVideoEnhanced/Data/rules.json @@ -1,5 +1,5 @@ { - "version": 3, + "version": 4, "rules": { "eval": [ { @@ -415,6 +415,13 @@ "status": true, "enable": true }, + { + "id": "X007", + "value": "", + "description": "内容更丰富的搜索页", + "status": false, + "enable": true + }, { "id": "X003", "value": "", diff --git a/TencentVideoEnhanced/Model/Converter.cs b/TencentVideoEnhanced/Model/Converter.cs index fb12c8d..ae04807 100644 --- a/TencentVideoEnhanced/Model/Converter.cs +++ b/TencentVideoEnhanced/Model/Converter.cs @@ -13,7 +13,7 @@ namespace TencentVideoEnhanced.Model { public class ToggleSwitchVisibilityConverter : IValueConverter { - private Collection ShowAsToggleButton = new Collection(){ "X001", "X003", "X004", "X005", "X006" }; + private Collection ShowAsToggleButton = new Collection(){ "X001", "X003", "X004", "X005", "X006","X007" }; public object Convert(object value, Type targetType, object parameter, string language) { @@ -27,6 +27,7 @@ public object Convert(object value, Type targetType, object parameter, string la return Visibility.Collapsed; } } + public object ConvertBack(object value, Type targetType, object parameter, string language) { throw new NotImplementedException(); @@ -49,6 +50,7 @@ public object Convert(object value, Type targetType, object parameter, string la return Visibility.Collapsed; } } + public object ConvertBack(object value, Type targetType, object parameter, string language) { throw new NotImplementedException(); @@ -57,8 +59,6 @@ public object ConvertBack(object value, Type targetType, object parameter, strin public class ToggleButtonContentConverter : IValueConverter { - private Collection ShowAsToggleButton = new Collection() { "X002" }; - public object Convert(object value, Type targetType, object parameter, string language) { bool status = (bool)value; @@ -71,6 +71,7 @@ public object Convert(object value, Type targetType, object parameter, string la return "搜索页"; } } + public object ConvertBack(object value, Type targetType, object parameter, string language) { throw new NotImplementedException(); @@ -93,6 +94,7 @@ public object Convert(object value, Type targetType, object parameter, string la return Visibility.Collapsed; } } + public object ConvertBack(object value, Type targetType, object parameter, string language) { throw new NotImplementedException(); @@ -115,6 +117,7 @@ public object Convert(object value, Type targetType, object parameter, string la } return result; } + public object ConvertBack(object value, Type targetType, object parameter, string language) { return string.Format("{0}",value); @@ -136,6 +139,7 @@ public object Convert(object value, Type targetType, object parameter, string la } } + public object ConvertBack(object value, Type targetType, object parameter, string language) { throw new NotImplementedException(); diff --git a/TencentVideoEnhanced/Model/Utils.cs b/TencentVideoEnhanced/Model/Utils.cs index ff36e81..e74955f 100644 --- a/TencentVideoEnhanced/Model/Utils.cs +++ b/TencentVideoEnhanced/Model/Utils.cs @@ -12,7 +12,7 @@ namespace TencentVideoEnhanced.Model class Utils { private static UserActivitySession CurrentSession; - public static Uri UpdateRulesUri = new Uri("http://aikatsucn.cn/files/rules.json"); + public static Uri UpdateRulesUri = new Uri("http://static.aikatsucn.cn/static/tencent-video-enhanced/rules.json"); public static string TransferTemplate(string format) { diff --git a/TencentVideoEnhanced/Model/exception.cs b/TencentVideoEnhanced/Model/exception.cs index f01ca95..46497ac 100644 --- a/TencentVideoEnhanced/Model/exception.cs +++ b/TencentVideoEnhanced/Model/exception.cs @@ -4,37 +4,6 @@ namespace TencentVideoEnhanced.Model { - /// - /// Wrapper around a standard synchronization context, that catches any unhandled exceptions. - /// Acts as a facade passing calls to the original SynchronizationContext - /// - /// - /// Set this up inside your App.xaml.cs file as follows: - /// - /// protected override void OnActivated(IActivatedEventArgs args) - /// { - /// EnsureSyncContext(); - /// ... - /// } - /// - /// protected override void OnLaunched(LaunchActivatedEventArgs args) - /// { - /// EnsureSyncContext(); - /// ... - /// } - /// - /// private void EnsureSyncContext() - /// { - /// var exceptionHandlingSynchronizationContext = ExceptionHandlingSynchronizationContext.Register(); - /// exceptionHandlingSynchronizationContext.UnhandledException += OnSynchronizationContextUnhandledException; - /// } - /// - /// private void OnSynchronizationContextUnhandledException(object sender, UnhandledExceptionEventArgs args) - /// { - /// args.Handled = true; - /// } - /// - /// public class ExceptionHandlingSynchronizationContext : SynchronizationContext { /// diff --git a/TencentVideoEnhanced/Package.appxmanifest b/TencentVideoEnhanced/Package.appxmanifest index 893db46..6f896de 100644 --- a/TencentVideoEnhanced/Package.appxmanifest +++ b/TencentVideoEnhanced/Package.appxmanifest @@ -1,6 +1,6 @@  - + 腾讯视频web增强版 diff --git a/TencentVideoEnhanced/TencentVideoEnhanced.csproj b/TencentVideoEnhanced/TencentVideoEnhanced.csproj index 4d21956..499dbd1 100644 --- a/TencentVideoEnhanced/TencentVideoEnhanced.csproj +++ b/TencentVideoEnhanced/TencentVideoEnhanced.csproj @@ -128,7 +128,7 @@ App.xaml - + History.xaml diff --git a/TencentVideoEnhanced/View/History.xaml b/TencentVideoEnhanced/View/History.xaml index 4c7683f..ba903ed 100644 --- a/TencentVideoEnhanced/View/History.xaml +++ b/TencentVideoEnhanced/View/History.xaml @@ -22,5 +22,26 @@ x:Name="Loading" Width="80" Height="80" > + + + + + + - + 本应用为腾讯视频第三方版本v1.0.14,基于官方H5网页版 - + - + 源代码请参阅: - - + - + 如有任何需求或者建议请在GitHub上提出 + + 版本v1.0.15更新日志 + + 1、加入捐助开发者渠道 + + 2、提供了更丰富的搜索页选项 + + 3、细节功能优化 + + + 版本v1.0.14更新日志 修复暗黑主题下设置页显示bug @@ -234,16 +245,27 @@ 重构增强规则引擎 - + + + + + 助力开发者走得更远 + + + + + + + + diff --git a/TencentVideoEnhanced/View/Settings.xaml.cs b/TencentVideoEnhanced/View/Settings.xaml.cs index 6c140b3..7bf98dc 100644 --- a/TencentVideoEnhanced/View/Settings.xaml.cs +++ b/TencentVideoEnhanced/View/Settings.xaml.cs @@ -1,26 +1,13 @@ using Microsoft.Toolkit.Uwp.Helpers; using Newtonsoft.Json; using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; using System.Threading.Tasks; using TencentVideoEnhanced.Model; -using Windows.ApplicationModel; using Windows.ApplicationModel.Core; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.Storage; using Windows.UI.Popups; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; -using Windows.UI.Xaml.Input; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; using System.Net.Http; using System.Net; diff --git a/TencentVideoEnhanced/View/ShellPage.xaml.cs b/TencentVideoEnhanced/View/ShellPage.xaml.cs index 1293418..d734501 100644 --- a/TencentVideoEnhanced/View/ShellPage.xaml.cs +++ b/TencentVideoEnhanced/View/ShellPage.xaml.cs @@ -1,27 +1,9 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Windows.Foundation; -using Windows.Foundation.Collections; -using Windows.UI.ViewManagement; -using Windows.Storage; -using Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Windows.UI.Xaml.Controls.Primitives; -using Windows.UI.Xaml.Data; +using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Input; using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Navigation; using Windows.Foundation.Metadata; -using Windows.UI.Core; using Windows.UI; using TencentVideoEnhanced.Model; -using TencentVideoEnhanced.View; -using Microsoft.Toolkit.Uwp.Helpers; -using Newtonsoft.Json; -using Windows.ApplicationModel.Core; // https://go.microsoft.com/fwlink/?LinkId=234238 上介绍了“空白页”项模板 diff --git a/TencentVideoEnhanced/View/VideoPlayer.xaml b/TencentVideoEnhanced/View/VideoPlayer.xaml index 0bf8f1a..deac06d 100644 --- a/TencentVideoEnhanced/View/VideoPlayer.xaml +++ b/TencentVideoEnhanced/View/VideoPlayer.xaml @@ -19,9 +19,8 @@ NewWindowRequested="NewWindowRequested" SizeChanged="SizeChanged" FrameDOMContentLoaded="FrameDOMContentLoaded" - NavigationStarting="NavigationStarting" /> - + @@ -39,20 +38,24 @@ + -