Block WPS Office

This commit is contained in:
XY Wang 2021-09-17 23:09:00 +08:00
parent b1acb67886
commit b346ec4cce
2 changed files with 45 additions and 5 deletions

View File

@ -43,8 +43,8 @@
<Border Name="BorderSettings" Background="White" BorderBrush="Black" <Border Name="BorderSettings" Background="White" BorderBrush="Black"
BorderThickness="1" CornerRadius="10" BorderThickness="1" CornerRadius="10"
Width="400" HorizontalAlignment="Center" Width="450" HorizontalAlignment="Center"
Margin="100" Visibility="Collapsed"> Margin="100" Visibility="Visible">
<ScrollViewer VerticalScrollBarVisibility="Auto" <ScrollViewer VerticalScrollBarVisibility="Auto"
PanningMode="VerticalOnly" ui:ThemeManager.RequestedTheme="Light" PanningMode="VerticalOnly" ui:ThemeManager.RequestedTheme="Light"
ManipulationBoundaryFeedback="SCManipulationBoundaryFeedback"> ManipulationBoundaryFeedback="SCManipulationBoundaryFeedback">
@ -59,6 +59,8 @@
<ui:ToggleSwitch Name="ToggleSwitchRunAtStartup" Header="开机时运行" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchRunAtStartup_Toggled"/> <ui:ToggleSwitch Name="ToggleSwitchRunAtStartup" Header="开机时运行" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchRunAtStartup_Toggled"/>
<TextBlock Text="我们并不推荐使用 WPS Office因为其对于触摸设备的较差支持。" Foreground="#666666"/> <TextBlock Text="我们并不推荐使用 WPS Office因为其对于触摸设备的较差支持。" Foreground="#666666"/>
<ui:ToggleSwitch Name="ToggleSwitchSupportPowerPoint" Header="Microsoft PowerPoint 支持" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchSupportPowerPoint_Toggled"/> <ui:ToggleSwitch Name="ToggleSwitchSupportPowerPoint" Header="Microsoft PowerPoint 支持" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchSupportPowerPoint_Toggled"/>
<TextBlock Text="对 WPS Office 支持时会导致 WPS Office 关闭时卡顿,故本选项已禁用。" Foreground="#666666"/>
<ui:ToggleSwitch Name="ToggleSwitchSupportWPS" Header="WPS Office 支持" IsOn="False" IsEnabled="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchSupportPowerPoint_Toggled"/>
<ui:ToggleSwitch Name="ToggleSwitchShowCanvasAtNewSlideShow" Header="开始放映时自动显示画板" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchShowCanvasAtNewSlideShow_Toggled"/> <ui:ToggleSwitch Name="ToggleSwitchShowCanvasAtNewSlideShow" Header="开始放映时自动显示画板" IsOn="True" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchShowCanvasAtNewSlideShow_Toggled"/>
</ui:SimpleStackPanel> </ui:SimpleStackPanel>
</GroupBox> </GroupBox>

View File

@ -25,6 +25,7 @@ using Newtonsoft.Json;
using IWshRuntimeLibrary; using IWshRuntimeLibrary;
using File = System.IO.File; using File = System.IO.File;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Net;
namespace Ink_Canvas namespace Ink_Canvas
{ {
@ -36,6 +37,7 @@ namespace Ink_Canvas
public MainWindow() public MainWindow()
{ {
InitializeComponent(); InitializeComponent();
BorderSettings.Visibility = Visibility.Collapsed;
} }
Timer timerCheckPPT = new Timer(); Timer timerCheckPPT = new Timer();
@ -463,8 +465,6 @@ namespace Ink_Canvas
#endregion #endregion
int BoundsWidth = 6;
private void Main_Grid_TouchDown(object sender, TouchEventArgs e) private void Main_Grid_TouchDown(object sender, TouchEventArgs e)
{ {
if (forceEraser) return; if (forceEraser) return;
@ -542,6 +542,8 @@ namespace Ink_Canvas
} }
} }
int BoundsWidth = 5;
private void ToggleSwitchModeFinger_Toggled(object sender, RoutedEventArgs e) private void ToggleSwitchModeFinger_Toggled(object sender, RoutedEventArgs e)
{ {
if (ToggleSwitchModeFinger.IsOn) if (ToggleSwitchModeFinger.IsOn)
@ -550,7 +552,7 @@ namespace Ink_Canvas
} }
else else
{ {
BoundsWidth = 6; BoundsWidth = 5;
} }
} }
@ -642,6 +644,11 @@ namespace Ink_Canvas
if (pptApplication != null) if (pptApplication != null)
{ {
if (pptApplication.Name.Contains("WPS Office"))
{
pptApplication = null;
return;
}
timerCheckPPT.Stop(); timerCheckPPT.Stop();
//获得演示文稿对象 //获得演示文稿对象
presentation = pptApplication.ActivePresentation; presentation = pptApplication.ActivePresentation;
@ -1000,6 +1007,37 @@ namespace Ink_Canvas
#endregion #endregion
public static string GetWebClient(string url)
{
HttpWebRequest myrq = (HttpWebRequest)WebRequest.Create(url);
myrq.KeepAlive = false;
myrq.Timeout = 30 * 1000;
myrq.Method = "Get";
myrq.Accept = "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8";
myrq.UserAgent = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 UBrowser/6.2.4098.3 Safari/537.36";
HttpWebResponse myrp;
try
{
myrp = (HttpWebResponse)myrq.GetResponse();
}
catch (WebException ex)
{
myrp = (HttpWebResponse)ex.Response;
}
if (myrp.StatusCode != HttpStatusCode.OK)
{
return "null";
}
using (StreamReader sr = new StreamReader(myrp.GetResponseStream()))
{
return sr.ReadToEnd();
}
}
#region #region
/// <summary> /// <summary>
/// 开机自启创建 /// 开机自启创建