Merge remote-tracking branch 'origin/zhangxueyang' into zyy

XHWK.WKTool/Helpers/ZJClippingBorder.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace XHWK.WKTool.Helpers
+{
+    public class ZJClippingBorder : Border
+    {
+        private object _oldClip;
+
+        protected override void OnRender(DrawingContext dc)
+        {
+            OnApplyChildClip();
+            base.OnRender(dc);
+        }
+
+        public override UIElement Child
+        {
+            get => base.Child;
+            set
+            {
+                if (Child != value)
+                {
+                    if (Child != null)
+                    {
+                        Child.SetValue(ClipProperty, _oldClip);
+                    }
+
+                    if (value != null)
+                    {
+                        _oldClip = value.ReadLocalValue(ClipProperty);
+                    }
+                    else
+                    {
+                        // If we dont set it to null we could leak a Geometry object
+                        _oldClip = null;
+                    }
+
+                    base.Child = value;
+                }
+            }
+        }
+
+        protected virtual void OnApplyChildClip()
+        {
+            UIElement child = Child;
+            if (child != null)
+            {
+                double top = Math.Max(CornerRadius.TopLeft, CornerRadius.TopRight);
+                double bottom = Math.Max(CornerRadius.BottomLeft, CornerRadius.BottomRight);
+                double max = Math.Max(top, bottom);
+                Size size = RenderSize;
+                double width = size.Width - (BorderThickness.Left + BorderThickness.Right);
+                double height = size.Height - (BorderThickness.Top + BorderThickness.Bottom);
+                Geometry result = new RectangleGeometry(new Rect(0, 0, width, height), max, max);
+                double halfWidth = width / 2;
+                double halfHeight = height / 2;
+
+                if (CornerRadius.TopLeft == 0)
+                {
+                    result = new CombinedGeometry(
+                        GeometryCombineMode.Union,
+                        result,
+                        new RectangleGeometry(new Rect(0, 0, halfWidth, halfHeight))
+                    );
+                }
+
+                if (CornerRadius.TopRight == 0)
+                {
+                    result = new CombinedGeometry(GeometryCombineMode.Union, result, new RectangleGeometry
+                (new Rect(halfWidth, 0, halfWidth, halfHeight)));
+                }
+
+                if (CornerRadius.BottomLeft == 0)
+                {
+                    result = new CombinedGeometry
+                  (GeometryCombineMode.Union, result, new RectangleGeometry
+                  (new Rect(0, halfHeight, halfWidth, halfHeight)));
+                }
+                if (CornerRadius.BottomRight == 0)
+                {
+                    result = new CombinedGeometry
+                  (
+                GeometryCombineMode.Union,
+                result,
+                new RectangleGeometry(new Rect(halfWidth, halfHeight, halfWidth, halfHeight))
+                );
+                }
+                child.Clip = result;
+            }
+        }
+    }
+}

XHWK.WKTool/KeyVerification.xaml

