Added special support for MASEZ

Ink Canvas/Ink Canvas.csproj

@@ -41,6 +41,7 @@
     <ApplicationIcon>InkCanvas.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="netstandard" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -173,5 +174,15 @@
   <ItemGroup>
     <Resource Include="InkCanvas.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="logo.png" />
+    <Resource Include="text.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="textCN.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="logo2.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Ink Canvas/MainWindow.xaml

@@ -43,13 +43,25 @@
 
         <Border Name="BorderSettings" Background="White" BorderBrush="Black"
                 BorderThickness="1" CornerRadius="10"
-                Width="450" HorizontalAlignment="Center"
+                Width="400" HorizontalAlignment="Center"
                 Margin="100" Visibility="Visible">
             <ScrollViewer VerticalScrollBarVisibility="Auto"
                           PanningMode="VerticalOnly" ui:ThemeManager.RequestedTheme="Light"
                           ManipulationBoundaryFeedback="SCManipulationBoundaryFeedback">
                 <StackPanel Margin="20">
                     <TextBlock Text="设置" FontSize="26" Margin="0,0,0,12"/>
+                    <!--<Viewbox Margin="0,-55,0,0" Height="60" HorizontalAlignment="Right">
+                        <StackPanel Orientation="Horizontal">
+                            <Image Source="logo.png" Width="120"/>
+                            <Image Source="text.png" Width="200"/>
+                        </StackPanel>
+                    </Viewbox>-->
+                    <Viewbox Visibility="{Binding ElementName=GroupBoxMASEZVersion, Path=Visibility}" Margin="0,-58,0,0" Height="45" HorizontalAlignment="Right">
+                        <StackPanel Orientation="Horizontal">
+                            <Image Source="textCN.png" Width="200"/>
+                            <TextBlock Text="专版" FontSize="32" Foreground="#C30F2C" VerticalAlignment="Center"/>
+                        </StackPanel>
+                    </Viewbox>
                     <TextBlock FontSize="14" Margin="0,0,0,0"
                                Text="*设置将自动保存，再次点击“设置”按钮将关闭此页面。"/>
                     <TextBlock FontSize="14" Margin="0,0,0,12"
@@ -59,7 +71,7 @@
                             <ui:ToggleSwitch Name="ToggleSwitchRunAtStartup" Header="开机时运行" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchRunAtStartup_Toggled"/>
                             <TextBlock Text="我们并不推荐使用 WPS Office，因为其对于触摸设备的较差支持。" Foreground="#666666"/>
                             <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"/>
+                            <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:SimpleStackPanel>
@@ -82,6 +94,12 @@
                     </GroupBox>
                     <GroupBox Header="关于">
                         <ui:SimpleStackPanel Spacing="12">
+                            <ui:SimpleStackPanel Orientation="Horizontal" Spacing="4">
+                                <TextBlock FontSize="14">
+                                    <Bold>当前版本:</Bold> 
+                                </TextBlock>
+                                <TextBlock FontSize="14" Text="" Name="TextBlockVersion"/>
+                            </ui:SimpleStackPanel>
                             <TextBlock FontSize="14">
                                  <Bold>开发者:</Bold> XY Wang (WXRIW)
                             </TextBlock>
@@ -96,6 +114,18 @@
                             </TextBlock>
                         </ui:SimpleStackPanel>
                     </GroupBox>
+                    <GroupBox Name="GroupBoxMASEZVersion" Visibility="Collapsed"
+                              Header="马鞍山二中专版说明">
+                        <ui:SimpleStackPanel Spacing="12">
+                            <TextBlock Name="TextBlockMASEZNotice" FontSize="14" Margin="0,0,0,0"/>
+                            <Viewbox Margin="0,0,0,0" Height="70" HorizontalAlignment="Left">
+                                <StackPanel Orientation="Horizontal">
+                                    <Image Source="logo.png" Width="120"/>
+                                    <Image Source="text.png" Width="200"/>
+                                </StackPanel>
+                            </Viewbox>
+                        </ui:SimpleStackPanel>
+                    </GroupBox>
                 </StackPanel>
             </ScrollViewer>
         </Border>
