zhao：解决冲突

Common/Common.csproj

@@ -137,6 +137,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="system\SplashScreen.cs" />
     <Compile Include="system\XmlUtilHelper.cs" />
+    <Compile Include="system\ZJClippingBorder.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="dlls\" />

Common/system/BlackboardNew.cs

@@ -276,10 +276,6 @@ namespace Common.system
                         undoOrRedo += 1;
                         m_canvas.Strokes.Clear();
                     }
-
-                   
-
-
                     StrokeCollection strokes = new StrokeCollection();
                     StylusPointCollection stylusPoints = new StylusPointCollection();
                     System.Windows.Input.StylusPointDescription stylusPointDescription = new StylusPointDescription();
@@ -295,37 +291,6 @@ namespace Common.system
                     stroke = new Stroke(stylusPoints);
                     page.lines.Last().lines_curr.Add(stroke);
                     m_canvas.Strokes.Add(page.lines.Last().lines_curr);
-                    //stylusPoint.X = 586;
-                    //stylusPoint.Y = 214;
-                    //stylusPoints.Add(stylusPoint);
-                    //stroke = new Stroke(stylusPoints);
-
-                    //stylusPoint.X = 599;
-                    //stylusPoint.Y = 214;
-                    //stylusPoints.Add(stylusPoint);
-                    //stroke = new Stroke(stylusPoints);
-                    //stylusPoint.X = 623;
-                    //stylusPoint.Y = 214;
-                    //stylusPoints.Add(stylusPoint);
-                    //stroke = new Stroke(stylusPoints);
-
-                    //stylusPoint.X = 663;
-                    //stylusPoint.Y = 214;
-                    //stylusPoints.Add(stylusPoint);
-                    //stroke = new Stroke(stylusPoints);
-                    //stylusPoint.X = 963;
-                    //stylusPoint.Y = 214;
-                    //stylusPoints.Add(stylusPoint);
-                    //stroke = new Stroke(stylusPoints);
-                    //DrawingAttributes drawingAttributes = new DrawingAttributes();
-                    //m_canvas.DefaultDrawingAttributes = drawingAttributes;
-                    //drawingAttributes.Color = Colors.Red;
-                    //drawingAttributes.Width = pensize;
-                    //drawingAttributes.Height = pensize;
-                    //drawingAttributes.FitToCurve = true;
-                    //drawingAttributes.IgnorePressure = false;
-                    //stroke.DrawingAttributes = drawingAttributes;
-                    //m_canvas.Strokes.Add(stroke);
                 }
             }
         }
@@ -333,131 +298,59 @@ namespace Common.system
         StylusPoint stylusPoint = new StylusPoint();
         Stroke stroke;
         bool isFirst = true;
-        //public void changepages(double _x, double _y, bool _new, Color _color, int _size, int i)
-        //{
-        //    if (_new)
-        //    {
-        //        if (stroke != null && stroke.StylusPoints.Count > 1)
-        //        {
-        //            drawingAttributes = new DrawingAttributes();
-        //            //m_canvas.DefaultDrawingAttributes = drawingAttributes;
-        //            drawingAttributes.Color = _color;
-        //            drawingAttributes.Width = _size;
-        //            drawingAttributes.Height = _size;
-        //            drawingAttributes.FitToCurve = true;
-        //            drawingAttributes.IgnorePressure = false;
-        //            stroke.DrawingAttributes = drawingAttributes;
-        //            m_canvas.Strokes.Add(stroke);
-        //            isFirst = true;
-
-        //            strokes_page_all[i].lines.Last().lines_curr.Add(stroke);
-        //            //int currCount = strokes_page_all[i].lines.Last().lines_curr.Count;
-        //            //if (currCount > 0)
-        //            //{
-        //            //    strokes_page_all[i].lines.Last().lines_curr[currCount - 1].add = stroke;
-        //            //}
-
-
-        //        }
-
-        //        stylusPoints = new StylusPointCollection();
-        //        stylusPoint = new StylusPoint();
-        //        //stroke = new Stroke(stylusPoints);
-        //        stroke = null;
-        //    }
-        //    else
-        //    {
-        //        if (isFirst)
-        //        {
-        //            stylusPoint.X = _x;
-        //            stylusPoint.Y = _y;
-        //            stylusPoints.Add(stylusPoint);
-        //            if (stylusPoints.Count > 1)
-        //            {
-        //                stroke = new Stroke(stylusPoints);
-        //                m_canvas.Strokes.Add(stroke);
-        //                isFirst = false;
-        //            }
-        //        }
-        //        else
-        //        {
-        //            if (m_canvas.Strokes.Count>0)
-        //            {
-
-
-        //                stylusPoint.X = _x;
-        //            stylusPoint.Y = _y;
-        //            stylusPoints.Add(stylusPoint);
-        //            stroke = new Stroke(stylusPoints);
-        //            m_canvas.Strokes[m_canvas.Strokes.Count - 1].StylusPoints.Add(stylusPoints);
-        //            }
-        //        }
-        //    }
-        //}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
         public void changepages(double _x, double _y, bool _new, Color _color, int _size, int i)
         {
-            try
+            if (_new)
             {
-                if (_new)
+                if (stroke != null && stroke.StylusPoints.Count > 1)
                 {
-                    if (stroke != null && stroke.StylusPoints.Count > 1)
+                    isFirst = true;
+                    strokes_page_all[i].lines.Last().lines_curr.Add(stroke);
+                }
+                stylusPoints = new StylusPointCollection();
+                stylusPoint = new StylusPoint();
+                stroke = null;
+            }
+            else
+            {
+                if (isFirst)
+                {
+                    stylusPoint.X = _x;
+                    stylusPoint.Y = _y;
+                    stylusPoints.Add(stylusPoint);
+                    if (stylusPoints.Count > 1)
                     {
+                        stroke = new Stroke(stylusPoints);
                         drawingAttributes = new DrawingAttributes();
-                        //m_canvas.DefaultDrawingAttributes = drawingAttributes;
                         drawingAttributes.Color = _color;
-                        drawingAttributes.Width = _size * 5;
-                        drawingAttributes.Height = _size * 5;
+                        drawingAttributes.Width = _size*4.5;
+                        drawingAttributes.Height = _size * 4.5;
                         drawingAttributes.FitToCurve = true;
                         drawingAttributes.IgnorePressure = false;
-
                         stroke.DrawingAttributes = drawingAttributes;
-                        //m_canvas.DefaultDrawingAttributes= drawingAttributes;
-
                         m_canvas.Strokes.Add(stroke);
-                        strokes_page_all[i].lines.Last().lines_curr.Add(stroke);
-
-                        //int currCount= strokes_page_all[i].lines.Last().lines_curr.Count;
-                        //if (currCount > 0)
-                        //{
-                        //    strokes_page_all[i].lines.Last().lines_curr[currCount - 1] = stroke;
-                        //}
-                        stroke = null;
+                        isFirst = false;
                     }
-                    stylusPoints = new StylusPointCollection();
-                    stylusPoint = new StylusPoint();
-                    //stroke = new Stroke(stylusPoints);
-                    //stroke = null;
                 }
                 else
                 {
-                    //stylusPoints = new StylusPointCollection();
-                    //stylusPoint = new StylusPoint();
-                    stylusPoint.X = _x;
-                    stylusPoint.Y = _y;
-                    stylusPoints.Add(stylusPoint);
-                    stroke = new Stroke(stylusPoints);
+                    if (m_canvas.Strokes.Count > 0)
+                    {
+                        stylusPoint.X = _x;
+                        stylusPoint.Y = _y;
+                        stylusPoints.Add(stylusPoint);
+                        stroke = new Stroke(stylusPoints);
+                        drawingAttributes = new DrawingAttributes();
+                        drawingAttributes.Color = _color;
+                        drawingAttributes.Width = _size * 4.5;
+                        drawingAttributes.Height = _size * 4.5;
+                        drawingAttributes.FitToCurve = true;
+                        drawingAttributes.IgnorePressure = false;
+                        stroke.DrawingAttributes = drawingAttributes;
+                        m_canvas.Strokes[m_canvas.Strokes.Count - 1] = stroke;
+                    }
                 }
             }
-            catch (Exception ex)
-            {
-                LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】（changepages）点阵比书写报错：" + ex.Message, ex);
-            }
         }
 
 