@@ -0,0 +1,141 @@
+<Window x:Class="XHWK.WKTool.KeyVerification"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:XHWK.WKTool"
+         xmlns:Views="clr-namespace:XHWK.WKTool.Helpers"
+        mc:Ignorable="d"
+        Title="KeyVerification"    Width="300"
+    Height="230"
+    AllowsTransparency="True"
+    Background="Transparent"
+    ShowInTaskbar="False"
+    WindowStartupLocation="CenterOwner"
+    WindowStyle="None"
+    mc:Ignorable="d" BorderThickness="7">
+    <Window.Effect>
+        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
+    </Window.Effect>
+    <Window.Resources>
+        <Style x:Key="oiliu" TargetType="ListBoxItem">
+            <!--  设置控件模板  -->
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListBoxItem">
+                        <Border
+                            Margin="4,0,0,0"
+                            Padding="0"
+                            Background="{TemplateBinding Background}">
+                            <ContentPresenter
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                TextBlock.Foreground="{TemplateBinding Foreground}" />
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <DataTemplate x:Key="UserTpl">
+            <StackPanel
+                Width="70.5"
+                Height="auto"
+                Background="Transparent">
+                <TextBlock
+                        Padding="0,12,0,0"
+                        HorizontalAlignment="Left"
+                        FontSize="20"
+                        Foreground="#3C525B"
+                        Text="{Binding username}" />
+            </StackPanel>
+        </DataTemplate>
+    </Window.Resources>
+    <Views:ZJClippingBorder Background="White" CornerRadius="10,10,10,10">
+        <Grid Margin="0,0,0,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="50" />
+                <RowDefinition Height="*" />
+                <RowDefinition Height="75" />
+            </Grid.RowDefinitions>
+            <!--  头部  -->
+            <Grid
+                Grid.Row="0"
+                Height="50"
+                Background="#4597FF">
+                <TextBlock
+                    x:Name="title_tb"
+                    Grid.Row="0"
+                    Margin="15,0,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    FontSize="22"
+                    Foreground="White"
+                    Text="产品激活" />
+                <Button
+                    Grid.Column="0"
+                    Width="46"
+                    Height="46"
+                    Margin="0,0,10,0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Center"
+                    Background="White"
+                    Click="close_click" Cursor="Hand"
+                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
+                    <Button.Template>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Border
+                                BorderBrush="{TemplateBinding Control.BorderBrush}"
+                                BorderThickness="0"
+                                CornerRadius="20">
+                                <ContentPresenter
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding ContentControl.Content}" />
+                            </Border>
+                        </ControlTemplate>
+                    </Button.Template>
+                    <Image
+                        Width="40"
+                        Height="40"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Source="../Images/RollCall/rollCall_1.png"
+                        Stretch="Fill" />
+                </Button>
+            </Grid>
+            <Grid Grid.Row="1" Margin="10,20,0,0">
+                <StackPanel Orientation="Horizontal" Height="30">
+                    <TextBlock Text="密匙：" FontSize="20"/>
+                    <TextBox x:Name="txbKey" Text="" Width="200" Foreground="gray" FontSize="18"/>
+                </StackPanel>
+            </Grid>
+
+            <Button Cursor="Hand"
+                x:Name="btnEnd"
+                Grid.Row="2"
+                Width="163.5"
+                Height="37.2"
+                Margin="0,0,0,0"
+                Click="btnEnd_Click"
+                Content="验证"
+                FontSize="18.75"
+                Foreground="White">
+                <Button.Template>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <Border
+                            BorderBrush="{TemplateBinding Control.BorderBrush}"
+                            BorderThickness="0"
+                            CornerRadius="20">
+                            <Border.Background>#6098FF</Border.Background>
+                            <ContentPresenter
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Content="{TemplateBinding ContentControl.Content}" />
+                        </Border>
+                    </ControlTemplate>
+                </Button.Template>
+            </Button>
+        </Grid>
+
+    </Views:ZJClippingBorder>
+</Window>

XHWK.WKTool/KeyVerification.xaml.cs