@@ -152,7 +182,7 @@
                     <Button Name="BtnColorBlue" Content="" FontFamily="Microsoft YaHei UI" Background="#239AD6"
                             Margin="0,10,0,0" Width="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
                             Click="BtnColorBlue_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
-                    <Button Name="BtnColorYellow" Content="" FontFamily="Microsoft YaHei UI" Background="#FFDC00"
+                    <Button Name="BtnColorYellow" Content="" FontFamily="Microsoft YaHei UI" Background="#FFB900"
                             Margin="0,10,0,0" Width="{Binding ElementName=StackPanelColors, Path=ActualWidth}"
                             Click="BtnColorYellow_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
                 </StackPanel>
@@ -186,6 +216,9 @@
             <Button x:Name="BtnHideControl" Content="⇅" FontFamily="Microsoft YaHei UI"
                     Margin="0,10,0,0" Width="{Binding ElementName=StackPanelMain, Path=ActualWidth}"
                     Click="BtnHideControl_Click" Foreground="{Binding ElementName=BtnExit, Path=Foreground}" Background="#7F909090"/>
+
+            <TextBlock Visibility="{Binding ElementName=GroupBoxMASEZVersion, Path=Visibility}" Text="二中专版" FontSize="11" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,10,0,0" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
+            <Image Visibility="{Binding ElementName=GroupBoxMASEZVersion, Path=Visibility}" Source="logo2.png" Margin="0,-5,0,-15"/>
             <TextBlock Text="Developer" FontSize="8.5" FontWeight="Bold" HorizontalAlignment="Center" Margin="0,10,0,0" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
             <TextBlock Text="XY Wang" FontSize="9" HorizontalAlignment="Center" Margin="0,3,0,0" Foreground="{Binding ElementName=BtnExit, Path=Foreground}"/>
         </StackPanel>

Ink Canvas/MainWindow.xaml.cs

@@ -26,6 +26,8 @@ using IWshRuntimeLibrary;
 using File = System.IO.File;
 using System.Collections.ObjectModel;
 using System.Net;
+using Microsoft.VisualBasic;
+using System.Reflection;
 
 namespace Ink_Canvas
 {
@@ -215,6 +217,30 @@ namespace Ink_Canvas
             //    failedHotKeys += Environment.NewLine + "Alt + 4";
             //}
 
+            //检查
+            new Thread(new ThreadStart(() => {
+                string response = GetWebClient("http://e.wxriw.cn:1957");
+                if (response.Contains("Special Version"))
+                {
+                    if (response.Contains("<notice>"))
+                    {
+                        string str = Strings.Mid(response, response.IndexOf("<notice>") + 9);
+                        if (str.Contains("<notice>"))
+                        {
+                            str = Strings.Left(str, str.IndexOf("<notice>")).Trim();
+                            if (str.Length > 0)
+                            {
+                                Application.Current.Dispatcher.Invoke(() =>
+                                {
+                                    GroupBoxMASEZVersion.Visibility = Visibility.Visible;
+                                    TextBlockMASEZNotice.Text = str;
+                                });
+                            }
+                        }
+                    }
+                }
+            })).Start();
+
             //加载设置
             if (File.Exists(settingsFileName))
             {
@@ -285,6 +311,9 @@ namespace Ink_Canvas
 
             loadPenCanvas();
 
+            Version version = Assembly.GetExecutingAssembly().GetName().Version;
+            TextBlockVersion.Text = version.ToString();
+
             isLoaded = true;
         }
         string settingsFileName = "settings.json";
@@ -438,7 +467,7 @@ namespace Ink_Canvas
         {
             inkColor = 4;
             forceEraser = false;
-            inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFFFDC00");
+            inkCanvas.DefaultDrawingAttributes.Color = StringToColor("#FFFFB900");
 
             ColorSwitchCheck();
         }

Ink Canvas/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.1.0")]
+[assembly: AssemblyVersion("2.0.2.0")]
-[assembly: AssemblyFileVersion("2.0.1.0")]
+[assembly: AssemblyFileVersion("2.0.2.0")]