@@ -465,63 +358,64 @@ namespace Common.system
 
 
 
-        ////声明一个 DrawingAttributes 类型的变量  
-        //DrawingAttributes drawingAttributes;
-        //public void changepaget(double _x, double _y, bool _new,InkCanvas canvas) 
-        //{
-        //    if (_new)
-        //    {
-        //        if (stroke != null && stroke.StylusPoints.Count > 1)
-        //        {
-        //            //m_canvas.Strokes.Add(stroke);
-        //            DrawingAttributes drawingAttributes = new DrawingAttributes();
-        //            canvas.DefaultDrawingAttributes = drawingAttributes;
-        //            drawingAttributes.Width = pensize;
-        //            drawingAttributes.Height = pensize;
-        //            drawingAttributes.Color = Colors.Red;
-        //            drawingAttributes.FitToCurve = true;
-        //            drawingAttributes.IgnorePressure = false;
-        //            canvas.DefaultDrawingAttributes = drawingAttributes;
-        //            canvas.Strokes.Add(stroke);
-
-        //            ZBBPage page = strokes_page_all[pagenum];
-        //            if (page != null)
-        //            {
-        //                step.lines_curr.Add(m_canvas.Strokes);
-        //                page.lines.Add(step);
-        //                step = null;
-        //            }
-        //        }
 
-        //        stylusPoints = new StylusPointCollection();
-        //        stylusPoint = new StylusPoint();
-        //        //stroke = new Stroke(stylusPoints);
-        //        stroke = null;
-        //    }
-        //    else
-        //    {
-        //       change_pen(Colors.Red);
-        //        //stylusPoints = new StylusPointCollection();
-        //        //stylusPoint = new StylusPoint();
-        //        stylusPoint.X = _x;
-        //        stylusPoint.Y = _y;
-        //        stylusPoints.Add(stylusPoint);
-        //        stroke = new Stroke(stylusPoints);
-        //        //m_canvas.
 
-        //        //page.lines.Last().lines_curr
 
-        //    }
 
 
-        //    //page.lines.Last().lines_curr.Add();
-        //    //if (stroke.StylusPoints.Count > 20)
-        //    //{
 
 
 
 
 
