接口添加Header

优化接口请求
优化下拉菜单界面
优化窗口界面
优化上传页面

XHWK.WKTool/AESHelper.cs

@@ -4,30 +4,25 @@ using System.Text;
 
 namespace Common
 {
-    /// <summary>
-    /// AES加密
-    /// 创建人：赵耀
-    /// 创建时间：2020年9月7日
-    /// </summary>
-    public class AESHelper
+    public class AesHelper
     {
         public static string QrcodeLoginKey = "zyyxhlywkdatakey";
 
         /// <summary>
         /// AES 加密
         /// </summary>
-        /// <param name="content">Need encrypted string</param>
+        /// <param name="data"></param>
+        /// <param name="key"></param>
         /// <returns>Encrypted 16 hex string</returns>
-        public static string AESEncrypt(string Data, string key = "")
+        public static string AesEncrypt(string data, string key = "")
         {
             if (string.IsNullOrWhiteSpace(key))
             {
                 key = QrcodeLoginKey.PadRight(16, '0');
             }
             // 256-AES key      
-            byte[] keyArray = UTF8Encoding.ASCII.GetBytes(key);
-            byte[] toEncryptArray = UTF8Encoding.ASCII.GetBytes(Data);
-
+            byte[] keyArray = Encoding.ASCII.GetBytes(key);
+            byte[] toEncryptArray = Encoding.ASCII.GetBytes(data);
             RijndaelManaged rDel = new RijndaelManaged
             {
                 Key = keyArray,
@@ -46,15 +41,16 @@ namespace Common
         /// AES 解密
         /// </summary>
         /// <param name="hexString">Encrypted 16 hex string</param>
+        /// <param name="key"></param>
         /// <returns>Decrypted string</returns>
-        public static string AESDecrypt(string hexString, string key = "")
+        public static string AesDecrypt(string hexString, string key = "")
         {
             if (string.IsNullOrWhiteSpace(key))
             {
                 key = QrcodeLoginKey.PadRight(16, '0');
             }
             // 256-AES key      
-            byte[] keyArray = UTF8Encoding.ASCII.GetBytes(key);
+            byte[] keyArray = Encoding.ASCII.GetBytes(key);
             byte[] toEncryptArray = HexStringToBytes(hexString);
 
             RijndaelManaged rDel = new RijndaelManaged
@@ -67,8 +63,7 @@ namespace Common
             ICryptoTransform cTransform = rDel.CreateDecryptor();
             byte[] resultArray = cTransform.TransformFinalBlock(toEncryptArray, 0,
                     toEncryptArray.Length);
-
-            return UTF8Encoding.ASCII.GetString(resultArray);
+            return Encoding.ASCII.GetString(resultArray);
         }
 
         /// <summary>
@@ -79,11 +74,11 @@ namespace Common
         public static string BytesToHexString(byte[] bytes)
         {
             StringBuilder returnStr = new StringBuilder();
-            if (bytes != null || bytes.Length == 0)
+            if (bytes != null)
             {
-                for (int i = 0; i < bytes.Length; i++)
+                foreach (var t in bytes)
                 {
-                    returnStr.Append(bytes[i].ToString("X2"));
+                    returnStr.Append(t.ToString("X2"));
                 }
             }
             return returnStr.ToString();

XHWK.WKTool/App.config

@@ -6,11 +6,9 @@
   <appSettings>
     <!--0正式 1测试-->
     <add key="IsDebug" value="1" />
-    <!--参数是否加密 0不加密 1加密-->
-    <add key="IsParameterEncryption" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="126" />
-    <add key="VersionName" value="3.12.0" />
+    <add key="VersionCode" value="127" />
+    <add key="VersionName" value="3.13.0" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/App.xaml.cs

@@ -17,6 +17,7 @@ namespace XHWK.WKTool
 {
     using System.Runtime.InteropServices;
     using system;
+    using XHWK.WKTool.Utils;
 
     public partial class App
     {
@@ -29,11 +30,6 @@ namespace XHWK.WKTool
         /// </summary>
         public static bool isDebug = FileToolsCommon.GetConfigValue("IsDebug") != "0";
 
-        /// <summary>
-        /// 参数是否加密
-        /// </summary>
-        public static bool IsParameterEncryption = FileToolsCommon.GetConfigValue("IsParameterEncryption") != "0";
-
         #endregion 更新需改动
 
         #region 接口地址
@@ -316,8 +312,8 @@ namespace XHWK.WKTool
         {
             Console.WriteLine(@"初始化APP");
             LogHelper.InitLog4Net();
-            bool isParameterEncryption = FileToolsCommon.GetConfigValue("IsParameterEncryption") != "0";
-            HttpHelper.isParameterEncryption = isParameterEncryption;
+            ZHttpUtil.isSt = ZConfigAppUtil.GetVaule("isSt") == "True";
+            ZHttpUtil.version = FileToolsCommon.GetConfigValue("VersionName");
             myloading = new LoadDialog();
             Killffmpeg();
             try
@@ -369,7 +365,7 @@ namespace XHWK.WKTool
                     }
                     //退出
                     //Current.Shutdown();
-                    Environment.Exit(0);
+                    Application.Current.Shutdown();
                 }
             }
             catch (Exception ex)
@@ -405,7 +401,7 @@ namespace XHWK.WKTool
                 int hWnd = FindWindow(null, process.MainWindowTitle);
                 SetForegroundWindow(hWnd);
             }
-            Environment.Exit(1); //退出新打开的程序
+            Application.Current.Shutdown(); //退出新打开的程序
         }
 
         /// <summary>
@@ -698,5 +694,14 @@ namespace XHWK.WKTool
             base.OnStartup(e);
             CheckProcess();
         }
+
+        protected override void OnExit(ExitEventArgs e)
+        {
+            // 在应用程序退出之前执行必要的操作
+            ZConfigAppUtil.SetVaule("isSt", "" + ZHttpUtil.isSt);
+            Console.WriteLine(@"应用退出");
+            base.OnExit(e);
+            Environment.Exit(0);
+        }
     }
 }

XHWK.WKTool/AppUpdateWin.xaml

@@ -91,7 +91,7 @@
                     <Button
                         Width="190"
                         Height="42"
-                        Click="gengxinClick"
+                        Click="GengxinClick"
                         Content="更新"
                         Cursor="Hand"
                         FontSize="20"
@@ -139,9 +139,10 @@
                             <ProgressBar
                                 x:Name="Mprogress"
                                 BorderThickness="0"
+                                Cursor=""
                                 Foreground="#3f6fff"
                                 Maximum="100"
-                                Minimum="0" Cursor="" />
+                                Minimum="0" />
                         </views:ZJClippingBorder>
                     </StackPanel>
                 </Grid>

XHWK.WKTool/AppUpdateWin.xaml.cs

@@ -1,13 +1,10 @@
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Management;
 using System.Windows;
 using System.Windows.Input;
-
 using XHWK.Model;
 using XHWK.WKTool.Helpers;
-
 using static XHWK.WKTool.Helpers.ZJDownloadUtil;
 
 namespace XHWK.WKTool
@@ -15,21 +12,15 @@ namespace XHWK.WKTool
     /// <summary>
     /// AppUpdateWin.xaml 的交互逻辑
     /// </summary>
-    public partial class AppUpdateWin : Window, ZJDownloadCallback
+    public partial class AppUpdateWin : ZJDownloadCallback
     {
-        private readonly AppUpdatePageModel pageData = new AppUpdatePageModel();
+        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();
+            _pageData.appModel = app;
+            DataContext = _pageData;
         }
 
         private void Window_MouseLeftButtonDown_1(object sender, MouseButtonEventArgs e)
@@ -47,21 +38,22 @@ namespace XHWK.WKTool
             Close();
         }
 
-        private void gengxinClick(object sender, RoutedEventArgs e)
+        private void GengxinClick(object sender, RoutedEventArgs e)
         {
-            string fileUrl = App.showImageUrl + pageData.appModel.versionpath;
+            string fileUrl = App.showImageUrl + _pageData.appModel.versionpath;
             string path = AppDomain.CurrentDomain.BaseDirectory + "temp\\";
             DirectoryInfo info = new DirectoryInfo(path);
             if (!info.Exists)
             {
                 info.Create();
             }
-
-            string filename = fileUrl.Substring(fileUrl.LastIndexOf("/") + 1);
-            if (filename != null)
-            {
-                ZJDownloadUtil.downloadFileWithCallback(fileUrl, 999, Dispatcher, this);
-            }
+            ZJDownloadUtil.downloadFileWithCallback
+            (
+                fileUrl,
+                999,
+                Dispatcher,
+                this
+            );
         }
 
         public void downloadBegin(int position)
@@ -96,14 +88,15 @@ namespace XHWK.WKTool
                     var result = managementClass.InvokeMethod("Create", inParameters, null);
                     if ((result != null) && ((uint)result.Properties["ReturnValue"].Value != 0))
                     {
-                        Console.WriteLine("Process ID: {0}", result.Properties["ProcessId"].Value);
+                        Console.WriteLine(@"Process ID: {0}", result.Properties["ProcessId"].Value);
                     }
                 }
             }
             catch (Exception)
             {
+                // ignored
             }
-            Environment.Exit(0);
+            Application.Current.Shutdown();
         }
 
         public void downloadError(int position, string msg)

XHWK.WKTool/CreateAMicroLessonWindow.xaml

@@ -99,7 +99,7 @@
                                         FontSize="12"
                                         Foreground="#FF666666" />
                                     <TextBox
-                                        x:Name="txbExplainName"
+                                        x:Name="TxbExplainName"
                                         Margin="5,5"
                                         BorderBrush="{x:Null}"
                                         BorderThickness="0"
@@ -123,7 +123,7 @@
                                             <ColumnDefinition Width="45" />
                                         </Grid.ColumnDefinitions>
                                         <TextBox
-                                            x:Name="txbStoragePath"
+                                            x:Name="TxbStoragePath"
                                             Grid.Column="0"
                                             Margin="5,5"
                                             BorderBrush="{x:Null}"
@@ -132,7 +132,7 @@
                                             Foreground="#FF999999"
                                             Text="D:\" />
                                         <Button
-                                            x:Name="btnBrowse"
+                                            x:Name="BtnBrowse"
                                             Grid.Column="1"
                                             Margin="0,5,0,5"
                                             Padding="4"
@@ -159,7 +159,6 @@
                                     Visibility="Hidden" />
                                 <Button
                                     x:Name="BtnStart"
-                                    Grid.Row="3"
                                     Grid.ColumnSpan="2"
                                     Width="195"
                                     Height="40"
@@ -193,7 +192,7 @@
 
                             <Grid Grid.Row="4">
                                 <Label
-                                    Name="versionLabel"
+                                    Name="VersionLabel"
                                     HorizontalAlignment="Center"
                                     Content="版本号："
                                     Foreground="#666666" />
@@ -203,7 +202,7 @@
                 </Border>
             </Grid>
             <Button
-                x:Name="btnDown"
+                x:Name="BtnDown"
                 Grid.Column="1"
                 Padding="5,0"
                 HorizontalAlignment="Right"
@@ -238,7 +237,7 @@
                 <!--<Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" VerticalAlignment="Top" Foreground="#FFFFFF" FontSize="30" Padding="10,2,10,0" HorizontalAlignment="Right"  Click="BtnDown_Click" />-->
             </Grid>
             <Grid
-                x:Name="GridTitle_Black"
+                x:Name="GridTitleBlack"
                 Grid.Row="0"
                 Margin="0,0"
                 Background="#FFE9E9E9"
@@ -250,7 +249,7 @@
                     Foreground="#FF333333"
                     Text="创建微课" />
                 <Button
-                    x:Name="btnDown_Black"
+                    x:Name="BtnDownBlack"
                     Grid.Row="0"
                     Padding="10,2,10,0"
                     HorizontalAlignment="Right"

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -12,6 +12,7 @@ using XHWK.Model;
 namespace XHWK.WKTool
 {
     using system;
+    using Application = System.Windows.Application;
 
     /// <summary>
     /// 创建微课
@@ -32,9 +33,7 @@ namespace XHWK.WKTool
         {
             InitializeComponent();
             ResizeMode = ResizeMode.NoResize;
-
-            txbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");
-
+            TxbStoragePath.Text = FileToolsCommon.GetConfigValue("VideoSavePath");
             var versionCode = FileToolsCommon.GetConfigValue("VersionCode");
             var versionName = FileToolsCommon.GetConfigValue("VersionName");
             var isDebug = FileToolsCommon.GetConfigValue("IsDebug");
@@ -47,9 +46,7 @@ namespace XHWK.WKTool
             {
                 debugStr = "正式版";
             }
-
-            versionLabel.Content = debugStr + " v" + versionName + "(" + versionCode + ")";
-
+            VersionLabel.Content = debugStr + " v" + versionName + "(" + versionCode + ")";
             LoadingCarouseImg();
         }
 
@@ -161,7 +158,7 @@ namespace XHWK.WKTool
             MessageBoxResult dr = MessageWindow.Show("确定退出系统？", "提示", MessageBoxButton.OKCancel);
             if (dr == MessageBoxResult.OK)
             {
-                Environment.Exit(0);
+                Application.Current.Shutdown();
             }
         }
 
@@ -182,7 +179,7 @@ namespace XHWK.WKTool
             {
                 if (_ofd.SelectedPath != "")
                 {
-                    txbStoragePath.Text = _ofd.SelectedPath;
+                    TxbStoragePath.Text = _ofd.SelectedPath;
                 }
             }
         }
@@ -218,21 +215,19 @@ namespace XHWK.WKTool
 
             #region 合法性判断
 