@@ -0,0 +1,153 @@
+using SchoolClient.Commons;
+using SchoolClient.Config;
+using SchoolClient.Method;
+
+using System;
+using System.IO;
+using System.Management;
+using System.Text;
+using System.Threading;
+using System.Windows;
+using System.Windows.Forms;
+
+namespace XHWK.WKTool
+{
+    /// <summary>
+    /// KeyVerification.xaml 的交互逻辑
+    /// </summary>
+    /*
+     输入code 调认证服务，成功跳登陆 并且调用添加历史接口，失败继续输code
+         */
+    public partial class KeyVerification : Window
+    {
+        private readonly RegisterController registerController = new RegisterController();
+        private int serverReturnCode = 0;
+
+        public KeyVerification()
+        {
+            InitializeComponent();
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+        }
+
+
+        private void btnEnd_Click(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(txbKey.Text))
+            {
+                MessageWindow.Show("密匙未输入");
+                return;
+            }
+            projectcode = txbKey.Text;
+            Shared.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddServering, InvokeActivationAddServerCompate);
+        }
+
+        private string projectcode = string.Empty;
+        /// <summary>
+        /// 认证服务-调用
+        /// </summary>
+        /// <returns></returns>
+        private object InvokeActivationAddServering()
+        {
+            string device = "pc";
+            string mac = GetMacAddress();
+            serverReturnCode = registerController.ActivationAdd(mac, device, projectcode);
+            return Shared.ServerMsg;
+        }
+
+        /// <summary>
+        /// 认证服务-返回结果
+        /// </summary>
+        /// <returns></returns>
+        public void InvokeActivationAddServerCompate(object obj)
+        {
+            if (serverReturnCode == Shared.ServerScuessCode)
+            {
+                MessageWindow.Show("产品激活成功");
+                Shared.BackgroundWorkerHelper.RunWorkerAsync(InvokeActivationAddHistoryServering, InvokeActivationAddHistoryServerCompate);
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    LoginWindow win = new LoginWindow();
+                    //win.Topmost = true;
+                    win.Show();
+
+                    Hide();
+                    Thread.Sleep(200);
+                    Close();
+                }));
+            }
+            else
+            {
+                System.Windows.Forms.MessageBox.Show(Shared.ServerMsg, "激活结果：", MessageBoxButtons.OK, MessageBoxIcon.Information, MessageBoxDefaultButton.Button1, System.Windows.Forms.MessageBoxOptions.DefaultDesktopOnly);
+            }
+        }
+        /// <summary>
+        /// 激活信息--添加激活历史-调用
+        /// </summary>
+        /// <returns></returns>
+        private object InvokeActivationAddHistoryServering()
+        {
+            serverReturnCode = registerController.ActivationAddHistory(ref Shared.TeachingData);
+            return Shared.ServerMsg;
+        }
+
+        /// <summary>
+        /// 激活信息--添加激活历史-返回结果
+        /// </summary>
+        /// <returns></returns>
+        public void InvokeActivationAddHistoryServerCompate(object obj)
+        {
+            if (!Directory.Exists(APP.dataPath))
+            {
+                Directory.CreateDirectory(APP.dataPath);
+            }
+            string ApplicationData = APP.dataPath + "signatureTime.txt";
+            string currentTime = DateTime.Now.ToLongDateString().ToString();//当前时间
+            System.IO.File.WriteAllText(ApplicationData, currentTime, Encoding.Default);//存放签名验证日期
+
+
+        }
+        /// <summary>  
+        /// 获取本机MAC地址  
+        /// </summary>  
+        /// <returns>本机MAC地址</returns>  
+        public static string GetMacAddress()
+        {
+            try
+            {
+                string strMac = string.Empty;
+                ManagementClass mc = new ManagementClass("Win32_NetworkAdapterConfiguration");
+                ManagementObjectCollection moc = mc.GetInstances();
+                foreach (ManagementObject mo in moc)
+                {
+                    if ((bool)mo["IPEnabled"] == true)
+                    {
+                        strMac = mo["MacAddress"].ToString();
+                    }
+                }
+                moc = null;
+                mc = null;
+                return strMac;
+            }
+            catch
+            {
+                return "unknown";
+            }
+        }
+
+        private void close_click(object sender, RoutedEventArgs e)
+        {
+            closeAction();
+        }
+        private void closeAction()
+        {
+            APP.myloading.Show();
+            new Thread(o =>
+            {
+                Dispatcher.Invoke(new Action(() =>
+                {
+                    System.Environment.Exit(0);
+                }));
+            }).Start();
+        }
+    }
+}

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -1596,7 +1596,7 @@ namespace XHWK.WKTool
                                 }
                                 catch (Exception ex)
                                 {
-                                    System.Windows.MessageBox.Show("无法删除视频！" + ex.Message);
+                                    MessageWindow.Show("无法删除视频！" + ex.Message);
                                     return;
                                 }
                             }

XHWK.WKTool/XHWK.WKTool.csproj

@@ -89,6 +89,7 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -141,10 +142,14 @@
     </Compile>
     <Compile Include="Helpers\ScreenHelper.cs" />
     <Compile Include="Helpers\WpfHelper.cs" />
+    <Compile Include="Helpers\ZJClippingBorder.cs" />
     <Compile Include="Helpers\ZJDownloadUtil.cs" />
     <Compile Include="JieTuWindow.xaml.cs">
       <DependentUpon>JieTuWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="KeyVerification.xaml.cs">
+      <DependentUpon>KeyVerification.xaml</DependentUpon>
+    </Compile>
     <Compile Include="LoadDialog.xaml.cs">
       <DependentUpon>LoadDialog.xaml</DependentUpon>
     </Compile>
@@ -199,6 +204,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="KeyVerification.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="LoadDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

XHWK.WKTool/packages.config

@@ -9,5 +9,6 @@
   <package id="Aspose.PDF" version="19.1.0" targetFramework="net452" />
   <package id="Aspose.Slides.NET" version="19.10.0" targetFramework="net452" />
   <package id="iTextSharp" version="5.5.13.1" targetFramework="net452" />
+  <package id="System.Management" version="4.7.0" targetFramework="net452" />
   <package id="WpfAnimatedGif" version="2.0.0" targetFramework="net452" />
 </packages>