+        //public void changepages(double _x, double _y, bool _new, Color _color, int _size, int i)
+        //{
+        //    try
+        //    {
+        //        if (_new)
+        //        {
+        //            if (stroke != null && stroke.StylusPoints.Count > 1)
+        //            {
+        //                drawingAttributes = new DrawingAttributes();
+        //                //m_canvas.DefaultDrawingAttributes = drawingAttributes;
+        //                drawingAttributes.Color = _color;
+        //                drawingAttributes.Width = _size * 5;
+        //                drawingAttributes.Height = _size * 5;
+        //                drawingAttributes.FitToCurve = true;
+        //                drawingAttributes.IgnorePressure = false;
+
+        //                stroke.DrawingAttributes = drawingAttributes;
+        //                //m_canvas.DefaultDrawingAttributes= drawingAttributes;
+
+        //                m_canvas.Strokes.Add(stroke);
+        //                strokes_page_all[i].lines.Last().lines_curr.Add(stroke);
+
+        //                //int currCount= strokes_page_all[i].lines.Last().lines_curr.Count;
+        //                //if (currCount > 0)
+        //                //{
+        //                //    strokes_page_all[i].lines.Last().lines_curr[currCount - 1] = stroke;
+        //                //}
+        //                stroke = null;
+        //            }
+        //            stylusPoints = new StylusPointCollection();
+        //            stylusPoint = new StylusPoint();
+        //            //stroke = new Stroke(stylusPoints);
+        //            //stroke = null;
+        //        }
+        //        else
+        //        {
+        //            //stylusPoints = new StylusPointCollection();
+        //            //stylusPoint = new StylusPoint();
+        //            stylusPoint.X = _x;
+        //            stylusPoint.Y = _y;
+        //            stylusPoints.Add(stylusPoint);
+        //            stroke = new Stroke(stylusPoints);
+        //        }
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        LogHelper.WriteErrLog("【XHMicroLessonSystemWindow】（changepages）点阵比书写报错：" + ex.Message, ex);
+        //    }
         //}
     }
 }

Common/system/HttpHelper.cs

@@ -545,5 +545,54 @@ namespace Common.system
                 httpReq = null;
             }
         }
+        /// <summary>
+        /// Post Http请求
+        /// </summary>
+        /// <param name="url"></param>
+        /// <param name="postData"></param>
+        /// <param name="timeout"></param>
+        /// <param name="contentType"></param>
+        /// <param name="encode"></param>
+        /// <returns>响应流字符串</returns>
+        public static string PostAndRespStr(string url, string postData = "", int timeout = 5000, string contentType = "application/json;", string encode = "UTF-8")
+        {
+            if (!string.IsNullOrEmpty(url) && !string.IsNullOrEmpty(encode) && !string.IsNullOrEmpty(contentType) && postData != null)
+            {
+                HttpWebResponse webResponse = null;
+                Stream responseStream = null;
+                Stream requestStream = null;
+                StreamReader streamReader = null;
+                try
+                {
+                    return GetStreamReader(url, responseStream, requestStream, streamReader, webResponse, timeout, encode, postData, contentType);
+                }
+                catch (Exception)
+                {
+                }
+                finally
+                {
+                    if (responseStream != null)
+                    {
+                        responseStream.Dispose();
+                    }
+
+                    if (webResponse != null)
+                    {
+                        webResponse.Close();
+                    }
+
+                    if (requestStream != null)
+                    {
+                        requestStream.Dispose();
+                    }
+
+                    if (streamReader != null)
+                    {
+                        streamReader.Dispose();
+                    }
+                }
+            }
+            return null;
+        }
     }
 }