-            if (string.IsNullOrWhiteSpace(txbExplainName.Text.Trim()))
+            if (string.IsNullOrWhiteSpace(TxbExplainName.Text.Trim()))
             {
                 MessageWindow.Show("讲解名称不可为空！");
                 return;
             }
-
-            if (string.IsNullOrWhiteSpace(txbStoragePath.Text.Trim()))
+            if (string.IsNullOrWhiteSpace(TxbStoragePath.Text.Trim()))
             {
                 MessageWindow.Show("路径不可为空！");
                 return;
             }
-
             try
             {
-                FileToolsCommon.CreateDirectory(txbStoragePath.Text.Trim());
+                FileToolsCommon.CreateDirectory(TxbStoragePath.Text.Trim());
             }
             catch (Exception)
             {
@@ -243,9 +238,9 @@ namespace XHWK.WKTool
             #endregion 合法性判断
 
             LblCreate.Visibility = Visibility.Visible;
-            string wkpath = FileToolsCommon.GetLegalPath(txbStoragePath.Text) + txbExplainName.Text.Trim() + "/";
-            string storagePath = txbStoragePath.Text;
-            string wkName = txbExplainName.Text;
+            string wkpath = FileToolsCommon.GetLegalPath(TxbStoragePath.Text) + TxbExplainName.Text.Trim() + "/";
+            string storagePath = TxbStoragePath.Text;
+            string wkName = TxbExplainName.Text;
             await Task.Run(() =>
             {
                 try
@@ -322,7 +317,7 @@ namespace XHWK.WKTool
                     return;
                 }
                 string url = App.apiUrl + "/sapi/apprecord/get_new";
-                string result = HttpHelper.PostAndRespStr(url, "{}");
+                string result = ZHttpUtil.PostStr(url, "{}");
                 var resultObj = JsonHelper.JsonToObj<ResultVo<Model_App>>(result);
                 if (result != null && resultObj.code == 0)
                 {
@@ -372,7 +367,7 @@ namespace XHWK.WKTool
 
         private void Window_Closed(object sender, EventArgs e)
         {
-            Environment.Exit(0);
+            Application.Current.Shutdown();
         }
     }
 }

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -40,8 +40,13 @@ namespace XHWK.WKTool.DAL
             {
                 try
                 {
-                    JObject jo = HttpHelper.PostFunction(_fileRequestAddress + @"/chunkdb/isexist",
-                        @"application/x-www-form-urlencoded", @"md5=" + md5, "");
+                    JObject jo = ZHttpUtil.PostFunction
+                    (
+                        _fileRequestAddress + @"/chunkdb/isexist",
+                        @"application/x-www-form-urlencoded",
+                        @"md5=" + md5,
+                        ""
+                    );
                     if (jo == null)
                     {
                         message = "无法访问文件服务器，请检查网络或文件服务器地址。";
@@ -101,9 +106,13 @@ namespace XHWK.WKTool.DAL
             {
                 try
                 {
-                    JObject jo = HttpHelper.PostFunction(_fileRequestAddress + @"/chunkdb/mergechunk",
-                        @"application/x-www-form-urlencoded", @"savefolder=" + savefolder + "&identifier=" + fileCode,
-                        "");
+                    JObject jo = ZHttpUtil.PostFunction
+                    (
+                        _fileRequestAddress + @"/chunkdb/mergechunk",
+                        @"application/x-www-form-urlencoded",
+                        @"savefolder=" + savefolder + "&identifier=" + fileCode,
+                        ""
+                    );
                     if (jo == null)
                     {
                         message = "无法访问文件服务器，请检查网络或文件服务器地址。";
@@ -238,8 +247,7 @@ namespace XHWK.WKTool.DAL
                 {
                     if (string.IsNullOrWhiteSpace(videoInfo.FileMD5))
                     {
-                        videoInfo.FileMD5 =
-                            AESHelper.AESEncrypt(FileToolsCommon.ReadBigFileStr(videoInfo.VideoPath, 1024));
+                        videoInfo.FileMD5 = AesHelper.AesEncrypt(FileToolsCommon.ReadBigFileStr(videoInfo.VideoPath, 1024));
                     }
 
                     //视频长度
@@ -332,8 +340,13 @@ namespace XHWK.WKTool.DAL
                             //{
                             //    formFields.Add();
                             //}
-
-                            JObject jo = HttpHelper.UploadRequestflow(uploadUrl, byteArray, fileName, formFields);
+                            JObject jo = ZHttpUtil.UploadRequestflow
+                            (
+                                uploadUrl,
+                                byteArray,
+                                fileName,
+                                formFields
+                            );
                             //0成功，1失败
                             if (jo["code"]?.ToString() != "0")
                             {

XHWK.WKTool/DAL/XHApi.cs

@@ -12,6 +12,7 @@ using XHWK.Model;
 namespace XHWK.WKTool.DAL
 {
     using system;
+    using VisioForge.Tools.TagLib;
 
     public class XhApi
     {
@@ -37,9 +38,7 @@ namespace XHWK.WKTool.DAL
                     { "projectcode", projectcode }
                 };
                 string body = JsonHelper.ToJson(dic);
-
-                string xmlDoc = HttpHelper.HttpPost(body, url);
-
+                string xmlDoc = ZHttpUtil.PostStr(url, body);
                 if (string.IsNullOrEmpty(xmlDoc))
                 {
                     App.ServerMsg = "网络异常！";
@@ -88,8 +87,7 @@ namespace XHWK.WKTool.DAL
                 string url = App.certapiUrl + "/activation/add_history";
                 Dictionary<string, object> dic = new Dictionary<string, object> { { "sign", App.Signature } };
                 string body = JsonHelper.ToJson(dic);
-                string xmlDoc = HttpHelper.HttpPost(body, url);
-
+                string xmlDoc = ZHttpUtil.PostStr(url, body);
                 if (string.IsNullOrEmpty(xmlDoc))
                 {
                     return 1;
@@ -121,7 +119,7 @@ namespace XHWK.WKTool.DAL
 
             //1.193.37.200
             const string address = ""; //河南 郑州
-            HttpHelper.GetAddressIp(out string addressIp, out addressIp);
+            ZHttpUtil.GetAddressIp(out string addressIp, out addressIp);
             Dictionary<string, object> dic = new Dictionary<string, object>
             {
                 { "loginname", loginname },
@@ -132,7 +130,7 @@ namespace XHWK.WKTool.DAL
                 { "versionnum", FileToolsCommon.GetConfigValue("VersionName") }
             };
             string body = JsonHelper.ToJson(dic);
-            ResultVo<ModelUserInfo> result = HttpHelper.PostAndRespSignle<ResultVo<ModelUserInfo>>(url, postData: body);
+            ResultVo<ModelUserInfo> result = ZHttpUtil.PostSignle<ResultVo<ModelUserInfo>>(url, postData: body);
             if (result != null)
             {
                 App.UserInfo = new ModelUserInfo();
@@ -140,9 +138,9 @@ namespace XHWK.WKTool.DAL
                 if (result.obj != null)
                 {
                     App.UserInfo = result.obj;
-                    HttpHelper.tokenKey = result.obj.token_key;
-                    HttpHelper.tokenValue = result.obj.token_value;
-                    HttpHelper.userId = result.obj.Userid + "";
+                    ZHttpUtil.tokenKey = result.obj.token_key;
+                    ZHttpUtil.tokenValue = result.obj.token_value;
+                    ZHttpUtil.userId = result.obj.Userid + "";
                 }
                 return result.code;
             }
@@ -163,7 +161,7 @@ namespace XHWK.WKTool.DAL
         public bool DownloadAvatar(string headPortrait, string savePath)
         {
             string url = App.showImageUrl + headPortrait;
-            bool result = HttpHelper.GetDataGetHtml
+            bool result = ZHttpUtil.GetDataGetHtml
             (
                 url,
                 savePath,
@@ -185,7 +183,7 @@ namespace XHWK.WKTool.DAL
                 string url = App.apiUrl + "/sstudy/tsubjectbook/list"; //地址
                 Dictionary<string, int> dic = new Dictionary<string, int> { { "teacherid", App.UserInfo.Userid } };
                 string body = JsonHelper.ToJson(dic);
-                ResultVo<List<Model_TsubjectbookList>> result = HttpHelper.PostAndRespSignle<ResultVo<List<Model_TsubjectbookList>>>(url, postData: body);
+                ResultVo<List<Model_TsubjectbookList>> result = ZHttpUtil.PostSignle<ResultVo<List<Model_TsubjectbookList>>>(url, postData: body);
                 if (result != null)
                 {
                     App.ServerMsg = result.msg;
@@ -228,7 +226,7 @@ namespace XHWK.WKTool.DAL
                     { "createid", createid.ToString() }
                 };
                 string body = JsonHelper.ToJson(dic);
-                ResultVo<List<Model_DirectorList>> result = HttpHelper.PostAndRespSignle<ResultVo<List<Model_DirectorList>>>(url, postData: body);
+                ResultVo<List<Model_DirectorList>> result = ZHttpUtil.PostSignle<ResultVo<List<Model_DirectorList>>>(url, postData: body);
                 if (result != null)
                 {
                     App.ServerMsg = result.msg;
@@ -304,7 +302,7 @@ namespace XHWK.WKTool.DAL
                 //dic.Add("uid", model.uid);
 
                 string body = JsonHelper.ToJson(dic);
-                string xmlDoc = HttpHelper.HttpPost(body, url);
+                string xmlDoc = ZHttpUtil.PostStr(url, body);
                 JObject obj = JObject.Parse(xmlDoc);
                 App.ServerMsg = obj["msg"]?.ToString();
                 return Convert.ToInt32(obj["code"]?.ToString());
@@ -330,7 +328,7 @@ namespace XHWK.WKTool.DAL
             string url = App.certapiUrl + "/school/find_code"; //地址
             Dictionary<string, object> dic = new Dictionary<string, object> { { "schoolcode", schoolcode } };
             string body = JsonHelper.ToJson(dic);
-            ResultVo<Model_ServiceAddress> result = HttpHelper.PostAndRespSignle<ResultVo<Model_ServiceAddress>>(url, postData: body);
+            ResultVo<Model_ServiceAddress> result = ZHttpUtil.PostSignle<ResultVo<Model_ServiceAddress>>(url, postData: body);
             if (result != null)
             {
                 if (result.code == 0)

XHWK.WKTool/DeviceWindow.xaml

@@ -4,7 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:gif="http://wpfanimatedgif.codeplex.com"
-    xmlns:local="clr-namespace:XHWK.WKTool"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:view="clr-namespace:XHWK.WKTool.View"
     Title="设备检测"
@@ -18,7 +17,7 @@
 
     <Window.Resources>
         <!--  摄像头样式  -->
-        <Style x:Key="stlToggleButton" TargetType="ToggleButton">
+        <Style x:Key="StlToggleButton" TargetType="ToggleButton">
             <Setter Property="Foreground" Value="White" />
             <Setter Property="Template">
                 <Setter.Value>
@@ -58,7 +57,7 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        <Style x:Key="stlComboBox" TargetType="ComboBox">
+        <Style x:Key="StlComboBox" TargetType="ComboBox">
             <Setter Property="SnapsToDevicePixels" Value="True" />
             <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
             <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
@@ -93,10 +92,11 @@
                                 <ToggleButton
                                     ClickMode="Press"
                                     IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                    Style="{StaticResource stlToggleButton}" />
+                                    Style="{StaticResource StlToggleButton}" />
                             </Border>
                             <Popup
                                 x:Name="Popup"
+                                Grid.Column="0"
                                 AllowsTransparency="True"
                                 Focusable="False"
                                 IsOpen="{TemplateBinding IsDropDownOpen}"
@@ -143,7 +143,7 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <Grid
-            x:Name="GridTitle_Black"
+            x:Name="GridTitleBlack"
             Grid.Row="0"
             Margin="0,0"
             Background="#3f6fff"
@@ -156,7 +156,7 @@
                 Foreground="White"
                 Text="设备检测" />
             <Button
-                x:Name="btnDown_Black"
+                x:Name="BtnDownBlack"
                 Grid.Row="0"
                 Width="46"
                 HorizontalAlignment="Right"
@@ -288,7 +288,6 @@
                         Width="236"
                         Margin="16,0,0,0"
                         Padding="30,0,0,0"
-                        HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         HorizontalContentAlignment="Center"
                         VerticalContentAlignment="Center"
@@ -298,7 +297,7 @@
                         DisplayMemberPath="Name"
                         FontSize="14"
                         SelectionChanged="CmbCameraList_SelectionChanged"
-                        Style="{StaticResource stlComboBox}"
+                        Style="{StaticResource StlComboBox}"
                         Text="请选择" />
                 </StackPanel>
                 <Grid
@@ -309,7 +308,7 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top">
                     <Image
-                        x:Name="imgPlayer"
+                        x:Name="ImgPlayer"
                         RenderTransformOrigin="0.5,0.5"
                         Stretch="Fill"
                         Visibility="Visible">
@@ -324,7 +323,7 @@
                     HorizontalAlignment="Right"
                     Orientation="Horizontal">
                     <Button
-                        x:Name="btn_camera_good"
+                        x:Name="BtnCameraGood"
                         Width="100"
                         Height="30"
                         Margin="0,0,10,0"
@@ -338,7 +337,7 @@
                         Foreground="White"
                         IsDefault="True" />
                     <Button
-                        x:Name="btn_camera_bad"
+                        x:Name="BtnCameraBad"
                         Width="100"
                         Height="30"
                         Margin="0,0,10,0"
@@ -370,7 +369,6 @@
                         Orientation="Horizontal">
                         <Button
                             x:Name="BtnSpeakerDetection"
-                            Grid.Row="2"
                             Width="100"
                             Height="30"
                             Margin="0"
@@ -432,12 +430,11 @@
                 </Grid>
                 <Grid Grid.Row="2">
                     <StackPanel
-                        Grid.Row="2"
                         Margin="30,0,0,0"
                         HorizontalAlignment="Right"
                         Orientation="Horizontal">
                         <Button
-                            x:Name="btn_speaker_good"
+                            x:Name="BtnSpeakerGood"
                             Width="100"
                             Height="30"
                             Margin="0,0,10,0"
@@ -451,7 +448,7 @@
                             Foreground="White"
                             IsDefault="True" />
                         <Button
-                            x:Name="btn_speaker_bad"
+                            x:Name="BtnSpeakerBad"
                             Width="100"
                             Height="30"
                             Margin="0,0,10,0"
@@ -494,7 +491,6 @@
                         Width="236"
                         Margin="16,0,0,0"
                         Padding="30,0,0,0"
-                        HorizontalAlignment="Left"
                         VerticalAlignment="Top"
                         HorizontalContentAlignment="Center"
                         VerticalContentAlignment="Center"
@@ -505,7 +501,7 @@
                         FontSize="14"
                         SelectedValuePath="Key"
                         SelectionChanged="CmbMicrophoneList_SelectionChanged"
-                        Style="{StaticResource stlComboBox}"
+                        Style="{StaticResource StlComboBox}"
                         Text="请选择" />
 
                     <Button
@@ -535,7 +531,7 @@
                         CornerRadius="10"
                         Visibility="Visible">
                         <ProgressBar
-                            x:Name="volumeProgressBar"
+                            x:Name="VolumeProgressBar"
                             BorderThickness="0"
                             Maximum="100" />
                     </view:ZClippingBorder>
@@ -543,12 +539,11 @@
 
                 <Grid Grid.Row="2">
                     <StackPanel
-                        Grid.Row="2"
                         Margin="30,0,0,0"
                         HorizontalAlignment="Right"
                         Orientation="Horizontal">
                         <Button
-                            x:Name="btn_microphone_good"
+                            x:Name="BtnMicrophoneGood"
                             Width="100"
                             Height="30"
                             Margin="0,0,10,0"
@@ -562,7 +557,7 @@
                             Foreground="White"
                             IsDefault="True" />
                         <Button
-                            x:Name="btn_microphone_bad"
+                            x:Name="BtnMicrophoneBad"
                             Width="100"
                             Height="30"
                             Margin="0,0,10,0"
@@ -670,7 +665,6 @@
                 <Grid Grid.Row="6" Grid.Column="1">
                     <Button
                         x:Name="BtnDetection"
-                        Grid.Row="2"
                         Width="116"
                         Height="30"
                         Margin="0"

XHWK.WKTool/DeviceWindow.xaml.cs

@@ -70,7 +70,7 @@ namespace XHWK.WKTool
         /// </param>
         private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
-            imgPlayer.Visibility = Visibility.Hidden;
+            ImgPlayer.Visibility = Visibility.Hidden;
             CloseCamera();
             if (_waveIn != null)
             {
@@ -114,7 +114,7 @@ namespace XHWK.WKTool
             try
             {
                 CloseCamera();
-                imgPlayer.Visibility = Visibility.Visible;
+                ImgPlayer.Visibility = Visibility.Visible;
                 if (CmbCameraList.SelectedIndex >= 0)
                 {
                     var info = CmbCameraList.SelectedItem as FilterInfo;
@@ -164,7 +164,7 @@ namespace XHWK.WKTool
                     image.StreamSource = new MemoryStream(ms.GetBuffer());
                     ms.Close();
                     image.EndInit();
-                    imgPlayer.Source = image;
+                    ImgPlayer.Source = image;
                 }
             ); //同步显示
         }
@@ -289,7 +289,7 @@ namespace XHWK.WKTool
             {
                 _waveIn.StopRecording();
             }
-            volumeProgressBar.Value = 0;
+            VolumeProgressBar.Value = 0;
             if (CmbMicrophoneList.SelectedIndex >= 0)
             {
                 var selectIndex = CmbMicrophoneList.SelectedIndex;
@@ -319,7 +319,7 @@ namespace XHWK.WKTool
                             (
                                 () =>
                                 {
-                                    volumeProgressBar.Value = maxNumber * 100;
+                                    VolumeProgressBar.Value = maxNumber * 100;
                                 }
                             );
                         };

XHWK.WKTool/KeyVerification.xaml.cs

@@ -162,7 +162,7 @@ namespace XHWK.WKTool
         private void CloseAction()
         {
             App.myloading.Show();
-            new Thread(o => { Dispatcher.Invoke(() => { Environment.Exit(0); }); }).Start();
+            Application.Current.Shutdown();
         }
     }
 }

XHWK.WKTool/LoginWindow.xaml

@@ -3,17 +3,16 @@
     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:local="clr-namespace:XHWK.WKTool"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:view="clr-namespace:XHWK.WKTool.View"
     Title="LoginWindow"
     Width="312"
     Height="497"
-    AllowsTransparency="True"
     BorderBrush="#eeeeee"
-    BorderThickness="1"
     ShowInTaskbar="False"
+    Style="{StaticResource ZWinStyle}"
     WindowStartupLocation="CenterOwner"
-    WindowStyle="None"
+    WindowStyle="SingleBorderWindow"
     mc:Ignorable="d">
 
     <Window.Resources>
@@ -117,12 +116,12 @@
                             <TextBox
                                 x:Name="TxbAccountNumber"
                                 Margin="5,5"
+                                AcceptsReturn="False"
                                 BorderBrush="{x:Null}"
                                 BorderThickness="0"
                                 FontSize="14"
                                 Foreground="#FF999999"
                                 InputMethod.IsInputMethodEnabled="False"
-                                PreviewTextInput="TxbAccountNumberPreviewTextInput"
                                 Text="" />
                             <Label Height="1.5" Background="#3F6FFF" />
                         </StackPanel>
@@ -135,7 +134,7 @@
                                 FontSize="12"
                                 Foreground="#FF666666" />
                             <PasswordBox
-                                x:Name="pobPassword"
+                                x:Name="PobPassword"
                                 Margin="5,5"
                                 BorderBrush="{x:Null}"
                                 BorderThickness="0"
@@ -144,21 +143,7 @@
                                 PasswordChar="*" />
                             <Label Height="1.5" Background="#3F6FFF" />
                         </StackPanel>
-                        <!--<StackPanel Grid.Row="2" Orientation="Horizontal" Margin="30,0,30,1" Grid.ColumnSpan="2">
-                                <Label Content="*" FontSize="18" Padding="0,27,0,0" Foreground="#FF0000"/>
-                                <TextBlock Text="存放路径" FontSize="18" Padding="2,23,10,0"/>
-                        -->
-                        <!--  输入框  -->
-                        <!--
-                                <Border Background="#CDD6E0" Width="200" Height="43" CornerRadius="3">
-                                    <TextBox x:Name="txbStoragePath" Text="D:\" FontSize="16" Foreground="#333333" Padding="5,12,2,2" Width="198" Height="41" BorderBrush="{x:Null}" BorderThickness="0"/>
-                                </Border>
-                        -->
-                        <!--  浏览按钮  -->
-                        <!--
-                                <Button Cursor="Hand" x:Name="btnBrowse" FontSize="18" Width="80" Height="43" BorderBrush="#cccccc" BorderThickness="1" Click="BtnBrowse_Click" Content="浏览" Style="{StaticResource Button_Menu}"
-                                Background="#F7F7F7" Margin="11,0,0,0"/>
-                            </StackPanel>-->
+
                     </Grid>
                     <!--  记住密码 切换网络  -->
                     <Grid Grid.Row="3">
@@ -197,7 +182,7 @@
                             <RowDefinition Height="25*" />
                             <RowDefinition Height="5*" />
                         </Grid.RowDefinitions>
-                        <Button
+                        <view:ZRoundButton
                             x:Name="BtnStart"
                             Grid.Row="1"
                             Grid.ColumnSpan="2"
@@ -205,29 +190,14 @@
                             VerticalAlignment="Stretch"
                             HorizontalContentAlignment="Center"
                             VerticalContentAlignment="Center"
-                            Click="BtnStart_Click"
+                            Background="#3F6FFF"
+                            BorderRadius="18"
+                            Click="LoginClick"
                             Content="登录"
-                            Cursor="Hand"
                             FontSize="18"
                             Foreground="#FFFFFF"
-                            IsDefault="True">
-                            <Button.Template>
-                                <ControlTemplate TargetType="{x:Type Button}">
-                                    <Border
-                                        BorderBrush="{TemplateBinding Control.BorderBrush}"
-                                        BorderThickness="1"
-                                        CornerRadius="20">
-                                        <Border.Background>#3F6FFF</Border.Background>
-                                        <ContentPresenter
-                                            Margin="0,5"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            Content="{TemplateBinding ContentControl.Content}" />
-                                    </Border>
-                                </ControlTemplate>
-                            </Button.Template>
-                        </Button>
-                        <Button
+                            IsDefault="True" />
+                        <view:ZRoundButton
                             x:Name="BtnStop"
                             Grid.Row="3"
                             Grid.ColumnSpan="2"
@@ -237,28 +207,14 @@
                             VerticalAlignment="Stretch"
                             HorizontalContentAlignment="Center"
                             VerticalContentAlignment="Center"
+                            Background="#FFC3C3C3"
+                            BorderRadius="18"
                             Click="BtnDown_Click"
                             Content="关闭"
                             Cursor="Hand"
                             FontSize="18"
                             Foreground="#FFFFFF"
-                            IsDefault="True">
-                            <Button.Template>
-                                <ControlTemplate TargetType="{x:Type Button}">
-                                    <Border
-                                        BorderBrush="{TemplateBinding Control.BorderBrush}"
-                                        BorderThickness="1"
-                                        CornerRadius="20">
-                                        <Border.Background>#FFC3C3C3</Border.Background>
-                                        <ContentPresenter
-                                            Margin="0,5"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            Content="{TemplateBinding ContentControl.Content}" />
-                                    </Border>
-                                </ControlTemplate>
-                            </Button.Template>
-                        </Button>
+                            IsDefault="True" />
 
                         <Button
                             x:Name="BtnServiceAddress"
@@ -274,7 +230,6 @@
                                     <Grid>
                                         <Label
                                             x:Name="Word"
-                                            Grid.Column="1"
                                             HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
                                             Content="服务地址设置"
@@ -347,7 +302,6 @@
                                 FontSize="12"
                                 Foreground="#FF666666" />
                             <StackPanel
-                                Grid.Row="6"
                                 Margin="0,10,0,0"
                                 HorizontalAlignment="Left"
                                 Orientation="Horizontal">

XHWK.WKTool/LoginWindow.xaml.cs

@@ -1,6 +1,4 @@
-using Common.system;
-
-using System;
+using System;
 using System.Configuration;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -8,7 +6,6 @@ using System.Text.RegularExpressions;
 //using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Input;
-
 using XHWK.WKTool.DAL;
 
 namespace XHWK.WKTool
@@ -18,12 +15,12 @@ namespace XHWK.WKTool
     /// <summary>
     /// LoginWindow.xaml 的交互逻辑
     /// </summary>
-    public partial class LoginWindow : Window
+    public partial class LoginWindow
     {
         /// <summary>
         /// 调用接口
         /// </summary>
-        private readonly XhApi xhapi = new XhApi();
+        private readonly XhApi _xhapi = new XhApi();
 
         public LoginWindow()
         {
@@ -56,7 +53,7 @@ namespace XHWK.WKTool
         private void BtnDown_Click(object sender, RoutedEventArgs e)
         {
             TxbAccountNumber.Text = string.Empty;
-            pobPassword.Password = string.Empty;
+            PobPassword.Password = string.Empty;
             Hide();
         }
 
@@ -67,19 +64,14 @@ namespace XHWK.WKTool
         /// </param>
         /// <param name="e">
         /// </param>
-        private void BtnStart_Click(object sender, RoutedEventArgs e)
+        private void LoginClick(object sender, RoutedEventArgs e)
         {
-            #region 获取服务接口地址 --2021年7月9日赵耀
-
             if (App.ServiceAddress == null)
             {
                 MessageWindow.Show("首次使用需设置服务地址。");
                 BtnServiceAddress_Click(null, null);
                 return;
             }
-
-            #endregion 获取服务接口地址 --2021年7月9日赵耀
-
             if (string.IsNullOrEmpty(TxbAccountNumber.Text))
             {
                 MessageWindow.Show("账号未输入");
@@ -90,12 +82,12 @@ namespace XHWK.WKTool
                 MessageWindow.Show("账号长度不能高于18位");
                 return;
             }
-            if (string.IsNullOrEmpty(pobPassword.Password))
+            if (string.IsNullOrEmpty(PobPassword.Password))
             {
                 MessageWindow.Show("密码未输入");
                 return;
             }
-            if (pobPassword.Password.Length > 16)
+            if (PobPassword.Password.Length > 16)
             {
                 MessageWindow.Show("密码长度不能高于16位");
                 return;
@@ -109,12 +101,9 @@ namespace XHWK.WKTool
         /// </summary>
         private void Login()
         {
-            string accountNumber = string.Empty;
-            string password = string.Empty;
-            accountNumber = TxbAccountNumber.Text.Replace(" ", "").Trim();
-            password = pobPassword.Password.Replace(" ", "").Trim();
-
-            int code = xhapi.Login(accountNumber, password);
+            var accountNumber = TxbAccountNumber.Text.Replace(" ", "").Trim();
+            var password = PobPassword.Password.Replace(" ", "").Trim();
+            int code = _xhapi.Login(accountNumber, password);
             if (code == 0)
             {
                 FileToolsCommon.CreateDirectory(App.DataPath);
@@ -143,15 +132,15 @@ namespace XHWK.WKTool
                 //UpdateSettingString("userName", txbAccountNumber.Text);
                 App.IsLoginType = true;
                 TxbAccountNumber.Text = string.Empty;
-                pobPassword.Password = string.Empty;
+                PobPassword.Password = string.Empty;
 
                 #region 下载头像
 
-                string HeadpicPath = FileToolsCommon.GetFileAbsolutePath("/Data/" + App.UserInfo.Username + ".png");
+                string headpicPath = FileToolsCommon.GetFileAbsolutePath("/Data/" + App.UserInfo.Username + ".png");
                 if (!string.IsNullOrWhiteSpace(App.UserInfo.Headpic))
                 {
                     //FileToolsCommon.
-                    xhapi.DownloadAvatar(App.UserInfo.Headpic, HeadpicPath);
+                    _xhapi.DownloadAvatar(App.UserInfo.Headpic, headpicPath);
                 }
 
                 #endregion 下载头像
@@ -188,7 +177,7 @@ namespace XHWK.WKTool
         {
             try
             {
-                string settingString = ConfigurationManager.AppSettings[settingName].ToString();
+                string settingString = ConfigurationManager.AppSettings[settingName];
                 return settingString;
             }
             catch (Exception)
@@ -245,6 +234,7 @@ namespace XHWK.WKTool
             }
             catch (Exception)
             {
+                // ignored
             }
         }
 
@@ -294,7 +284,7 @@ namespace XHWK.WKTool
 
             if (!string.IsNullOrWhiteSpace(TbxServiceAddress.Text))
             {
-                if (xhapi.GetServiceAddress(TbxServiceAddress.Text, out string Message))
+                if (_xhapi.GetServiceAddress(TbxServiceAddress.Text, out string message))
                 {
                     App.SaveServiceAddressData();
                     App.SwitchAddress();
@@ -303,8 +293,7 @@ namespace XHWK.WKTool
                 }
                 else
                 {
-                    MessageWindow.Show(Message);
-                    return;
+                    MessageWindow.Show(message);
                 }
             }
 

XHWK.WKTool/MainWindow.xaml

@@ -4,6 +4,7 @@
     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:view="clr-namespace:XHWK.WKTool.View"
     Title="星火微课系统"
     Width="950"
     Height="700"
@@ -293,8 +294,7 @@
                                     </Grid>
                                     <ControlTemplate.Triggers>
                                         <Trigger Property="IsMouseOver" Value="True">
-                                            <Setter TargetName="ImgSetUp" Property="Source"
-                                                    Value="/SkinImages/TechnologyBlue/HM_Close_MI.png" />
+                                            <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/TechnologyBlue/HM_Close_MI.png" />
                                             <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF" />
                                         </Trigger>
                                     </ControlTemplate.Triggers>
@@ -333,7 +333,7 @@
                         <!--  头像  -->
                         <Grid Grid.Row="0">
                             <!--  登录状态  -->
-                            <Button
+                            <view:ZRoundButton
                                 x:Name="BtnLoginType"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Center"
@@ -367,7 +367,7 @@
                                         Style="{DynamicResource LoginTypeColor}"
                                         Text="未登录" />
                                 </StackPanel>
-                            </Button>
+                            </view:ZRoundButton>
                         </Grid>
                         <!--  录屏  -->
                         <Grid Grid.Row="1">
@@ -496,20 +496,15 @@
                                         </Grid>
                                         <ControlTemplate.Triggers>
                                             <Trigger Property="IsMouseOver" Value="True">
-                                                <Setter TargetName="ImgScreenRecording" Property="Source"
-                                                        Value="/SkinImages/White/Toolbar_LP_MI.png" />
+                                                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_MI.png" />
                                             </Trigger>
                                             <Trigger Property="IsPressed" Value="True">
-                                                <Setter TargetName="ImgScreenRecording" Property="Source"
-                                                        Value="/SkinImages/White/Toolbar_LP_CL.png" />
-                                                <Setter TargetName="WordScreenRecording" Property="Foreground"
-                                                        Value="#FFFFFFFF" />
+                                                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_CL.png" />
+                                                <Setter TargetName="WordScreenRecording" Property="Foreground" Value="#FFFFFFFF" />
                                             </Trigger>
                                             <Trigger Property="IsEnabled" Value="False">
-                                                <Setter TargetName="ImgScreenRecording" Property="Source"
-                                                        Value="/SkinImages/White/Toolbar_LP_N.png" />
-                                                <Setter TargetName="WordScreenRecording" Property="Foreground"
-                                                        Value="#FFC3C3C3" />
+                                                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_N.png" />
+                                                <Setter TargetName="WordScreenRecording" Property="Foreground" Value="#FFC3C3C3" />
                                             </Trigger>
                                         </ControlTemplate.Triggers>
                                     </ControlTemplate>
@@ -1040,13 +1035,11 @@
                                                 <Button.Template>
                                                     <ControlTemplate TargetType="{x:Type Button}">
                                                         <StackPanel>
-                                                            <Image x:Name="ImgRecord"
-                                                                   Source="/SkinImages/Skin/Skin_White.png" />
+                                                            <Image x:Name="ImgRecord" Source="/SkinImages/Skin/Skin_White.png" />
                                                         </StackPanel>
                                                         <ControlTemplate.Triggers>
                                                             <Trigger Property="IsMouseOver" Value="True">
-                                                                <Setter TargetName="ImgRecord" Property="Source"
-                                                                        Value="/SkinImages/Skin/Skin_White_MI.png" />
+                                                                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/Skin/Skin_White_MI.png" />
                                                             </Trigger>
                                                         </ControlTemplate.Triggers>
                                                     </ControlTemplate>
@@ -1072,13 +1065,11 @@
                                                 <Button.Template>
                                                     <ControlTemplate TargetType="{x:Type Button}">
                                                         <StackPanel>
-                                                            <Image x:Name="ImgRecord"
-                                                                   Source="/SkinImages/Skin/Skin_TechnologyBlue.png" />
+                                                            <Image x:Name="ImgRecord" Source="/SkinImages/Skin/Skin_TechnologyBlue.png" />
                                                         </StackPanel>
                                                         <ControlTemplate.Triggers>
                                                             <Trigger Property="IsMouseOver" Value="True">
-                                                                <Setter TargetName="ImgRecord" Property="Source"
-                                                                        Value="/SkinImages/Skin/Skin_TechnologyBlue_MI.png" />
+                                                                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/Skin/Skin_TechnologyBlue_MI.png" />
                                                             </Trigger>
                                                         </ControlTemplate.Triggers>
                                                     </ControlTemplate>

XHWK.WKTool/MainWindow.xaml.cs

@@ -744,7 +744,7 @@ namespace XHWK.WKTool
                         App.SaveWkData();
                         App.SaveDraw();
                         _tmc.TmatrixUninitialize();
-                        Environment.Exit(0);
+                        Application.Current.Shutdown();
                     }
                 }
                 catch (Exception ex)
@@ -753,7 +753,7 @@ namespace XHWK.WKTool
                     Close();
                     Application.Current.Shutdown();
                     _tmc.TmatrixUninitialize();
-                    Environment.Exit(0);
+                    Application.Current.Shutdown();
                 }
             }
             else
@@ -4102,7 +4102,7 @@ namespace XHWK.WKTool
 
         private void Window_Closed(object sender, EventArgs e)
         {
-            Environment.Exit(0);
+            Application.Current.Shutdown();
         }
     }
 }

XHWK.WKTool/ProductVerification.xaml.cs

@@ -142,10 +142,13 @@ namespace XHWK.WKTool
         /// </summary>
         private void CloseAction()
         {
-            Dispatcher.Invoke(new Action(() =>
-            {
-                System.Environment.Exit(0);
-            }));
+            Dispatcher.Invoke
+            (
+                () =>
+                {
+                    Application.Current.Shutdown();
+                }
+            );
         }
 
         ~ProductVerification()

XHWK.WKTool/Resources/OverwrideDefaultControlStyles.xaml

@@ -1,13 +1,18 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:view="clr-namespace:XHWK.WKTool.View">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Resources/StyleScrolllview.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Resources/StyleButton.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Resources/StyleComboBox.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Resources/StyleZRoundButton.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <Style BasedOn="{StaticResource for_scrollbar}" TargetType="ScrollBar" />
-    <Style BasedOn="{StaticResource for_scrollviewer}" TargetType="ScrollViewer" />
-
+    <Style BasedOn="{StaticResource ForScrollbar}" TargetType="ScrollBar" />
+    <Style BasedOn="{StaticResource ForScrollviewer}" TargetType="ScrollViewer" />
+    <Style BasedOn="{StaticResource ZRoundButtonStyle}" TargetType="view:ZRoundButton" />
     <Style BasedOn="{StaticResource MyButton}" TargetType="Button" />
 
     <Style x:Key="ZWinStyle" TargetType="Window">
@@ -33,4 +38,5 @@
             </Trigger>
         </Style.Triggers>
     </Style>
-</ResourceDictionary>
+
+</ResourceDictionary>

XHWK.WKTool/Resources/StyleComboBox.xaml

@@ -0,0 +1,133 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  ComBoBox项鼠标经过背景色  -->
+    <SolidColorBrush x:Key="ComboBoxMouseOverBackground" Color="#f0f0f0" />
+    <!--  Combox右侧下拉按钮  -->
+    <Style x:Key="ComboxStyleBtn" TargetType="ToggleButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <!--  下拉按钮内部背景色  -->
+                    <Border
+                        x:Name="Back"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        BorderThickness="1">
+                        <!--  下拉按钮内边框  -->
+                        <Label
+                            Name="PathFill"
+                            Height="30"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Content="ˇ"
+                            FontSize="30" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Back" Property="Background" Value="Transparent" />
+                            <Setter TargetName="Back" Property="BorderBrush" Value="Transparent" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <!--  Combox  -->
+    <Style x:Key="ComboBoxStyle" TargetType="ComboBox">
+        <Setter Property="ItemContainerStyle">
+            <Setter.Value>
+                <!--  ComBoxItem  -->
+                <Style TargetType="{x:Type ComboBoxItem}">
+                    <Setter Property="MinHeight" Value="32" />
+                    <Setter Property="MinWidth" Value="60" />
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="{x:Type ComboBoxItem}">
+                                <Border
+                                    Name="_back"
+                                    Background="Transparent"
+                                    BorderBrush="#f3f3f3"
+                                    BorderThickness="0,0,0,0">
+                                    <ContentPresenter Margin="10,0,10,0" VerticalAlignment="Center" />
+                                </Border>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter TargetName="_back" Property="Background" Value="{StaticResource ComboBoxMouseOverBackground}" />
+                                    </Trigger>
+                                    <!--  下拉框背景色  -->
+                                    <Trigger Property="IsHighlighted" Value="True">
+                                        <Setter TargetName="_back" Property="Background" Value="{StaticResource ComboBoxMouseOverBackground}" />
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ComboBox">
+                    <Grid>
+                        <!--  文字区域背景和边线样式  -->
+                        <TextBox
+                            Grid.Column="0"
+                            Padding="10,0,0,0"
+                            VerticalAlignment="Center"
+                            Background="Transparent"
+                            BorderBrush="#c0c0c0"
+                            BorderThickness="0"
+                            Foreground="Black"
+                            IsReadOnly="{TemplateBinding IsReadOnly}"
+                            Text="{TemplateBinding Text}" />
+                        <Border
+                            Grid.Column="0"
+                            BorderBrush="#c0c0c0"
+                            BorderThickness="0.6"
+                            CornerRadius="1,0,0,1" />
+                        <!--  右侧下拉button设置  -->
+                        <Border BorderThickness="0">
+                            <ToggleButton
+                                BorderBrush="Black"
+                                BorderThickness="3"
+                                ClickMode="Press"
+                                IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                Style="{StaticResource ComboxStyleBtn}" />
+                        </Border>
+                        <!--  弹出popup整体设置  -->
+                        <Popup
+                            x:Name="Popup"
+                            AllowsTransparency="True"
+                            Focusable="False"
+                            IsOpen="{TemplateBinding IsDropDownOpen}"
+                            Placement="Bottom"
+                            PopupAnimation="Slide">
+                            <Grid
+                                x:Name="DropDown"
+                                Width="{TemplateBinding ActualWidth}"
+                                MaxHeight="200"
+                                SnapsToDevicePixels="True">
+                                <Border
+                                    x:Name="DropDownBorder"
+                                    BorderBrush="#e8e8e8"
+                                    BorderThickness="1,0,1,1" />
+                                <ScrollViewer
+                                    Margin="1"
+                                    CanContentScroll="True"
+                                    HorizontalScrollBarVisibility="Disabled"
+                                    SnapsToDevicePixels="True"
+                                    VerticalScrollBarVisibility="Auto">
+                                    <!--  StackPanel 用于显示子级，方法是将 IsItemsHost 设置为 True  -->
+                                    <StackPanel
+                                        Background="White"
+                                        IsItemsHost="True"
+                                        KeyboardNavigation.DirectionalNavigation="Contained" />
+                                </ScrollViewer>
+                            </Grid>
+                        </Popup>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>

XHWK.WKTool/Resources/StyleScrolllview.xaml

@@ -67,7 +67,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-    <Style x:Key="for_scrollbar" TargetType="{x:Type ScrollBar}">
+    <Style x:Key="ForScrollbar" TargetType="{x:Type ScrollBar}">
         <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="false" />
         <Setter Property="Background" Value="Transparent" />
@@ -141,7 +141,7 @@
             </Trigger>
         </Style.Triggers>
     </Style>
-    <Style x:Key="for_scrollviewer" TargetType="{x:Type ScrollViewer}">
+    <Style x:Key="ForScrollviewer" TargetType="{x:Type ScrollViewer}">
         <Setter Property="BorderBrush" Value="LightGray" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Template">
@@ -163,7 +163,7 @@
                                 HorizontalAlignment="Right"
                                 Maximum="{TemplateBinding ScrollableHeight}"
                                 Orientation="Vertical"
-                                Style="{StaticResource for_scrollbar}"
+                                Style="{StaticResource ForScrollbar}"
                                 ViewportSize="{TemplateBinding ViewportHeight}"
                                 Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
                                 Value="{TemplateBinding VerticalOffset}" />
@@ -172,7 +172,7 @@
                                 VerticalAlignment="Bottom"
                                 Maximum="{TemplateBinding ScrollableWidth}"
                                 Orientation="Horizontal"
-                                Style="{StaticResource for_scrollbar}"
+                                Style="{StaticResource ForScrollbar}"
                                 ViewportSize="{TemplateBinding ViewportWidth}"
                                 Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
                                 Value="{TemplateBinding HorizontalOffset}" />
@@ -256,4 +256,4 @@
             </Setter.Value>
         </Setter>
     </Style>
-</ResourceDictionary>
+</ResourceDictionary>

XHWK.WKTool/Resources/StyleZRoundButton.xaml

@@ -0,0 +1,40 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:view="clr-namespace:XHWK.WKTool.View">
+    <Style x:Key="ZRoundButtonStyle" TargetType="{x:Type view:ZRoundButton}">
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid Background="Transparent">
+                        <Border
+                            Name="border"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{Binding Path=BorderRadius, RelativeSource={RelativeSource TemplatedParent}}"
+                            IsHitTestVisible="True">
+                            <ContentPresenter
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Opacity" Value="0.8" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>

XHWK.WKTool/UControl/Uc_VideoItem.xaml

@@ -3,7 +3,6 @@
     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:local="clr-namespace:XHWK.WKTool.UControl"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Width="250"
     Height="260"
@@ -30,8 +29,7 @@
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
                             Click="BtnVideoPlay_Click"
-                            Cursor="Hand"
-                            >
+                            Cursor="Hand">
                             <Image
                                 x:Name="ImgVideo"
                                 Cursor="Hand"
@@ -54,13 +52,12 @@
                             Grid.Column="2"
                             Visibility="Hidden">
                             <Button
-                                x:Name="btnSetUp"
+                                x:Name="BtnSetUp"
                                 Margin="0,0,4,0"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
                                 Click="Button_Click"
-                                Cursor="Hand"
-                                >
+                                Cursor="Hand">
                                 <Image
                                     x:Name="ImgSetUp"
                                     Source="/Images/Clip_Clip.png"
@@ -126,7 +123,7 @@
                         </Grid>
                         <Grid Grid.Column="2">
                             <Button
-                                x:Name="BtnNameModifyOK"
+                                x:Name="BtnNameModifyOk"
                                 Background="White"
                                 BorderBrush="#FFABADB3"
                                 Click="BtnNameModifyOK_Click"
@@ -145,7 +142,7 @@
                 <!--  信息  -->
                 <Grid Grid.Row="3">
                     <Label
-                        x:Name="lblDateSize"
+                        x:Name="LblDateSize"
                         HorizontalContentAlignment="Center"
                         Content="2020-10-10 10:10:00|1000.00MB"
                         FontSize="12"

XHWK.WKTool/UControl/Uc_VideoItem.xaml.cs

@@ -72,7 +72,7 @@ namespace XHWK.WKTool.UControl
             string videoName = FileToolsCommon.GetIoFileNameNoExtension(VideoModel.VideoPath);
             TbName.Text = videoName.Length > 11 ? videoName.Substring(0, 11) + "..." : videoName;
             TbName.ToolTip = videoName;
-            lblDateSize.Content = VideoModel.RSTime + " " + VideoModel.VideoSize;
+            LblDateSize.Content = VideoModel.RSTime + " " + VideoModel.VideoSize;
             if (VideoModel.IsUpload)
             {
                 BtnUpload.Visibility = Visibility.Hidden;

XHWK.WKTool/UploadWindow.xaml

@@ -2,23 +2,20 @@
     x:Class="XHWK.WKTool.UploadWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Views="clr-namespace:XHWK.WKTool.Helpers"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:XHWK.WKTool"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:views="clr-namespace:XHWK.WKTool.Helpers"
     Title="UploadWindow"
     Width="457"
     Height="346"
     Margin="0"
-    AllowsTransparency="True"
-    BorderBrush="#eeeeee"
-    BorderThickness="1"
     Loaded="Window_Loaded"
+    Style="{StaticResource ZWinStyle}"
     WindowStartupLocation="CenterScreen"
-    WindowStyle="None"
+    WindowStyle="SingleBorderWindow"
     mc:Ignorable="d">
 
-    <Grid>
+    <Grid Background="White">
         <!--  分4行  -->
         <Grid.RowDefinitions>
             <RowDefinition Height="45" />
@@ -49,8 +46,7 @@
                 Content="×"
                 Cursor="Hand"
                 FontSize="25"
-                Foreground="#FFFFFF"
-                 />
+                Foreground="#FFFFFF" />
         </Grid>
         <Grid
             x:Name="GridTitle_Black"
@@ -73,8 +69,7 @@
                 Content="×"
                 Cursor="Hand"
                 FontSize="25"
-                Foreground="#FF333333"
-                 />
+                Foreground="#FF333333" />
         </Grid>
         <!--  第三行 教材  -->
         <ComboBox
@@ -93,7 +88,8 @@
             Foreground="Black"
             ItemsSource="{Binding bookList}"
             SelectedValuePath="Key"
-            SelectionChanged="ToolbarListSelectionChanged">
+            SelectionChanged="ToolbarListSelectionChanged"
+            Style="{StaticResource ComboBoxStyle}">
             <ComboBox.Resources>
                 <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="White" />
                 <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Gray" />
@@ -113,7 +109,8 @@
             FontSize="16"
             Foreground="Black"
             ItemsSource="{Binding zhangjieList}"
-            SelectedValuePath="Key">
+            SelectedValuePath="Key"
+            Style="{StaticResource ComboBoxStyle}">
             <ComboBox.Resources>
                 <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="White" />
                 <!--<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Green" />-->
@@ -131,8 +128,7 @@
             Cursor="Hand"
             FontSize="18"
             Foreground="#FFFFFF"
-            IsDefault="True"
-            >
+            IsDefault="True">
             <Button.Template>
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Border
@@ -148,22 +144,21 @@
                 </ControlTemplate>
             </Button.Template>
         </Button>
-        <Views:ZJClippingBorder
+        <views:ZJClippingBorder
             x:Name="tip_outer"
             Grid.Row="0"
             Grid.RowSpan="2"
             Margin="0"
-            Background="#FFE6EAF0"
-            CornerRadius="4"
+            Background="#f3f3f3"
             Visibility="Collapsed">
             <Grid>
                 <Label
                     Height="35"
-                    Margin="0,7,0,0"
+                    Margin="0,6,0,0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Top"
                     Content="上传中..."
-                    FontSize="20" />
+                    FontSize="16" />
                 <ProgressBar
                     x:Name="pgbProcess"
                     Grid.Row="0"
@@ -184,6 +179,6 @@
                     Foreground="White"
                     Visibility="Visible" />
             </Grid>
-        </Views:ZJClippingBorder>
+        </views:ZJClippingBorder>
     </Grid>
 </Window>

XHWK.WKTool/UploadWindow.xaml.cs

@@ -232,6 +232,10 @@ namespace XHWK.WKTool
 
         private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                DragMove();
+            }
         }
 
         /// <summary>
@@ -393,13 +397,13 @@ namespace XHWK.WKTool
                                 _times.Stop();
                                 pgbProcess.Value = 100;
                                 lbProcess.Content = "100%";
-                                MessageWindow.Show("视频上传成功！");
+                                Hide();
                                 tip_outer.Visibility = Visibility.Collapsed;
+                                MessageWindow.Show("视频上传成功！");
                                 if (ChangeTextEvents != null)
                                 {
                                     ChangeTextEvents("上传成功", _i);
                                 }
-                                Hide();
                             }
                         );
                     }
@@ -466,10 +470,11 @@ namespace XHWK.WKTool
             Dispatcher.Invoke(() =>
             {
                 pgbProcess.Value = _num;
-                lbProcess.Content = _num.ToString() + "%";
+                lbProcess.Content = _num + "%";
                 if (_num < 99)
                 {
                     _num++;
+                    // ReSharper disable once PossibleLossOfFraction
                     _times.Interval += _num / 2;
                 }
                 else

XHWK.WKTool/Utils/ZConfigAppUtil.cs

@@ -0,0 +1,81 @@
+namespace XHWK.WKTool.Utils
+{
+    using System;
+    using System.Configuration;
+
+    public static class ZConfigAppUtil
+    {
+        ///<summary>
+        ///返回app.config文件中appSettings配置节的value项
+        ///</summary>
+        ///<param name="strKey"></param>
+        ///<returns></returns>
+        public static string GetVaule(string strKey)
+        {
+            return GetVaule(strKey, "app.config");
+        }
+
+        public static string GetVaule(string strKey, string filepath)
+        {
+            ExeConfigurationFileMap file = new ExeConfigurationFileMap { ExeConfigFilename = filepath };
+            Configuration config = ConfigurationManager.OpenMappedExeConfiguration(file, ConfigurationUserLevel.None);
+            foreach (string key in config.AppSettings.Settings.AllKeys)
+            {
+                if (key == strKey)
+                {
+                    return config.AppSettings.Settings[strKey].Value;
+                }
+            }
+            return null;
+        }
+
+        ///<summary>
+        ///在app.config文件中appSettings配置节增加一对键值对
+        ///</summary>
+        ///<param name="newKey"></param>
+        ///<param name="newValue"></param>
+        public static void SetVaule(string newKey, string newValue)
+        {
+            SetVaule
+            (
+                newKey,
+                newValue,
+                "app.config"
+            );
+        }
+
+        public static void SetVaule
+        (
+            string newKey,
+            string newValue,
+            string filepath
+        )
+        {
+            ExeConfigurationFileMap file = new ExeConfigurationFileMap { ExeConfigFilename = filepath };
+            Configuration config = ConfigurationManager.OpenMappedExeConfiguration(file, ConfigurationUserLevel.None);
+            bool exist = false;
+            foreach (string key in config.AppSettings.Settings.AllKeys)
+            {
+                if (key == newKey)
+                {
+                    exist = true;
+                }
+            }
+            if (exist)
+            {
+                config.AppSettings.Settings.Remove(newKey);
+            }
+            config.AppSettings.Settings.Add(newKey, newValue);
+            config.Save(ConfigurationSaveMode.Modified);
+            ConfigurationManager.RefreshSection("appSettings");
+        }
+
+        public static void Test()
+        {
+            SetVaule("ServerIp", "127.0.0.1");
+            SetVaule("ServerPort", "10088");
+            Console.WriteLine("ServerIp：" + GetVaule("ServerIp"));
+            Console.WriteLine("ServerXXX：" + (GetVaule("ServerXXX") == null));
+        }
+    }
+}

XHWK.WKTool/View/ZRoundButton.cs

@@ -0,0 +1,26 @@
+namespace XHWK.WKTool.View
+{
+    using System.Windows;
+    using System.Windows.Controls;
+
+    public class ZRoundButton : Button
+    {
+        #region 属性
+
+        public int BorderRadius
+        {
+            get { return (int)GetValue(BorderRadiusProperty); }
+            set { SetValue(BorderRadiusProperty, value); }
+        }
+
+        public static readonly DependencyProperty BorderRadiusProperty = DependencyProperty.Register
+        (
+            "BorderRadius",
+            typeof(int),
+            typeof(ZRoundButton),
+            new FrameworkPropertyMetadata()
+        );
+
+        #endregion 属性
+    }
+}

XHWK.WKTool/XHWK.WKTool.csproj

@@ -299,7 +299,7 @@
     <Compile Include="system\FFMpeg.cs" />
     <Compile Include="system\FileToolsCommon.cs" />
     <Compile Include="system\FreeMemoryHelper.cs" />
-    <Compile Include="system\HttpHelper.cs" />
+    <Compile Include="system\ZHttpUtil.cs" />
     <Compile Include="system\ImageHelper.cs" />
     <Compile Include="system\JsonHelper.cs" />
     <Compile Include="system\KeyboardHookCommon.cs" />
@@ -327,6 +327,7 @@
     <Compile Include="Utils\pen\luobo\LuoBoPenUtil.cs" />
     <Compile Include="Utils\pen\PenEventI.cs" />
     <Compile Include="Utils\ZAsposeUtil.cs" />
+    <Compile Include="Utils\ZConfigAppUtil.cs" />
     <Compile Include="Utils\ZVideoRecordHelper.cs" />
     <Compile Include="Utils\ZAudioRecordHelper.cs" />
     <Compile Include="Utils\ZPrintUtils.cs" />
@@ -334,6 +335,7 @@
       <DependentUpon>VideoClipWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\ZClippingBorder.cs" />
+    <Compile Include="View\ZRoundButton.cs" />
     <Compile Include="Welcome.xaml.cs">
       <DependentUpon>Welcome.xaml</DependentUpon>
     </Compile>
@@ -408,10 +410,18 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Resources\StyleComboBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Resources\StyleScrolllview.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Resources\StyleZRoundButton.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Skin\SkinDictionary_TechnologyBlue.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

XHWK.WKTool/system/DownloadManager.cs

@@ -102,9 +102,14 @@ namespace Common.system
                     try
                     {
                         //第一次请求获取一小块数据，根据返回的情况判断是否支持断点续传
-                        using (System.Net.WebResponse rsp = HttpHelper.Download(dlInfo.downloadUrlList[0], 0, 0, dlInfo.method))
+                        using (System.Net.WebResponse rsp = ZHttpUtil.Download
+                               (
+                                   dlInfo.downloadUrlList[0],
+                                   0,
+                                   0,
+                                   dlInfo.method
+                               ))
                         {
-
                             //获取文件名，如果包含附件名称则取下附件，否则从url获取名称
                             string Disposition = rsp.Headers["Content-Disposition"];
                             try
@@ -118,7 +123,7 @@ namespace Common.system
                                     dlInfo.fileName = Path.GetFileName(rsp.ResponseUri.AbsolutePath);
                                 }
                             }
-                            catch (Exception)//无法获取文件名时  使用传入保存名称
+                            catch (Exception) //无法获取文件名时  使用传入保存名称
                             {
                                 dlInfo.fileName = dlInfo.saveFileName;
                             }
@@ -140,7 +145,6 @@ namespace Common.system
                                 ///创建线程信息
                                 ///
                                 GetTaskInfo(dlInfo);
-
                             }
                             else
                             {

XHWK.WKTool/system/DownloadService.cs

@@ -109,10 +109,15 @@ namespace Common.system
                     {
                         to = fromIndex + size;
                     }
-
                     try
                     {
-                        using (rsp = HttpHelper.Download(downloadUrl, fromIndex, to, method))
+                        using (rsp = ZHttpUtil.Download
+                               (
+                                   downloadUrl,
+                                   fromIndex,
+                                   to,
+                                   method
+                               ))
                         {
                             Save(filePath, rsp.GetResponseStream());
                         }

XHWK.WKTool/system/HttpHelper.cs

@@ -1,705 +0,0 @@
-using Newtonsoft.Json.Linq;
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
-using System.Net;
-using System.Net.Security;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading;
-
-namespace Common.system
-{
-    /// <summary>
-    /// HttpHelper
-    /// 创建人：赵耀
-    /// </summary>
-    public class HttpHelper
-    {
-        public static string tokenKey = "";
-        public static string tokenValue = "";
-        public static string userId = "";
-        public static bool isParameterEncryption = false;
-
-        public static void InitRequest(ref System.Net.HttpWebRequest request)
-        {
-            request.Accept = "text/json,*/*;q=0.5";
-            request.Headers.Add("Accept-Charset", "utf-8;q=0.7,*;q=0.7");
-            request.Headers.Add("Accept-Encoding", "gzip, deflate, x-gzip, identity; q=0.9");
-            request.AutomaticDecompression = System.Net.DecompressionMethods.GZip;
-            request.Timeout = 8000;
-        }
-
-        private static bool CheckValidationResult(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors errors)
-        {
-            return true; //总是接受
-        }
-
-        public static System.Net.HttpWebRequest GetHttpWebRequest(string url)
-        {
-            HttpWebRequest request;
-            if (url.StartsWith("https", StringComparison.OrdinalIgnoreCase))
-            {
-                ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(CheckValidationResult);
-                request = WebRequest.Create(url) as HttpWebRequest;
-                request.ProtocolVersion = HttpVersion.Version10;
-            }
-            else
-            {
-                request = WebRequest.Create(url) as HttpWebRequest;
-            }
-            return request;
-        }
-
-        public static WebResponse Download(string downloadUrl, long from, long to, string method)
-        {
-            for (int i = 0; i < 10; i++)
-            {
-                try
-                {
-                    HttpWebRequest request = HttpHelper.GetHttpWebRequest(downloadUrl);
-                    HttpHelper.InitRequest(ref request);
-                    request.Accept = "text/json,*/*;q=0.5";
-                    request.AddRange(from, to);
-                    request.Headers.Add("Accept-Charset", "utf-8;q=0.7,*;q=0.7");
-                    request.Headers.Add("Accept-Encoding", "gzip, deflate, x-gzip, identity; q=0.9");
-                    request.AutomaticDecompression = System.Net.DecompressionMethods.GZip;
-                    request.Timeout = 120000;
-                    request.Method = method;
-                    request.KeepAlive = false;
-                    request.ContentType = "application/json; charset=utf-8";
-                    return request.GetResponse();
-                }
-                catch (Exception)
-                {
-                    Thread.Sleep(100);
-                }
-            }
-            throw new Exception("已断开网络！请检查网络连接后重试下载！");
-        }
-
-        public static string Get(string url, IDictionary<string, string> param)
-        {
-            List<string> paramBuilder = new List<string>();
-            foreach (KeyValuePair<string, string> item in param)
-            {
-                paramBuilder.Add(string.Format("{0}={1}", item.Key, item.Value));
-            }
-            url = string.Format("{0}?{1}", url.TrimEnd('?'), string.Join(",", paramBuilder.ToArray()));
-            return Get(url);
-        }
-
-        public static string Get(string url)
-        {
-            try
-            {
-                HttpWebRequest request = GetHttpWebRequest(url);
-                if (request != null)
-                {
-                    string retval;
-                    InitRequest(ref request);
-                    using (WebResponse response = request.GetResponse())
-                    {
-                        using (StreamReader reader = new System.IO.StreamReader(response.GetResponseStream(), System.Text.Encoding.UTF8))
-                        {
-                            retval = reader.ReadToEnd();
-                        }
-                    }
-                    return retval;
-                }
-            }
-            catch
-            {
-            }
-            return null;
-        }
-
-        public static string Post(string url, string data)
-        {
-            try
-            {
-                HttpWebRequest request = GetHttpWebRequest(url);
-                if (request != null)
-                {
-                    string retval = null;
-                    InitRequest(ref request);
-                    request.Method = "POST";
-                    request.ServicePoint.Expect100Continue = false;
-                    request.ContentType = "application/json; charset=utf-8";
-                    request.Timeout = 5000;
-                    byte[] bytes = System.Text.Encoding.UTF8.GetBytes(data);
-                    request.ContentLength = bytes.Length;
-                    using (Stream stream = request.GetRequestStream())
-                    {
-                        stream.Write(bytes, 0, bytes.Length);
-                    }
-                    using (WebResponse response = request.GetResponse())
-                    {
-                        using (StreamReader reader = new System.IO.StreamReader(response.GetResponseStream()))
-                        {
-                            retval = reader.ReadToEnd();
-                        }
-                    }
-                    return retval;
-                }
-            }
-            catch
-            {
-            }
-            return null;
-        }
-
-        ///  <summary>
-        /// 调用Post接口
-        ///  </summary>
-        ///  <returns></returns>
-        public static string HttpPost(string body, string url)
-        {
-            try
-            {
-                Encoding encoding = Encoding.UTF8;
-                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
-                request.Method = "POST";
-                request.Accept = "text/html,application/xhtml+xml,*/*";
-                request.ContentType = "application/json";
-                string postDataAes = body;
-                if (isParameterEncryption)
-                {
-                    postDataAes = AESHelper.AESEncrypt(body, "XINGHUOLIAOYUAN7");
-                    request.Headers.Add("st", "true");
-                }
-                else
-                {
-                    request.Headers.Add("st", "false");
-                }
-                if (!string.IsNullOrEmpty(tokenKey) && !string.IsNullOrEmpty(tokenValue))
-                {
-                    request.Headers.Add("Token-Key", tokenKey);
-                    request.Headers.Add("Token-Value", tokenValue);
-                }
-                if (!string.IsNullOrEmpty(userId))
-                {
-                    request.Headers.Add("User-Id", userId);
-                }
-                byte[] buffer = encoding.GetBytes(postDataAes);
-                request.ContentLength = buffer.Length;
-                request.GetRequestStream().Write(buffer, 0, buffer.Length);
-
-                HttpWebResponse response = (HttpWebResponse)request.GetResponse();
-                using (StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8))
-                {
-                    return reader.ReadToEnd();
-                }
-            }
-            catch (Exception ex)
-            {
-                // LogHelper.Instance.Debug($"POST接口连接失败，请求参数：{ex.Message}");
-                return "POST报错:" + ex.Message;
-            }
-        }
-
-        /// <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 T PostAndRespSignle<T>(string url, int timeout = 5000, string postData = "", string contentType = "application/json;", string encode = "UTF-8") where T : class
-        {
-            if (!string.IsNullOrEmpty(url) && !string.IsNullOrEmpty(encode) && !string.IsNullOrEmpty(contentType) && postData != null)
-            {
-                try
-                {
-                    string postDataAes = postData;
-                    if (isParameterEncryption)
-                    {
-                        postDataAes = AESHelper.AESEncrypt(postDataAes, "XINGHUOLIAOYUAN7");
-                    }
-                    string respstr = GetStreamReader
-                    (
-                        url,
-                        null,
-                        null,
-                        null,
-                        null,
-                        timeout,
-                        encode,
-                        postDataAes,
-                        contentType
-                    );
-                    return JsonHelper.JsonToObj<T>(respstr);
-                }
-                catch (Exception)
-                {
-                    // ignored
-                }
-            }
-            return default(T);
-        }
-
-        private static string GetStreamReader(string url, Stream responseStream, Stream requestStream, StreamReader streamReader, WebResponse webResponse, int timeout, string encode, string postData, string contentType)
-        {
-            try
-            {
-                byte[] data = Encoding.GetEncoding(encode).GetBytes(postData);
-                HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(url);
-                webRequest.Method = "POST";
-                webRequest.ContentType = contentType + ";" + encode;
-                webRequest.ContentLength = data.Length;
-                webRequest.Timeout = timeout;
-                if (isParameterEncryption)
-                {
-                    webRequest.Headers.Add("st", "true");
-                }
-                else
-                {
-                    webRequest.Headers.Add("st", "false");
-                }
-                if (!string.IsNullOrEmpty(tokenKey) && !string.IsNullOrEmpty(tokenValue))
-                {
-                    webRequest.Headers.Add("Token-Key", tokenKey);
-                    webRequest.Headers.Add("Token-Value", tokenValue);
-                }
-                if (!string.IsNullOrEmpty(userId))
-                {
-                    webRequest.Headers.Add("User-Id", userId);
-                }
-                requestStream = webRequest.GetRequestStream();
-                requestStream.Write(data, 0, data.Length);
-                webResponse = (HttpWebResponse)webRequest.GetResponse();
-                responseStream = webResponse.GetResponseStream();
-                if (responseStream == null) { return ""; }
-                streamReader = new StreamReader(responseStream, Encoding.GetEncoding(encode));
-                return streamReader.ReadToEnd();
-            }
-            catch (Exception)
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Cookie
-        /// </summary>
-        public static CookieContainer cc = new CookieContainer();
-
-        /// <summary>
-        /// Get请求
-        /// </summary>
-        /// <param name="serviceaddress">请求地址</param>
-        /// <param name="strcontent">头</param>
-        /// <param name="contenttype">参数</param>
-        /// <param name="header">token</param>
-        /// <param name="timeout"></param>
-        /// <returns></returns>
-        public static JObject GetFunction
-        (
-            string serviceaddress,
-            string strcontent,
-            string contenttype,
-            string header,
-            int timeout = 5000
-        )
-        {
-            try
-            {
-                string serviceAddress = serviceaddress + strcontent;
-                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(serviceAddress);
-                WebHeaderCollection myWebHeaderCollection = request.Headers;
-                request.CookieContainer = cc;
-                if (header != "")
-                {
-                    myWebHeaderCollection.Add("access_token:" + header);
-                }
-
-                request.Method = "GET";
-                request.ContentType = contenttype;
-                HttpWebResponse response = (HttpWebResponse)request.GetResponse();
-
-                string encoding = response.ContentEncoding;
-                if (encoding.Length < 1)
-                {
-                    encoding = "UTF-8"; //默认编码
-                }
-                StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding(encoding));
-                string retString = reader.ReadToEnd();
-
-                //解析josn
-                JObject jo = JObject.Parse(retString);
-                return jo;
-            }
-            catch (Exception)
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Post请求
-        /// </summary>
-        /// <param name="serviceaddress">请求地址</param>
-        /// <param name="contenttype">头 application/x-www-form-urlencoded</param>
-        /// <param name="strcontent">参数</param>
-        /// <param name="header">token</param>
-        /// <returns></returns>
-        public static JObject PostFunction(string serviceaddress, string contenttype, string strcontent, string header, int Timeout = 5000)
-        {
-            try
-            {
-                string serviceAddress = serviceaddress;
-                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(serviceAddress);
-                WebHeaderCollection myWebHeaderCollection = request.Headers;
-
-                request.CookieContainer = cc;
-                //myWebHeaderCollection.Add("Accept", "*/*");
-                if (header != "")
-                {
-                    myWebHeaderCollection.Add("access_token:" + header);
-                }
-                request.Timeout = Timeout;
-                request.Method = "POST";
-                request.ContentType = contenttype;
-                using (StreamWriter dataStream = new StreamWriter(request.GetRequestStream()))
-                {
-                    dataStream.Write(strcontent);
-                    dataStream.Close();
-                }
-                HttpWebResponse response = (HttpWebResponse)request.GetResponse();
-
-                string encoding = response.ContentEncoding;
-                if (encoding == null || encoding.Length < 1)
-                {
-                    encoding = "UTF-8"; //默认编码
-                }
-                StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding(encoding));
-                string retString = reader.ReadToEnd();
-                retString = retString.Replace("\\r\\n", "");
-
-                //解析josn
-                JObject jo = JObject.Parse(retString);
-                return jo;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteErrLog("请求失败（若网络无问题，请重置winsock，解决方法：以管理员方式打开cmd执行 netsh winsock reset 后重启）", ex);
-                return null;
-            }
-        }
-
-        /// <summary>
-        ///  上传方法
-        /// </summary>
-        /// <param name="url">webapi地址</param>
-        /// <param name="files">本地文件路径，单文件默认为string[0]</param>
-        /// <param name="token"></param>
-        /// <param name="formFields">参数可不传</param>
-        /// <returns></returns>
-        public static JObject UploadFilesToRemoteUrl(string url, string[] files, string token, NameValueCollection formFields = null)
-        {
-            string boundary = "----------------------------" + DateTime.Now.Ticks.ToString("x");
-            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
-            request.ContentType = "multipart/form-data; boundary=" +
-                                    boundary;
-            request.Method = "POST";
-            request.KeepAlive = true;
-
-            Stream memStream = new System.IO.MemoryStream();
-
-            byte[] boundarybytes = System.Text.Encoding.ASCII.GetBytes("\r\n--" +
-                                                                    boundary + "\r\n");
-            byte[] endBoundaryBytes = System.Text.Encoding.ASCII.GetBytes("\r\n--" +
-                                                                        boundary + "--");
-            WebHeaderCollection myWebHeaderCollection = request.Headers;
-            request.CookieContainer = cc;
-            if (token != "")
-            {
-                myWebHeaderCollection.Add("access_token:" + token);
-            }
-
-            string formdataTemplate = "\r\n--" + boundary +
-                                        "\r\nContent-Disposition: form-data; name=\"{0}\";\r\n\r\n{1}";
-            if (formFields != null)
-            {
-                foreach (string key in formFields.Keys)
-                {
-                    string formitem = string.Format(formdataTemplate, key, formFields[key]);
-                    byte[] formitembytes = System.Text.Encoding.UTF8.GetBytes(formitem);
-                    memStream.Write(formitembytes, 0, formitembytes.Length);
-                }
-            }
-
-            string headerTemplate =
-                "Content-Disposition: form-data; name=\"{0}\"; filename=\"{1}\"\r\n" +
-                "Content-Type: application/octet-stream\r\n\r\n";
-
-            for (int i = 0; i < files.Length; i++)
-            {
-                memStream.Write(boundarybytes, 0, boundarybytes.Length);
-                string header = string.Format(headerTemplate, "fileData", files[i]);
-                byte[] headerbytes = System.Text.Encoding.UTF8.GetBytes(header);
-
-                memStream.Write(headerbytes, 0, headerbytes.Length);
-
-                using (FileStream fileStream = new FileStream(files[i], FileMode.Open, FileAccess.Read))
-                {
-                    byte[] buffer = new byte[1024];
-                    int bytesRead = 0;
-                    while ((bytesRead = fileStream.Read(buffer, 0, buffer.Length)) != 0)
-                    {
-                        memStream.Write(buffer, 0, bytesRead);
-                    }
-                }
-            }
-
-            //memStream.Write(endBoundaryBytes, 0, endBoundaryBytes.Length);
-            request.ContentLength = memStream.Length;
-
-            using (Stream requestStream = request.GetRequestStream())
-            {
-                memStream.Position = 0;
-                byte[] tempBuffer = new byte[memStream.Length];
-                memStream.Read(tempBuffer, 0, tempBuffer.Length);
-                memStream.Close();
-                requestStream.Write(tempBuffer, 0, tempBuffer.Length);
-            }
-
-            using (WebResponse response = request.GetResponse())
-            {
-                Stream stream2 = response.GetResponseStream();
-                StreamReader reader2 = new StreamReader(stream2);
-                JObject a = JObject.Parse(reader2.ReadToEnd());
-                return a;
-            }
-        }
-
-        /// <summary>
-        /// HttpWebRequest 下载
-        /// </summary>
-        /// <param name="url">URI</param>
-        /// <returns></returns>
-        public static bool GetDataGetHtml(string url, string filePath, string header)
-        {
-            try
-            {
-                HttpWebRequest httpWebRequest = (HttpWebRequest)WebRequest.Create(url);
-
-                //httpWebRequest.ContentType = "application/x-www-form-urlencoded";
-                httpWebRequest.Method = "GET";
-                //httpWebRequest.ContentType = "image/jpeg";
-                //对发送的数据不使用缓存
-                httpWebRequest.AllowWriteStreamBuffering = false;
-                //httpWebRequest.Timeout = 300000;
-                httpWebRequest.ServicePoint.Expect100Continue = false;
-
-                WebHeaderCollection myWebHeaderCollection = httpWebRequest.Headers;
-                //myWebHeaderCollection.Add("Accept", "*/*");
-                if (header != "")
-                {
-                    myWebHeaderCollection.Add("access_token:" + header);
-                }
-
-                HttpWebResponse webRespon = (HttpWebResponse)httpWebRequest.GetResponse();
-                Stream webStream = webRespon.GetResponseStream();
-                long length = webRespon.ContentLength;
-                if (webStream == null)
-                {
-                    return false;
-                }
-                int lengthint = Convert.ToInt32(length);
-                //int num = lengthint / 1024;
-                //int count = 0;
-                //M_DownloadInfo.totalCount = lengthint / 1024;
-                //M_DownloadInfo.downloadCount = 0;
-
-                Stream stream = new FileStream(filePath, FileMode.Create, FileAccess.ReadWrite, FileShare.ReadWrite);
-                byte[] bArr = new byte[1024];
-                int size = webStream.Read(bArr, 0, bArr.Length);
-                while (size > 0)
-                {
-                    stream.Write(bArr, 0, size);
-                    size = webStream.Read(bArr, 0, bArr.Length);
-                    //M_DownloadInfo.downloadCount = M_DownloadInfo.downloadCount + 1;
-                }
-                webRespon.Close();
-                stream.Close();
-                webStream.Close();
-                return true;
-            }
-            catch (Exception)
-            {
-                //LogHelper.WriteErrLog("请求失败：" + ex.Message, ex);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// 上传文件流
-        /// 创建人：赵耀
-        /// 创建时间：2020年9月5日
-        /// </summary>
-        /// <param name="url">URL</param>
-        /// <param name="databyte">文件数据流</param>
-        /// <param name="filename">文件名</param>
-        /// <param name="formFields">参数 可不传</param>
-        public static JObject UploadRequestflow(string url, byte[] databyte, string filename, NameValueCollection formFields = null)
-        {
-            JObject jobResult = null;
-            // 时间戳，用做boundary
-            string boundary = "-----" + DateTime.Now.Ticks.ToString("x");
-            byte[] boundarybytes = Encoding.ASCII.GetBytes("\r\n--" + boundary + "\r\n");
-
-            //根据uri创建HttpWebRequest对象
-            HttpWebRequest httpReq = (HttpWebRequest)WebRequest.Create(new Uri(url));
-            httpReq.ContentType = "multipart/form-data; boundary=" + boundary;
-            httpReq.Method = "POST";
-            httpReq.KeepAlive = true;
-            //httpReq.Timeout = 300000;
-            //httpReq.AllowWriteStreamBuffering = false; //对发送的数据不使用缓存
-            httpReq.Credentials = CredentialCache.DefaultCredentials;
-
-            try
-            {
-                Stream postStream = httpReq.GetRequestStream();
-                //参数
-                const string formdataTemplate = "Content-Disposition: form-data; name=\"{0}\"\r\n\r\n{1}";
-                if (formFields != null)
-                {
-                    foreach (string key in formFields.Keys)
-                    {
-                        postStream.Write(boundarybytes, 0, boundarybytes.Length);
-                        string formitem = string.Format(formdataTemplate, key, formFields[key]);
-                        byte[] formitembytes = Encoding.UTF8.GetBytes(formitem);
-                        postStream.Write(formitembytes, 0, formitembytes.Length);
-                    }
-                }
-                postStream.Write(boundarybytes, 0, boundarybytes.Length);
-
-                const string headerTemplate = "Content-Disposition: form-data; name=\"{0}\"; filename=\"{1}\"\r\nContent-Type: application/octet-stream\r\n\r\n";
-
-                //文件头
-                string header = string.Format(headerTemplate, "file", filename);
-                byte[] headerbytes = Encoding.UTF8.GetBytes(header);
-                postStream.Write(headerbytes, 0, headerbytes.Length);
-
-                //文件流
-                postStream.Write(databyte, 0, databyte.Length);
-
-                //结束边界
-                byte[] boundaryBytes = Encoding.ASCII.GetBytes("\r\n--" + boundary + "--\r\n");
-                postStream.Write(boundaryBytes, 0, boundaryBytes.Length);
-                postStream.Close();
-
-                //获取服务器端的响应
-                using (HttpWebResponse response = (HttpWebResponse)httpReq.GetResponse())
-                {
-                    Stream receiveStream = response.GetResponseStream();
-                    StreamReader readStream = new StreamReader(receiveStream, Encoding.UTF8);
-                    string returnValue = readStream.ReadToEnd();
-                    jobResult = JObject.Parse(returnValue);
-                    response.Close();
-                    readStream.Close();
-                }
-                return jobResult;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteErrLog("【文件上传】" + ex.Message, ex);
-                return null;
-            }
-            finally
-            {
-                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)
-            {
-                try
-                {
-                    string postDataAes = postData;
-                    if (isParameterEncryption)
-                    {
-                        postDataAes = AESHelper.AESEncrypt(postData, "XINGHUOLIAOYUAN7");
-                    }
-                    return GetStreamReader
-                    (
-                        url,
-                        null,
-                        null,
-                        null,
-                        null,
-                        timeout,
-                        encode,
-                        postDataAes,
-                        contentType
-                    );
-                }
-                catch (Exception)
-                {
-                    // ignored
-                }
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// 获取公网IP和地址，失败则获取局域网IP
-        /// </summary>
-        /// <param name="addressIp">IP地址</param>
-        /// <param name="address">地址</param>
-        /// <returns></returns>
-        public static bool GetAddressIp(out string addressIp, out string address)
-        {
-            addressIp = "";
-            address = "";
-            try
-            {
-                //请求搜狐获取公网IP，获取失败后获取局域网IP
-                WebRequest request = WebRequest.Create("http://pv.sohu.com/cityjson?ie=utf-8");
-                request.Timeout = 10000;
-                WebResponse response = request.GetResponse();
-                Stream resStream = response.GetResponseStream();
-                StreamReader sr = new StreamReader(resStream, System.Text.Encoding.UTF8);
-                string htmlinfo = sr.ReadToEnd();
-                string jsonStr = htmlinfo.Substring(htmlinfo.IndexOf("{"), htmlinfo.LastIndexOf("}") - htmlinfo.IndexOf("{") + 1);
-                JObject obj = JObject.Parse(jsonStr);
-                addressIp = obj["cip"].ToString();
-                address = obj["cname"].ToString();
-                resStream.Close();
-                sr.Close();
-                return true;
-                //Regex r = new Regex("((25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|[1-9])", RegexOptions.None);
-                //Match mc = r.Match(htmlinfo);
-                //AddressIP = mc.Groups[0].Value;
-            }
-            catch (Exception)
-            {
-                //获取本地局域网IP
-                foreach (System.Net.IPAddress ipAddress in Dns.GetHostEntry(Dns.GetHostName()).AddressList)
-                {
-                    if (ipAddress.AddressFamily.ToString() == "InterNetwork")
-                    {
-                        addressIp = ipAddress.ToString();
-                    }
-                }
-                return false;
-            }
-        }
-    }
-}

XHWK.WKTool/system/ZHttpUtil.cs

@@ -0,0 +1,495 @@
+namespace Common.system
+{
+    using Newtonsoft.Json.Linq;
+    using System;
+    using System.Collections.Specialized;
+    using System.IO;
+    using System.Net;
+    using System.Net.Security;
+    using System.Security.Cryptography.X509Certificates;
+    using System.Text;
+    using System.Threading;
+
+    public class ZHttpUtil
+    {
+        public static string tokenKey = "";
+        public static string tokenValue = "";
+        public static string userId = "";
+        public static string version = "";
+        public static bool isSt;
+
+        public static void InitRequest(ref System.Net.HttpWebRequest request)
+        {
+            request.Accept = "text/json,*/*;q=0.5";
+            request.Headers.Add("Accept-Charset", "utf-8;q=0.7,*;q=0.7");
+            request.Headers.Add("Accept-Encoding", "gzip, deflate, x-gzip, identity; q=0.9");
+            request.AutomaticDecompression = System.Net.DecompressionMethods.GZip;
+            request.Timeout = 8000;
+        }
+
+        private static bool CheckValidationResult(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors errors)
+        {
+            return true; //总是接受
+        }
+
+        public static System.Net.HttpWebRequest GetHttpWebRequest(string url)
+        {
+            HttpWebRequest request;
+            if (url.StartsWith("https", StringComparison.OrdinalIgnoreCase))
+            {
+                ServicePointManager.ServerCertificateValidationCallback = CheckValidationResult;
+                request = WebRequest.Create(url) as HttpWebRequest;
+                if (request != null)
+                {
+                    request.ProtocolVersion = HttpVersion.Version10;
+                }
+            }
+            else
+            {
+                request = WebRequest.Create(url) as HttpWebRequest;
+            }
+            return request;
+        }
+
+        public static WebResponse Download(string downloadUrl, long from, long to, string method)
+        {
+            for (int i = 0; i < 10; i++)
+            {
+                try
+                {
+                    HttpWebRequest request = GetHttpWebRequest(downloadUrl);
+                    InitRequest(ref request);
+                    request.Accept = "text/json,*/*;q=0.5";
+                    request.AddRange(from, to);
+                    request.Headers.Add("Accept-Charset", "utf-8;q=0.7,*;q=0.7");
+                    request.Headers.Add("Accept-Encoding", "gzip, deflate, x-gzip, identity; q=0.9");
+                    request.AutomaticDecompression = System.Net.DecompressionMethods.GZip;
+                    request.Timeout = 120000;
+                    request.Method = method;
+                    request.KeepAlive = false;
+                    request.ContentType = "application/json; charset=utf-8";
+                    return request.GetResponse();
+                }
+                catch (Exception)
+                {
+                    Thread.Sleep(100);
+                }
+            }
+            throw new Exception("已断开网络！请检查网络连接后重试下载！");
+        }
+
+        public static string GetStr(string url)
+        {
+            try
+            {
+                HttpWebRequest request = GetHttpWebRequest(url);
+                if (request != null)
+                {
+                    AddHeader(request);
+                    string retval;
+                    InitRequest(ref request);
+                    using (WebResponse response = request.GetResponse())
+                    {
+                        // ReSharper disable once AssignNullToNotNullAttribute
+                        using (StreamReader reader = new System.IO.StreamReader(response.GetResponseStream(), System.Text.Encoding.UTF8))
+                        {
+                            retval = reader.ReadToEnd();
+                        }
+                    }
+                    return retval;
+                }
+            }
+            catch (Exception)
+            {
+                // ignored
+            }
+            return null;
+        }
+
+        private static void AddHeader(HttpWebRequest webRequest)
+        {
+            webRequest.Headers.Add("Xh-St", isSt ? "true" : "false");
+            if (!string.IsNullOrEmpty(tokenKey) && !string.IsNullOrEmpty(tokenValue))
+            {
+                webRequest.Headers.Add("Xh-Token-Key", tokenKey);
+                webRequest.Headers.Add("Xh-Token-Value", tokenValue);
+            }
+            if (!string.IsNullOrEmpty(userId))
+            {
+                webRequest.Headers.Add("Xh-User-Id", userId);
+            }
+            webRequest.Headers.Add("Xh-Device", "microlecture_pc_t");
+            webRequest.Headers.Add("Xh-Version", version);
+        }
+
+        ///  <summary>
+        /// 调用Post接口
+        ///  </summary>
+        ///  <returns></returns>
+        public static string PostStr(string url, string postData)
+        {
+            Stream responseStream = null;
+            try
+            {
+                Encoding encoding = Encoding.UTF8;
+                HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(url);
+                webRequest.Method = "POST";
+                webRequest.Accept = "text/html,application/xhtml+xml,*/*";
+                webRequest.ContentType = "application/json";
+                string aesPostData = postData;
+                if (isSt)
+                {
+                    aesPostData = AesHelper.AesEncrypt(postData, "XINGHUOLIAOYUAN7");
+                }
+                AddHeader(webRequest);
+                byte[] buffer = encoding.GetBytes(aesPostData);
+                webRequest.ContentLength = buffer.Length;
+                webRequest.GetRequestStream()
+                .Write
+                (
+                    buffer,
+                    0,
+                    buffer.Length
+                );
+                HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse();
+                isSt = webResponse.GetResponseHeader("Xh-St") == "true";
+                responseStream = webResponse.GetResponseStream();
+                if (responseStream == null) { return ""; }
+                using (StreamReader reader = new StreamReader(responseStream, Encoding.UTF8))
+                {
+                    return reader.ReadToEnd();
+                }
+            }
+            catch (Exception)
+            {
+                return "";
+            }
+            finally
+            {
+                if (responseStream != null)
+                {
+                    responseStream.Dispose();
+                }
+            }
+        }
+
+        /// <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 T PostSignle<T>
+        (
+            string url,
+            int timeout = 5000,
+            string postData = "",
+            string contentType = "application/json;",
+            string encode = "UTF-8"
+        ) where T : class
+        {
+            if (!string.IsNullOrEmpty(url) && !string.IsNullOrEmpty(encode) && !string.IsNullOrEmpty(contentType) && postData != null)
+            {
+                try
+                {
+                    string respstr = PostStr(url, postData);
+                    return JsonHelper.JsonToObj<T>(respstr);
+                }
+                catch (Exception)
+                {
+                    // ignored
+                }
+            }
+            return default;
+        }
+
+        /// <summary>
+        /// Cookie
+        /// </summary>
+        public static CookieContainer cc = new CookieContainer();
+
+        /// <summary>
+        /// Post请求
+        /// </summary>
+        /// <param name="serviceaddress">请求地址</param>
+        /// <param name="contenttype">头 application/x-www-form-urlencoded</param>
+        /// <param name="strcontent">参数</param>
+        /// <param name="header">token</param>
+        /// <param name="timeout"></param>
+        /// <returns></returns>
+        public static JObject PostFunction
+        (
+            string serviceaddress,
+            string contenttype,
+            string strcontent,
+            string header,
+            int timeout = 5000
+        )
+        {
+            try
+            {
+                string serviceAddress = serviceaddress;
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(serviceAddress);
+                WebHeaderCollection myWebHeaderCollection = request.Headers;
+
+                request.CookieContainer = cc;
+                //myWebHeaderCollection.Add("Accept", "*/*");
+                if (header != "")
+                {
+                    myWebHeaderCollection.Add("access_token:" + header);
+                }
+                request.Timeout = timeout;
+                request.Method = "POST";
+                request.ContentType = contenttype;
+                using (StreamWriter dataStream = new StreamWriter(request.GetRequestStream()))
+                {
+                    dataStream.Write(strcontent);
+                    dataStream.Close();
+                }
+                HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+
+                string encoding = response.ContentEncoding;
+                if (encoding.Length < 1)
+                {
+                    encoding = "UTF-8"; //默认编码
+                }
+                // ReSharper disable once AssignNullToNotNullAttribute
+                StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding(encoding));
+                string retString = reader.ReadToEnd();
+                retString = retString.Replace("\\r\\n", "");
+
+                //解析josn
+                JObject jo = JObject.Parse(retString);
+                return jo;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("请求失败（若网络无问题，请重置winsock，解决方法：以管理员方式打开cmd执行 netsh winsock reset 后重启）", ex);
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// HttpWebRequest 下载
+        /// </summary>
+        /// <param name="url">URI</param>
+        /// <param name="filePath"></param>
+        /// <param name="header"></param>
+        /// <returns></returns>
+        public static bool GetDataGetHtml
+        (
+            string url,
+            string filePath,
+            string header
+        )
+        {
+            try
+            {
+                HttpWebRequest httpWebRequest = (HttpWebRequest)WebRequest.Create(url);
+
+                //httpWebRequest.ContentType = "application/x-www-form-urlencoded";
+                httpWebRequest.Method = "GET";
+                //httpWebRequest.ContentType = "image/jpeg";
+                //对发送的数据不使用缓存
+                httpWebRequest.AllowWriteStreamBuffering = false;
+                //httpWebRequest.Timeout = 300000;
+                httpWebRequest.ServicePoint.Expect100Continue = false;
+
+                WebHeaderCollection myWebHeaderCollection = httpWebRequest.Headers;
+                //myWebHeaderCollection.Add("Accept", "*/*");
+                if (header != "")
+                {
+                    myWebHeaderCollection.Add("access_token:" + header);
+                }
+
+                HttpWebResponse webRespon = (HttpWebResponse)httpWebRequest.GetResponse();
+                Stream webStream = webRespon.GetResponseStream();
+                if (webStream == null)
+                {
+                    return false;
+                }
+                Stream stream = new FileStream(filePath, FileMode.Create, FileAccess.ReadWrite, FileShare.ReadWrite);
+                byte[] bArr = new byte[1024];
+                int size = webStream.Read(bArr, 0, bArr.Length);
+                while (size > 0)
+                {
+                    stream.Write(bArr, 0, size);
+                    size = webStream.Read(bArr, 0, bArr.Length);
+                    //M_DownloadInfo.downloadCount = M_DownloadInfo.downloadCount + 1;
+                }
+                webRespon.Close();
+                stream.Close();
+                webStream.Close();
+                return true;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 上传文件流
+        /// 创建人：赵耀
+        /// 创建时间：2020年9月5日
+        /// </summary>
+        /// <param name="url">URL</param>
+        /// <param name="databyte">文件数据流</param>
+        /// <param name="filename">文件名</param>
+        /// <param name="formFields">参数 可不传</param>
+        public static JObject UploadRequestflow(string url, byte[] databyte, string filename, NameValueCollection formFields = null)
+        {
+            // 时间戳，用做boundary
+            string boundary = "-----" + DateTime.Now.Ticks.ToString("x");
+            byte[] boundarybytes = Encoding.ASCII.GetBytes("\r\n--" + boundary + "\r\n");
+
+            //根据uri创建HttpWebRequest对象
+            HttpWebRequest httpReq = (HttpWebRequest)WebRequest.Create(new Uri(url));
+            httpReq.ContentType = "multipart/form-data; boundary=" + boundary;
+            httpReq.Method = "POST";
+            httpReq.KeepAlive = true;
+            //httpReq.Timeout = 300000;
+            //httpReq.AllowWriteStreamBuffering = false; //对发送的数据不使用缓存
+            httpReq.Credentials = CredentialCache.DefaultCredentials;
+            try
+            {
+                Stream postStream = httpReq.GetRequestStream();
+                //参数
+                const string formdataTemplate = "Content-Disposition: form-data; name=\"{0}\"\r\n\r\n{1}";
+                if (formFields != null)
+                {
+                    foreach (string key in formFields.Keys)
+                    {
+                        postStream.Write
+                        (
+                            boundarybytes,
+                            0,
+                            boundarybytes.Length
+                        );
+                        string formitem = string.Format
+                        (
+                            formdataTemplate,
+                            key,
+                            formFields[key]
+                        );
+                        byte[] formitembytes = Encoding.UTF8.GetBytes(formitem);
+                        postStream.Write
+                        (
+                            formitembytes,
+                            0,
+                            formitembytes.Length
+                        );
+                    }
+                }
+                postStream.Write
+                (
+                    boundarybytes,
+                    0,
+                    boundarybytes.Length
+                );
+                const string headerTemplate = "Content-Disposition: form-data; name=\"{0}\"; filename=\"{1}\"\r\nContent-Type: application/octet-stream\r\n\r\n";
+
+                //文件头
+                string header = string.Format
+                (
+                    headerTemplate,
+                    "file",
+                    filename
+                );
+                byte[] headerbytes = Encoding.UTF8.GetBytes(header);
+                postStream.Write
+                (
+                    headerbytes,
+                    0,
+                    headerbytes.Length
+                );
+
+                //文件流
+                postStream.Write
+                (
+                    databyte,
+                    0,
+                    databyte.Length
+                );
+
+                //结束边界
+                byte[] boundaryBytes = Encoding.ASCII.GetBytes("\r\n--" + boundary + "--\r\n");
+                postStream.Write
+                (
+                    boundaryBytes,
+                    0,
+                    boundaryBytes.Length
+                );
+                postStream.Close();
+
+                //获取服务器端的响应
+                JObject jobResult = null;
+                using (HttpWebResponse response = (HttpWebResponse)httpReq.GetResponse())
+                {
+                    Stream receiveStream = response.GetResponseStream();
+                    if (receiveStream != null)
+                    {
+                        StreamReader readStream = new StreamReader(receiveStream, Encoding.UTF8);
+                        string returnValue = readStream.ReadToEnd();
+                        jobResult = JObject.Parse(returnValue);
+                        response.Close();
+                        readStream.Close();
+                    }
+                }
+                return jobResult;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【文件上传】" + ex.Message, ex);
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// 获取公网IP和地址，失败则获取局域网IP
+        /// </summary>
+        /// <param name="addressIp">IP地址</param>
+        /// <param name="address">地址</param>
+        /// <returns></returns>
+        public static bool GetAddressIp(out string addressIp, out string address)
+        {
+            addressIp = "";
+            address = "";
+            try
+            {
+                //请求搜狐获取公网IP，获取失败后获取局域网IP
+                WebRequest request = WebRequest.Create("http://pv.sohu.com/cityjson?ie=utf-8");
+                request.Timeout = 10000;
+                WebResponse response = request.GetResponse();
+                Stream resStream = response.GetResponseStream();
+                if (resStream != null)
+                {
+                    StreamReader sr = new StreamReader(resStream, System.Text.Encoding.UTF8);
+                    string htmlinfo = sr.ReadToEnd();
+                    string jsonStr = htmlinfo.Substring(htmlinfo.IndexOf("{", StringComparison.Ordinal), htmlinfo.LastIndexOf("}", StringComparison.Ordinal) - htmlinfo.IndexOf("{", StringComparison.Ordinal) + 1);
+                    JObject obj = JObject.Parse(jsonStr);
+                    addressIp = obj["cip"]?.ToString();
+                    address = obj["cname"]?.ToString();
+                    resStream.Close();
+                    sr.Close();
+                }
+                return true;
+            }
+            catch (Exception)
+            {
+                //获取本地局域网IP
+                foreach (System.Net.IPAddress ipAddress in Dns.GetHostEntry(Dns.GetHostName()).AddressList)
+                {
+                    if (ipAddress.AddressFamily.ToString() == "InterNetwork")
+                    {
+                        addressIp = ipAddress.ToString();
+                    }
+                }
+                return false;
+            }
+        }
+    }
+}

星火微课/星火微课-测试.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "星火微课测试版"  
 #define MyAppDir "xhwk_test"
-#define MyAppVersion "3.12.0"
+#define MyAppVersion "3.13.0"
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
 #define MyAppURL "http://www.xhkjedu.com/"
 #define MySourcePath "D:\Project\CSharp\xh-wkclient\XHWK.WKTool\bin\x86\Debug\"