Common/system/ZJClippingBorder.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace Common.system
+{
+    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.Model/Model_App.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHWK.Model
+{
+    public class Model_App
+    {
+        public int versionid { get; set; }
+
+
+        //构建版
+        public int versioncode { get; set; }
+
+
+        //版本名称
+        public string versionname { get; set; }
+
+        //大小字节
+        public int appsize { get; set; }
+
+
+        //app路径
+        public string versionpath { get; set; }
+
+        //创建人
+        public int createid { get; set; }
+
+
+        //创建时间
+        public int createtime { get; set; }
+
+        //版本描述
+        public string versioncomm { get; set; }
+    }
+}

XHWK.Model/ResultVo.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHWK.Model
+{
+    public class ResultVo<T>
+    {
+        public int code { get; set; }
+        public string msg { get; set; }
+        public T obj { get; set; }
+    }
+}

XHWK.Model/XHWK.Model.csproj

@@ -50,6 +50,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Model_App.cs" />
     <Compile Include="Model_Canvas.cs" />
     <Compile Include="Model_DrawData.cs" />
     <Compile Include="Model_Page.cs" />
@@ -59,6 +60,7 @@
     <Compile Include="Model_WKData.cs" />
     <Compile Include="NotifyModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ResultVo.cs" />
     <Compile Include="ViewModel.cs" />
   </ItemGroup>
   <ItemGroup>

XHWK.WKTool/App.cs

@@ -127,10 +127,10 @@ namespace XHWK.WKTool
         /// 打印
         /// </summary>
         public static PrintWindow W_PrintWindow = null;
-        ///// <summary>
-        ///// 提示窗口
-        ///// </summary>
-        //public static PromptWindow W_PromptWindow = null;
+        /// <summary>
+        /// 提示窗口
+        /// </summary>
+        public static PromptWindow W_PromptWindow = null;
         #endregion
         #endregion
 

XHWK.WKTool/AppUpdateWin.xaml

@@ -0,0 +1,163 @@
+<Window x:Class="XHWK.WKTool.AppUpdateWin"
+        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:Common.system;assembly=Common"
+        mc:Ignorable="d"
+        Title="AppUpdateWin"    Width="480"
+    Height="330"
+    AllowsTransparency="True"
+    Background="Transparent"
+    MouseLeftButtonDown="Window_MouseLeftButtonDown_1"
+    ShowInTaskbar="False"
+    Topmost="True"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    >
+    <Grid>
+        <Views:ZJClippingBorder
+            Margin="10"
+            Background="#fafafa"
+            CornerRadius="10">
+            <Border.Effect>
+                <DropShadowEffect
+                    BlurRadius="10"
+                    Opacity="1"
+                    ShadowDepth="0"
+                    Color="#cccccc" />
+            </Border.Effect>
+        </Views:ZJClippingBorder>
+
+        <Views:ZJClippingBorder
+            Margin="10"
+            Background="#fafafa"
+            CornerRadius="10">
+
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="64" />
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="64" />
+                </Grid.RowDefinitions>
+                <StackPanel Grid.Row="0" Orientation="Horizontal">
+                    <Image
+                        Width="63"
+                        Margin="10,0,0,0"
+                        VerticalAlignment="Center"
+                        Source="/Images/APP.png" />
+
+                    <TextBlock
+                        Grid.Row="0"
+                        Margin="0,0,0,0"
+                        VerticalAlignment="Center"
+                        FontSize="26"
+                        Foreground="#333333"
+                        Text="应用更新" />
+                </StackPanel>
+                <ScrollViewer
+                    Name="content_sv"
+                    Grid.Row="1"
+                    Margin="10,10,10,10"
+                    HorizontalScrollBarVisibility="Disabled"
+                    VerticalScrollBarVisibility="Auto">
+                    <TextBlock
+                        x:Name="appmsg_tb"
+                        Margin="10,10,10,10"
+                        FontSize="14"
+                        Foreground="#333333"
+                        LineHeight="30"
+                        Text="{Binding appModel.versioncomm}" />
+                </ScrollViewer>
+
+                <UniformGrid
+                    x:Name="button_bottom"
+                    Grid.Row="2"
+                    Columns="2"
+                    Rows="1">
+                    <Button Cursor="Hand"
+                        Grid.Row="7"
+                        Grid.ColumnSpan="2"
+                        Width="190"
+                        Height="42"
+                        Click="Button_Click"
+                        Content="取消"
+                        FontSize="20"
+                        Foreground="White">
+                        <Button.Template>
+                            <ControlTemplate TargetType="{x:Type Button}">
+                                <Border
+                                    BorderBrush="{TemplateBinding Control.BorderBrush}"
+                                    BorderThickness="0"
+                                    CornerRadius="21">
+                                    <Border.Background>#E9E9E9</Border.Background>
+                                    <ContentPresenter
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Content="{TemplateBinding ContentControl.Content}" />
+                                </Border>
+                            </ControlTemplate>
+                        </Button.Template>
+                    </Button>
+                    <Button Cursor="Hand"
+                        Grid.Row="7"
+                        Grid.ColumnSpan="2"
+                        Width="190"
+                        Height="42"
+                        Click="gengxinClick"
+                        Content="更新"
+                        FontSize="20"
+                        Foreground="White">
+                        <Button.Template>
+                            <ControlTemplate TargetType="{x:Type Button}">
+                                <Border
+                                    BorderBrush="{TemplateBinding Control.BorderBrush}"
+                                    BorderThickness="0"
+                                    CornerRadius="21">
+                                    <Border.Background>#2D8CF0</Border.Background>
+                                    <ContentPresenter
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Content="{TemplateBinding ContentControl.Content}" />
+                                </Border>
+                            </ControlTemplate>
+                        </Button.Template>
+                    </Button>
+                </UniformGrid>
+
+                <Grid
+                    x:Name="progress_sp"
+                    Grid.Row="1"
+                    Grid.RowSpan="2"
+                    Visibility="Collapsed">
+                    <StackPanel
+                        Height="Auto"
+                        VerticalAlignment="Center"
+                        Orientation="Vertical">
+                        <TextBlock
+                            x:Name="parogress_tb"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            FontSize="23"
+                            Foreground="#333333"
+                            LineHeight="30"
+                            Text="正在更新，已下载0%" />
+
+                        <Views:ZJClippingBorder
+                            Height="12"
+                            Margin="20,20,20,20"
+                            CornerRadius="6"
+                            SnapsToDevicePixels="True">
+                            <ProgressBar
+                                x:Name="mprogress"
+                                BorderThickness="0"
+                                Foreground="#2D8CF0"
+                                Maximum="100"
+                                Minimum="0" />
+                        </Views:ZJClippingBorder>
+                    </StackPanel>
+                </Grid>
+            </Grid>
+        </Views:ZJClippingBorder>
+    </Grid>
+</Window>

XHWK.WKTool/AppUpdateWin.xaml.cs

@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using XHWK.Model;
+using XHWK.WKTool.Config;
+using XHWK.WKTool.Helpers;
+using static XHWK.WKTool.Helpers.ZJDownloadUtil;
+
+namespace XHWK.WKTool
+{
+    /// <summary>
+    /// AppUpdateWin.xaml 的交互逻辑
+    /// </summary>
+    public partial class AppUpdateWin : Window, ZJDownloadCallback
+    {
+        private readonly AppUpdatePageModel pageData = new AppUpdatePageModel();
+
+        public AppUpdateWin(Model_App app)
+        {
+            InitializeComponent();
+            pageData.appModel = app;
+
+            DataContext = pageData;
+        }
+
+        private void btnDown_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private void Window_MouseLeftButtonDown_1(object sender, MouseButtonEventArgs e)
+        {
+            DragMove();
+        }
+
+        public class AppUpdatePageModel : NotifyModel
+        {
+            public Model_App appModel { get; set; }
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private void gengxinClick(object sender, RoutedEventArgs e)
+        {
+            string fileUrl = ZConfig.showImageUrl + pageData.appModel.versionpath;
+
+            string temp = System.Environment.GetEnvironmentVariable("TEMP");
+            DirectoryInfo info = new DirectoryInfo(temp);
+            if (!info.Exists)
+            {
+                info.Create();
+            }
+
+            System.Console.WriteLine("fileUrl:" + fileUrl);
+            string filename = fileUrl.Substring(fileUrl.LastIndexOf("/") + 1);
+            if (filename != null)
+            {
+                ZJDownloadUtil.downloadFileWithCallback(fileUrl, 999, Dispatcher, this);
+            }
+        }
+
+        public void downloadBegin(int position)
+        {
+            progress_sp.Visibility = Visibility.Visible;
+            content_sv.Visibility = Visibility.Collapsed;
+            button_bottom.Visibility = Visibility.Collapsed;
+        }
+
+        public void downloadProgress(int position, int progress)
+        {
+            mprogress.Value = progress;
+            parogress_tb.Text = $"正在更新，已下载{progress}%";
+        }
+
+        public void downloadEnd(int position, string filepath)
+        {
+            System.Console.WriteLine("filepath:" + filepath);
+            progress_sp.Visibility = Visibility.Collapsed;
+            content_sv.Visibility = Visibility.Visible;
+            button_bottom.Visibility = Visibility.Visible;
+            ProcessStartInfo psi = new ProcessStartInfo(filepath);
+            Process pro = new Process
+            {
+                StartInfo = psi
+            };
+            pro.Start();
+            Dispatcher.Invoke(new Action(() =>
+            {
+                System.Environment.Exit(0);
+            }));
+            Close();
+        }
+
+        public void downloadError(int position, string msg)
+        {
+            MessageBox.Show(msg);
+        }
+    }
+}

XHWK.WKTool/Config/ZConfig.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHWK.WKTool.Config
+{
+    internal class ZConfig
+    {
+        public static bool isDebug = true;
+
+        /// <summary>
+        /// 当前版本号
+        /// </summary>
+        public static int versionCode = 1;
+
+        public static string versionName = "1.0.0";
+
+        //接口地址
+        public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : "http://schoolapi.xhkjedu.com";
+
+        //图片地址
+        public static string uploadUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/" : "http://schoolfile.xhkjedu.com/";
+
+        public static string showImageUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/static/" : "http://schoolfile.xhkjedu.com/static/";
+
+        public static string secretKey = "nanhuakaizhangjianwangni";
+        public static string fileStorageAddress = "";
+
+        //认证接口地址
+        public static string certapiUrl = isDebug ? "http://certapitest.xhkjedu.com" : "http://certapi.xhkjedu.com";
+
+        /// <summary>
+        /// 数据存放目录
+        /// </summary>
+        public static string dataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Signature\\";
+
+        public static string basePath = AppDomain.CurrentDomain.BaseDirectory;
+
+        //缓存图片地址
+        public static string tempPath = basePath + "temp\\";
+
+        public static string nginxHtml = $"{basePath}nginx\\html\\";
+
+   
+        public static string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
+
+        public static string tongPingBasePath = $"{nginxHtml}tongping\\";
+    }
+}

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -7,7 +7,7 @@
         mc:Ignorable="d"
         Title="星火微课" Height="341" Width="454"   AllowsTransparency="True"
     WindowStartupLocation="CenterScreen"
-    WindowStyle="None">
+    WindowStyle="None" Loaded="Window_Loaded">
     <Viewbox>
         <Grid Height="341" Width="454" >
             <!--分4行-->

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -1,9 +1,12 @@
 using Common.system;
 
 using System;
+using System.Threading;
 using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Input;
+using XHWK.Model;
+using XHWK.WKTool.Config;
 
 namespace XHWK.WKTool
 {
@@ -138,5 +141,49 @@ namespace XHWK.WKTool
             DragMove();
         }
         #endregion
+
+        /// <summary>
+        /// 检测APP更新
+        /// </summary>
+        private void getNewApp()
+        {
+            new Thread(o =>
+            {
+                string url = ZConfig.apiUrl + "/apprecord/get_new";
+
+                string result = HttpHelper.PostAndRespStr(url, "{}");
+                Model.ResultVo<Model_App> resultObj = JsonHelper.JsonToObj<Model.ResultVo<Model_App>>(result);
+                if (result != null && resultObj.code == 0)
+                {
+                    if (resultObj.obj != null)
+                    {
+                        int versionCode = resultObj.obj.versioncode;
+                        int versionThis = ZConfig.versionCode;
+                        if (versionThis < versionCode)
+                        {
+                            Dispatcher.Invoke(new Action(() =>
+                            {
+                                appUpdateShow(resultObj.obj);
+                            }));
+                        }
+                    }
+                }
+            }).Start();
+        }
+        /// <summary>
+        /// 应用更新
+        /// </summary>
+        /// <param name="app"></param>
+        private void appUpdateShow(Model_App app)
+        {
+            AppUpdateWin win = new AppUpdateWin(app);
+            win.Topmost = true;
+            win.Owner = this;
+            win.ShowDialog();
+        }
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            getNewApp();
+        }
     }
 }

XHWK.WKTool/DAL/Interface.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using XHWK.Model;
+using XHWK.WKTool.Config;
 
 namespace XHWK.WKTool.DAL
 {
@@ -20,7 +21,7 @@ namespace XHWK.WKTool.DAL
         /// <returns></returns>
         public int Login(string loginname, string loginpwd)
         {
-            string url = APIRequestAddress + "/user/login";//地址
+            string url = ZConfig.apiUrl + "/user/login";//地址 
             Dictionary<string, object> dic = new Dictionary<string, object>
             {
                 { "loginname", loginname},

XHWK.WKTool/Helpers/ZJDownloadUtil.cs

@@ -0,0 +1,184 @@
+using System;
+using System.IO;
+using System.Net;
+using System.Threading;
+using System.Windows.Threading;
+
+namespace XHWK.WKTool.Helpers
+{
+    internal class ZJDownloadUtil
+    {
+        public static void downloadFile(string url, string savepath)
+        {
+            string path = savepath;
+            string filename = url.Substring(url.LastIndexOf("/") + 1);
+            if (!url.StartsWith("http") || filename == null || filename == "")
+            {
+                return;
+            }
+            path += filename;
+            // 设置参数
+            HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
+            //发送请求并获取相应回应数据
+            HttpWebResponse response = request.GetResponse() as HttpWebResponse;
+            //直到request.GetResponse()程序才开始向目标网页发送Post请求
+            Stream responseStream = response.GetResponseStream();
+
+            //创建本地文件写入流
+            Stream stream = new FileStream(path, FileMode.Create);
+
+            byte[] bArr = new byte[1024];
+            int size = responseStream.Read(bArr, 0, bArr.Length);
+            while (size > 0)
+            {
+                stream.Write(bArr, 0, size);
+                size = responseStream.Read(bArr, 0, bArr.Length);
+            }
+            stream.Close();
+            responseStream.Close();
+        }
+
+        /// <summary>
+        /// Http下载文件
+        /// </summary>
+        public static Thread downloadFileWithCallback(
+            string url,
+            int position,
+            string savepath,
+            Dispatcher dispatcher,
+            ZJDownloadCallback callback
+            )
+        {
+
+            string path = savepath;
+            string filename = url.Substring(url.LastIndexOf("/") + 1);
+            path += filename;
+            if (!url.StartsWith("http") || filename == null || filename == "")
+            {
+                return null;
+            }
+            Thread thread = new Thread(o =>
+            {
+                FileInfo fi = new FileInfo(path);
+                if (fi.Exists)
+                {
+                    dispatcher.Invoke(new Action(() =>
+                    {
+                        callback.downloadEnd(position, path);
+                    }));
+                }
+                else
+                {
+                    string temppath = path + ".tmp";
+                    if (File.Exists(temppath))
+                    {
+                        //File.Delete(temppath);
+                        temppath += "1";
+                        while (File.Exists(temppath))
+                        {
+                            temppath += "1";
+                            if (!File.Exists(temppath))
+                            {
+                                break;
+                            }
+                        }
+
+                    }
+
+                    dispatcher.Invoke(new Action(() =>
+                    {
+                        callback.downloadBegin(position);
+                    }));
+
+                    try
+                    {
+                        HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
+                        HttpWebResponse response = request.GetResponse() as HttpWebResponse;
+                        Stream responseStream = response.GetResponseStream();
+
+                        //创建本地文件写入流
+                        Stream stream = new FileStream(temppath, FileMode.Create);
+                        long totalSize = response.ContentLength;
+                        byte[] bArr = new byte[1024];
+                        int size = responseStream.Read(bArr, 0, bArr.Length);
+                        long readsize = 0;
+                        while (size > 0)
+                        {
+                            readsize += size;
+                            stream.Write(bArr, 0, size);
+                            size = responseStream.Read(bArr, 0, bArr.Length);
+
+                            dispatcher.Invoke(new Action(() =>
+                            {
+                                callback.downloadProgress(position, (int)(readsize * 100 / totalSize));
+                            }));
+                        }
+                        stream.Close();
+                        responseStream.Close();
+                        FileInfo fitemp = new FileInfo(temppath);
+                        fitemp.MoveTo(path);
+                        dispatcher.Invoke(new Action(() =>
+                        {
+                            callback.downloadEnd(position, path);
+                        }));
+                    }
+                    catch (Exception ex)
+                    {
+                        dispatcher.Invoke(new Action(() =>
+                        {
+                            callback.downloadError(position, ex.Message);
+                        }));
+
+                    }
+
+                }
+            });
+            thread.Start();
+            return thread;
+        }
+
+
+
+
+        public static void downloadFileWithCallback(
+            string url,
+            int position,
+            Dispatcher dispatcher,
+            ZJDownloadCallback callback
+            )
+        {
+            string path = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
+            downloadFileWithCallback(url, position, path, dispatcher, callback);
+        }
+
+        public interface ZJDownloadCallback
+        {
+            /// <summary>
+            /// 下载开始
+            /// </summary>
+            /// <param name="position"></param>
+            void downloadBegin(int position);
+
+            /// <summary>
+            /// 下载过程
+            /// </summary>
+            /// <param name="position"></param>
+            /// <param name="progress"></param>
+            void downloadProgress(int position, int progress);
+
+            /// <summary>
+            /// 下载结束
+            /// </summary>
+            /// <param name="position"></param>
+            /// <param name="filepath"></param>
+            void downloadEnd(int position, string filepath);
+            /// <summary>
+            /// 下载结束
+            /// </summary>
+            /// <param name="position"></param>
+            /// <param name="filepath"></param>
+            void downloadError(int position, string msg);
+
+        }
+    }
+}

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -8,11 +8,12 @@
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
         Title="星火微课系统" Height="1040" Width="1276" WindowStartupLocation="CenterScreen"
-    WindowStyle="None"    AllowsTransparency="True"  Background="#EFF1F8" ShowInTaskbar="True"
+    WindowStyle="None"    AllowsTransparency="True"  Background="#EFF1F8" ShowInTaskbar="True" ResizeMode="CanMinimize"
    >
     
     <Viewbox>
         <Grid x:Name="GridContent" Height="1040">
+
             <!--分3行-->
             <Grid.RowDefinitions>
                 <RowDefinition Height="110"/>
@@ -114,7 +115,6 @@
                         </StackPanel>
                     </Button>
                 </StackPanel>
-                <Button Content="Button" HorizontalAlignment="Left" Margin="573,29,0,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Click="Button_Click"/>
             </Grid>
             <!--主内容-->
             <Grid Grid.Row="1" x:Name="GridMain" Width="1276">
@@ -206,41 +206,41 @@
                 </StackPanel>
             </Grid>
             <!--设置-->
-            <Grid Grid.Row="1" x:Name="gridSetUp" Margin="20,0,20,0" Background="#FFFFFF" Visibility="Collapsed">
+            <Grid Grid.Row="1" x:Name="gridSetUp"  Background="#FFFFFF" Visibility="Collapsed" Width="1276">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="90"/>
                     <RowDefinition Height="70"/>
-                    <RowDefinition Height="70"/>
+                    <RowDefinition Height="50"/>
                     <RowDefinition Height="70"/>
                     <RowDefinition Height="70"/>
                     <RowDefinition Height="70"/>
                     <RowDefinition Height="70"/>
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
-                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,30,0,0">
-                    <TextBlock Text="   点阵笔" FontSize="16" Foreground="#2D8CF0"/>
+                <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
+                    <TextBlock Text="   点阵笔" FontSize="16" Foreground="#2D8CF0" Width="80"/>
                     <TextBlock x:Name="txbNotConnecteds"  Text="未连接" FontSize="14" Foreground="#333333" Padding="10,0,0,0"/>
                 </StackPanel>
-                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,0,0,0">
-                    <TextBlock Text="视频格式" FontSize="16" Foreground="#2D8CF0"/>
+                <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+                    <TextBlock Text="视频格式" FontSize="16" Foreground="#2D8CF0" Width="80"/>
                     <RadioButton x:Name="rbnMP4" Cursor="Hand" Content="MP4" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
                     <RadioButton x:Name="rbnFLV" Cursor="Hand" Content="FLV" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
                     <RadioButton x:Name="rbnAVI" Cursor="Hand" Content="AVI" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
                 </StackPanel>
-                <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,0,0,0">
-                    <TextBlock Text="头像位置" FontSize="16" Foreground="#2D8CF0"/>
+                <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+                    <TextBlock Text="头像位置" FontSize="16" Foreground="#2D8CF0" Width="80"/>
                     <RadioButton Cursor="Hand" x:Name="rbnRight" Content="右上" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
                     <RadioButton Cursor="Hand" x:Name="rbnRightUnder" Content="右下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
                     <RadioButton Cursor="Hand" x:Name="rbnLeft" Content="左上" FontSize="14" Foreground="#333333" Margin="20,2,0,0" />
                     <RadioButton Cursor="Hand" x:Name="rbnLeftUnder" Content="左下" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
                 </StackPanel>
-                <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,0,0,0">
-                    <TextBlock Text="视频声音" FontSize="16" Foreground="#2D8CF0"/>
+                <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0" Visibility="Collapsed">
+                    <TextBlock Text="视频声音" FontSize="16" Foreground="#2D8CF0" Width="80"/>
                     <RadioButton x:Name="rbnY" Cursor="Hand" Content="有" FontSize="14" Foreground="#333333" Margin="10,2,0,0" IsChecked="True"/>
                     <RadioButton x:Name="rbnN" Cursor="Hand" Content="无" FontSize="14" Foreground="#333333" Margin="20,2,0,0"/>
                 </StackPanel>
-                <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,0,0,0">
-                    <TextBlock x:Name="txbFilePath" Text="文件路径" FontSize="16" Foreground="#2D8CF0" Padding="2,36,10,0"/>
+                <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,0,0,0">
+                    <TextBlock x:Name="txbFilePath" Text="文件路径" FontSize="16" Width="80"  Foreground="#2D8CF0" Padding="2,26,10,0"/>
                     <!--输入框-->
                     <Border Background="#CDD6E0" Width="525" Height="43" CornerRadius="3">
                         <Label x:Name="txbStoragePath" Content="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="523" Height="42" BorderBrush="{x:Null}" BorderThickness="0"/>
@@ -263,16 +263,16 @@
                         </Button.Template>
                     </Button>
                 </StackPanel>
-                <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,30,0,0">
-                    <TextBlock Text="    版本号" FontSize="16" Foreground="#2D8CF0"/>
-                    <TextBlock Text="V0.0.0" FontSize="16" Foreground="#333333" Padding="10,0,0,0"/>
+                <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
+                    <TextBlock Text="    版本号" FontSize="16" Width="80" Foreground="#2D8CF0"/>
+                    <TextBlock x:Name="txbv" Text="V0.0.0" FontSize="16" Foreground="#333333" Padding="10,0,0,0"/>
                 </StackPanel>
-                <StackPanel Grid.Row="6" Orientation="Horizontal" HorizontalAlignment="Left" Margin="10,30,0,0">
-                    <TextBlock Text="版权所有" FontSize="16" Foreground="#2D8CF0"/>
+                <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Left" Margin="30,30,0,0">
+                    <TextBlock Text="版权所有" FontSize="16" Width="80" Foreground="#2D8CF0"/>
                     <TextBlock Text="河南星火燎原软件科技有限公司" FontSize="14" Foreground="#333333" Padding="10,0,0,0"/>
                 </StackPanel>
                 <!--第四行 开始按钮-->
-                <Button Cursor="Hand" Grid.Row="7" x:Name="btnSave" Content="保存" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="10,0,10,0" Click="BtnSave_Click">
+                <Button Cursor="Hand" Grid.Row="6" x:Name="btnSave" Content="保存" FontSize="18" Foreground="#FFFFFF" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="115" Height="45" Margin="10,0,10,0" Click="BtnSave_Click">
                     <Button.Template>
                         <ControlTemplate TargetType="{x:Type Button}">
                             <Border

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -22,6 +22,7 @@ using System.Drawing;
 using XHWK.WKTool.DAL;
 using System.Text;
 using System.Collections.Specialized;
+using XHWK.WKTool.Config;
 
 namespace XHWK.WKTool
 {
@@ -69,7 +70,7 @@ namespace XHWK.WKTool
         {
             new Aspose.Pdf.License().SetLicense(new MemoryStream(Convert.FromBase64String("PExpY2Vuc2U+CiAgPERhdGE+CiAgICA8TGljZW5zZWRUbz5TdXpob3UgQXVuYm94IFNvZnR3YXJlIENvLiwgTHRkLjwvTGljZW5zZWRUbz4KICAgIDxFbWFpbFRvPnNhbGVzQGF1bnRlYy5jb208L0VtYWlsVG8+CiAgICA8TGljZW5zZVR5cGU+RGV2ZWxvcGVyIE9FTTwvTGljZW5zZVR5cGU+CiAgICA8TGljZW5zZU5vdGU+TGltaXRlZCB0byAxIGRldmVsb3BlciwgdW5saW1pdGVkIHBoeXNpY2FsIGxvY2F0aW9uczwvTGljZW5zZU5vdGU+CiAgICA8T3JkZXJJRD4xOTA4MjYwODA3NTM8L09yZGVySUQ+CiAgICA8VXNlcklEPjEzNDk3NjAwNjwvVXNlcklEPgogICAgPE9FTT5UaGlzIGlzIGEgcmVkaXN0cmlidXRhYmxlIGxpY2Vuc2U8L09FTT4KICAgIDxQcm9kdWN0cz4KICAgICAgPFByb2R1Y3Q+QXNwb3NlLlRvdGFsIGZvciAuTkVUPC9Qcm9kdWN0PgogICAgPC9Qcm9kdWN0cz4KICAgIDxFZGl0aW9uVHlwZT5FbnRlcnByaXNlPC9FZGl0aW9uVHlwZT4KICAgIDxTZXJpYWxOdW1iZXI+M2U0NGRlMzAtZmNkMi00MTA2LWIzNWQtNDZjNmEzNzE1ZmMyPC9TZXJpYWxOdW1iZXI+CiAgICA8U3Vic2NyaXB0aW9uRXhwaXJ5PjIwMjAwODI3PC9TdWJzY3JpcHRpb25FeHBpcnk+CiAgICA8TGljZW5zZVZlcnNpb24+My4wPC9MaWNlbnNlVmVyc2lvbj4KICAgIDxMaWNlbnNlSW5zdHJ1Y3Rpb25zPmh0dHBzOi8vcHVyY2hhc2UuYXNwb3NlLmNvbS9wb2xpY2llcy91c2UtbGljZW5zZTwvTGljZW5zZUluc3RydWN0aW9ucz4KICA8L0RhdGE+CiAgPFNpZ25hdHVyZT53UGJtNUt3ZTYvRFZXWFNIY1o4d2FiVEFQQXlSR0pEOGI3L00zVkV4YWZpQnd5U2h3YWtrNGI5N2c2eGtnTjhtbUFGY3J0c0cwd1ZDcnp6MytVYk9iQjRYUndTZWxsTFdXeXNDL0haTDNpN01SMC9jZUFxaVZFOU0rWndOQkR4RnlRbE9uYTFQajhQMzhzR1grQ3ZsemJLZFZPZXk1S3A2dDN5c0dqYWtaL1E9PC9TaWduYXR1cmU+CjwvTGljZW5zZT4=")));
             InitializeComponent();
-
+            this.ResizeMode = System.Windows.ResizeMode.CanMinimize;
             btnPrint.IsEnabled = false;
 
             myblackboard = new BlackboardNew(blackboard_canvas);
@@ -82,7 +83,7 @@ namespace XHWK.WKTool
             Model_DrawData model_DrawData = new Model_DrawData();
             model_DrawData.PageNum = APP.pageData.currpage;
             APP.PageDrawList.Add(model_DrawData);
-
+            txbv.Text = "v"+ZConfig.versionName;
             txbStoragePath.Content = FileToolsCommon.GetConfigValue("VideoType");
             if (FileToolsCommon.GetConfigValue("IsSound").Equals("true"))
             {

XHWK.WKTool/XHWK.WKTool.csproj

@@ -102,6 +102,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AppUpdateWin.xaml.cs">
+      <DependentUpon>AppUpdateWin.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Controls\ArrowTool.cs" />
     <Compile Include="Controls\EllipseTool.cs" />
     <Compile Include="Controls\ImageEditBar.cs" />
@@ -128,6 +131,7 @@
     </Compile>
     <Compile Include="Helpers\ScreenHelper.cs" />
     <Compile Include="Helpers\WpfHelper.cs" />
+    <Compile Include="Helpers\ZJDownloadUtil.cs" />
     <Compile Include="JieTuWindow.xaml.cs">
       <DependentUpon>JieTuWindow.xaml</DependentUpon>
     </Compile>
@@ -160,6 +164,11 @@
       <DependentUpon>CreateAMicroLessonWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="ZConfig.cs" />
+    <Page Include="AppUpdateWin.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="CountdownWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1503,5 +1512,8 @@
     <Resource Include="Images\countdown3_2.png" />
     <Resource Include="Images\countdown3_3.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\APP.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

XHWK.WKTool/ZConfig.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace XHWK.WKTool.Config
+{
+    internal class ZConfig
+    {
+        public static bool isDebug = true;
+
+        /// <summary>
+        /// 当前版本号
+        /// </summary>
+        public static int versionCode = 1;
+
+        public static string versionName = "1.0.0";
+
+        //接口地址
+        public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : "http://schoolapi.xhkjedu.com";
+
+        //图片地址
+        public static string uploadUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/" : "http://schoolfile.xhkjedu.com/";
+
+        public static string showImageUrl = isDebug ? "http://schoolfiletest.xhkjedu.com/static/" : "http://schoolfile.xhkjedu.com/static/";
+
+        public static string secretKey = "nanhuakaizhangjianwangni";
+        public static string fileStorageAddress = "";
+
+        //认证接口地址
+        public static string certapiUrl = isDebug ? "http://certapitest.xhkjedu.com" : "http://certapi.xhkjedu.com";
+
+        /// <summary>
+        /// 数据存放目录
+        /// </summary>
+        public static string dataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Signature\\";
+
+        public static string basePath = AppDomain.CurrentDomain.BaseDirectory;
+
+        //缓存图片地址
+        public static string tempPath = basePath + "temp\\";
+
+        public static string nginxHtml = $"{basePath}nginx\\html\\";
+
+   
+        public static string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
+
+        public static string tongPingBasePath = $"{nginxHtml}tongping\\";
+    }
+}