文件上传不加密

合并请求方法

XHWK.WKTool/App.config

@@ -7,8 +7,8 @@
     <!--0正式 1测试-->
     <add key="IsDebug" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="129" />
-    <add key="VersionName" value="3.13.2" />
+    <add key="VersionCode" value="130" />
+    <add key="VersionName" value="3.13.3" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/DAL/DalUpload.cs

@@ -40,34 +40,23 @@ namespace XHWK.WKTool.DAL
             {
                 try
                 {
-                    JObject jo = ZHttpUtil.PostFunction
-                    (
-                        _fileRequestAddress + @"/chunkdb/isexist",
-                        @"application/x-www-form-urlencoded",
+                    string url = new Uri(new Uri(_fileRequestAddress), @"/chunkdb/isexist").AbsoluteUri;
+                    ResultVo<ModelResourceAddTwo> resultObj = ZHttpUtil.PostSignle<ResultVo<ModelResourceAddTwo>>(
+                        url,
                         @"md5=" + md5,
-                        ""
+                        false,
+                        contentType: @"application/x-www-form-urlencoded"
                     );
-                    if (jo == null)
+                    if (resultObj != null)
                     {
-                        message = "无法访问文件服务器，请检查网络或文件服务器地址。";
-                        return false;
-                    }
-
-                    //修改为0为之前上传成功，1为之前未上传成功
-                    if (jo["code"]?.ToString() == "0")
-                    {
-                        message = "";
-                        Model.ResultVo<ModelResourceAddTwo> resultObj = JsonHelper.JsonToObj<Model.ResultVo<ModelResourceAddTwo>>(jo.ToString());
-                        App.ResourceAddTwo = resultObj.obj;
-                        //已存在 不允许上传
-                        return false;
-                    }
-                    else
-                    {
-                        message = "";
-                        //不存在 允许上传
-                        return true;
+                        if (resultObj.code == 0)
+                        {
+                            App.ResourceAddTwo = resultObj.obj;
+                            //已存在 不允许上传
+                            return false;
+                        }
                     }
+                    return true;
                 }
                 catch (Exception e)
                 {
@@ -104,32 +93,24 @@ namespace XHWK.WKTool.DAL
             {
                 try
                 {
-                    JObject jo = ZHttpUtil.PostFunction
-                    (
-                        _fileRequestAddress + @"/chunkdb/mergechunk",
-                        @"application/x-www-form-urlencoded",
+                    string url = new Uri(new Uri(_fileRequestAddress), @"/chunkdb/mergechunk").AbsoluteUri;
+                    ResultVo<ModelResourceAddTwo> resultObj = ZHttpUtil.PostSignle<ResultVo<ModelResourceAddTwo>>(
+                        url,
                         @"savefolder=" + savefolder + "&identifier=" + fileCode,
-                        ""
+                        false,
+                        contentType: @"application/x-www-form-urlencoded"
                     );
-                    if (jo == null)
+                    if (resultObj != null)
                     {
-                        message = "无法访问文件服务器，请检查网络或文件服务器地址。";
-                        return false;
-                    }
-                    Model.ResultVo<ModelResourceAddTwo> resultObj = JsonHelper.JsonToObj<Model.ResultVo<ModelResourceAddTwo>>(jo.ToString());
-                    App.ResourceAddTwo = new ModelResourceAddTwo();
-                    //0成功，1失败
-                    if (resultObj.code == 0 && resultObj.obj != null)
-                    {
-                        App.ResourceAddTwo = resultObj.obj;
-                        return true;
-                    }
-                    else
-                    {
-                        //Message = "上传失败！";
-                        message = jo["msg"]?.ToString();
-                        return false;
+                        if (resultObj.code == 0)
+                        {
+                            App.ResourceAddTwo = resultObj.obj;
+                            return true;
+                        }
+                        message = resultObj.msg;
                     }
+                    message = "请求失败，请重试！";
+                    return false;
                 }
                 catch (Exception e)
                 {
@@ -186,10 +167,7 @@ namespace XHWK.WKTool.DAL
                     errMessage = "视频已上传";
                     return false;
                 }
-                else
-                {
-                    return true;
-                }
+                return true;
             }
             catch (Exception ex)
             {
@@ -234,8 +212,7 @@ namespace XHWK.WKTool.DAL
                     errMessage = "未找到课程！";
                     return false;
                 }
-
-                string uploadUrl = _fileRequestAddress + "/chunkdb/upchunk"; //zxyceshi
+                string uploadUrl = new Uri(new Uri(_fileRequestAddress), "/chunkdb/upchunk").AbsoluteUri;
                 if (videoInfo.IsUpload)
                 {
                     errMessage = "视频已上传";
@@ -338,8 +315,7 @@ namespace XHWK.WKTool.DAL
                             //{
                             //    formFields.Add();
                             //}
-                            JObject jo = ZHttpUtil.UploadRequestflow
-                            (
+                            JObject jo = ZHttpUtil.UploadFile(
                                 uploadUrl,
                                 byteArray,
                                 fileName,

XHWK.WKTool/DAL/XHApi.cs

@@ -145,7 +145,7 @@ namespace XHWK.WKTool.DAL
         public bool DownloadAvatar(string headPortrait, string savePath)
         {
             string url = App.showImageUrl + headPortrait;
-            bool result = ZHttpUtil.GetDataGetHtml(url, savePath, "");
+            bool result = ZHttpUtil.DownloadFile(url, savePath, "");
             return result;
         }
 

XHWK.WKTool/MainWindow.xaml.cs

@@ -2161,7 +2161,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 视频信息列表
         /// </summary>
-        private readonly List<Uc_VideoItem> _videoControlList = new List<Uc_VideoItem>();
+        private readonly List<UcVideoItem> _videoControlList = new List<UcVideoItem>();
 
         #endregion 初始值
 
@@ -2174,7 +2174,7 @@ namespace XHWK.WKTool
             //隐藏显示的控件
             if (_videoControlList.Count > 0)
             {
-                foreach (Uc_VideoItem item in _videoControlList)
+                foreach (UcVideoItem item in _videoControlList)
                 {
                     if (item.Visibility != Visibility.Hidden)
                     {
@@ -2192,7 +2192,7 @@ namespace XHWK.WKTool
                 {
                     return;
                 }
-                Uc_VideoItem videoItem;
+                UcVideoItem videoItem;
                 if (_videoControlList.Exists(x => x.Tag.ToString() == _modelVideoList[dataIndex].FileGuid))
                 {
                     videoItem = _videoControlList.Find(x => x.Tag.ToString() == _modelVideoList[dataIndex].FileGuid);
@@ -2203,9 +2203,9 @@ namespace XHWK.WKTool
                     {
                         continue;
                     }
-                    videoItem = new Uc_VideoItem(_modelVideoList[dataIndex]) { Tag = _modelVideoList[dataIndex].FileGuid };
-                    videoItem.Click_refreshVideoList += LoadUploadInitData;
-                    videoItem.Click_UploadLogin += Login;
+                    videoItem = new UcVideoItem(_modelVideoList[dataIndex]) { Tag = _modelVideoList[dataIndex].FileGuid };
+                    videoItem.ClickRefreshVideoList += LoadUploadInitData;
+                    videoItem.ClickUploadLogin += Login;
                     videoItem.Width = _controlWidth;
                     videoItem.Height = _controlHeight;
                     videoItem.HorizontalAlignment = HorizontalAlignment.Left;
@@ -2289,7 +2289,7 @@ namespace XHWK.WKTool
                 //隐藏显示的控件
                 if (_videoControlList.Count > 0)
                 {
-                    foreach (Uc_VideoItem item in _videoControlList)
+                    foreach (UcVideoItem item in _videoControlList)
                     {
                         if (item.Visibility != Visibility.Hidden)
                         {

XHWK.WKTool/Utils/ZHttpUtil.cs

@@ -1,6 +1,7 @@
 namespace Common.system
 {
     using Newtonsoft.Json.Linq;
+
     using System;
     using System.Collections.Specialized;
     using System.IO;
@@ -18,21 +19,18 @@
         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)
+        private static bool CheckValidationResult
+        (
+            object sender,
+            X509Certificate certificate,
+            X509Chain chain,
+            SslPolicyErrors errors
+        )
         {
             return true; //总是接受
         }
 
-        public static System.Net.HttpWebRequest GetHttpWebRequest(string url)
+        public static HttpWebRequest GetHttpWebRequest(string url)
         {
             HttpWebRequest request;
             if (url.StartsWith("https", StringComparison.OrdinalIgnoreCase))
@@ -51,15 +49,21 @@
             return request;
         }
 
-        public static WebResponse Download(string downloadUrl, long from, long to, string method)
+        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.AutomaticDecompression = DecompressionMethods.GZip;
                     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");
@@ -78,34 +82,6 @@
             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");
@@ -126,7 +102,13 @@
         /// 调用Post接口
         ///  </summary>
         ///  <returns></returns>
-        public static string PostStr(string url, string postData, bool jm = true)
+        public static string PostStr
+        (
+            string url,
+            string postData,
+            bool jm = true,
+            string contentType = "application/json"
+        )
         {
             Stream responseStream = null;
             try
@@ -135,7 +117,7 @@
                 HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(url);
                 webRequest.Method = "POST";
                 webRequest.Accept = "text/html,application/xhtml+xml,*/*";
-                webRequest.ContentType = "application/json";
+                webRequest.ContentType = contentType + ";" + "UTF-8";
                 string aesPostData = postData;
                 if (jm)
                 {
@@ -147,15 +129,13 @@
                 }
                 byte[] buffer = encoding.GetBytes(aesPostData);
                 webRequest.ContentLength = buffer.Length;
-                webRequest.GetRequestStream()
-                .Write
-                (
-                    buffer,
-                    0,
-                    buffer.Length
-                );
+                webRequest.GetRequestStream().Write(buffer, 0, buffer.Length);
                 HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse();
-                isSt = webResponse.GetResponseHeader("Xh-St") == "true";
+                //只有可能需要加密的接口的响应头才处理
+                if (jm)
+                {
+                    isSt = webResponse.GetResponseHeader("Xh-St") == "true";
+                }
                 responseStream = webResponse.GetResponseStream();
                 if (responseStream == null) { return ""; }
                 using (StreamReader reader = new StreamReader(responseStream, Encoding.UTF8))
@@ -200,7 +180,12 @@
             {
                 try
                 {
-                    string respstr = PostStr(url, postData, jm);
+                    string respstr = PostStr(
+                        url,
+                        postData,
+                        jm,
+                        contentType
+                    );
                     return JsonHelper.JsonToObj<T>(respstr);
                 }
                 catch (Exception)
@@ -211,72 +196,6 @@
             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.Logerror.Error("请求失败（若网络无问题，请重置winsock，解决方法：以管理员方式打开cmd执行 netsh winsock reset 后重启）", ex);
-                return null;
-            }
-        }
-
         /// <summary>
         /// HttpWebRequest 下载
         /// </summary>
@@ -284,12 +203,7 @@
         /// <param name="filePath"></param>
         /// <param name="header"></param>
         /// <returns></returns>
-        public static bool GetDataGetHtml
-        (
-            string url,
-            string filePath,
-            string header
-        )
+        public static bool DownloadFile(string url, string filePath, string header)
         {
             try
             {
@@ -302,21 +216,24 @@
                 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);
+                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)
@@ -345,7 +262,13 @@
         /// <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)
+        public static JObject UploadFile
+        (
+            string url,
+            byte[] databyte,
+            string filename,
+            NameValueCollection formFields = null
+        )
         {
             // 时间戳，用做boundary
             string boundary = "-----" + DateTime.Now.Ticks.ToString("x");
@@ -368,66 +291,26 @@
                 {
                     foreach (string key in formFields.Keys)
                     {
-                        postStream.Write
-                        (
-                            boundarybytes,
-                            0,
-                            boundarybytes.Length
-                        );
-                        string formitem = string.Format
-                        (
-                            formdataTemplate,
-                            key,
-                            formFields[key]
-                        );
+                        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(formitembytes, 0, formitembytes.Length);
                     }
                 }
-                postStream.Write
-                (
-                    boundarybytes,
-                    0,
-                    boundarybytes.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
-                );
+                string header = string.Format(headerTemplate, "file", filename);
                 byte[] headerbytes = Encoding.UTF8.GetBytes(header);
-                postStream.Write
-                (
-                    headerbytes,
-                    0,
-                    headerbytes.Length
-                );
+                postStream.Write(headerbytes, 0, headerbytes.Length);
 
                 //文件流
-                postStream.Write
-                (
-                    databyte,
-                    0,
-                    databyte.Length
-                );
+                postStream.Write(databyte, 0, databyte.Length);
 
                 //结束边界
                 byte[] boundaryBytes = Encoding.ASCII.GetBytes("\r\n--" + boundary + "--\r\n");
-                postStream.Write
-                (
-                    boundaryBytes,
-                    0,
-                    boundaryBytes.Length
-                );
+                postStream.Write(boundaryBytes, 0, boundaryBytes.Length);
                 postStream.Close();
 
                 //获取服务器端的响应
@@ -497,4 +380,4 @@
             }
         }
     }
-}
+}

XHWK.WKTool/View/UControl/Uc_VideoItem.xaml

@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="XHWK.WKTool.UControl.Uc_VideoItem"
+    x:Class="XHWK.WKTool.UControl.UcVideoItem"
     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"

XHWK.WKTool/View/UControl/Uc_VideoItem.xaml.cs

@@ -3,9 +3,7 @@
 using System;
 using System.Diagnostics;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Media;
 
 using XHWK.Model;
 using XHWK.WKTool.DAL;
@@ -17,14 +15,14 @@ namespace XHWK.WKTool.UControl
     /// <summary>
     /// 视频信息
     /// </summary>
-    public partial class Uc_VideoItem : UserControl
+    public partial class UcVideoItem
     {
         #region 初始值
 
         /// <summary>
         /// 视频模型
         /// </summary>
-        private ModelVideo VideoModel = new ModelVideo();
+        private ModelVideo _videoModel;
 
         /// <summary>
         /// 刷新视频列表
@@ -34,7 +32,7 @@ namespace XHWK.WKTool.UControl
         /// <summary>
         /// 刷新视频列表事件
         /// </summary>
-        public event RefreshVideoList Click_refreshVideoList;
+        public event RefreshVideoList ClickRefreshVideoList;
 
         /// <summary>
         /// 登录
@@ -44,12 +42,12 @@ namespace XHWK.WKTool.UControl
         /// <summary>
         /// 登录事件
         /// </summary>
-        public event UploadLogin Click_UploadLogin;
+        public event UploadLogin ClickUploadLogin;
 
         /// <summary>
         /// 上传页面
         /// </summary>
-        private UploadWindow W_UploadWindow = null;
+        private UploadWindow _wUploadWindow;
 
         #endregion 初始值
 
@@ -58,24 +56,25 @@ namespace XHWK.WKTool.UControl
         /// <summary>
         /// 视频信息
         /// </summary>
-        /// <param name="model_Video"></param>
-        public Uc_VideoItem(ModelVideo model_Video)
+        /// <param name="modelVideo"></param>
+        public UcVideoItem(ModelVideo modelVideo)
         {
             InitializeComponent();
             App.IsUpLoad = false;
-            VideoModel = model_Video;
+            _videoModel = modelVideo;
             DataContext = App.PageContextData;
-            if (FileToolsCommon.IsExistFile(VideoModel.ThumbnailPath))
+            if (FileToolsCommon.IsExistFile(_videoModel.ThumbnailPath))
             {
-                ImgVideo.Source = ImageHelper.ReadBitmapImageFile(VideoModel.ThumbnailPath);// new BitmapImage(new Uri(VideoModel.ThumbnailPath));
+                ImgVideo.Source = ImageHelper.ReadBitmapImageFile(_videoModel.ThumbnailPath); // new BitmapImage(new Uri(VideoModel.ThumbnailPath));
             }
-            string videoName = FileToolsCommon.GetIoFileNameNoExtension(VideoModel.VideoPath);
+            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;
-            if (VideoModel.IsUpload)
+            LblDateSize.Content = _videoModel.RSTime + " " + _videoModel.VideoSize;
+            if (_videoModel.IsUpload)
             {
-                BtnUpload.Visibility = Visibility.Hidden;
+                BtnUpload.IsEnabled = false;
+                BtnUpload.Background.Opacity = 0.6;
             }
         }
 
@@ -95,7 +94,6 @@ namespace XHWK.WKTool.UControl
                 TxtModify.Text = TbName.ToolTip.ToString();
                 TbName.Visibility = Visibility.Hidden;
                 GridModify.Visibility = Visibility.Visible;
-                //BtnNameModifyOK.Visibility = Visibility.Visible;
             }
         }
 
@@ -139,75 +137,66 @@ namespace XHWK.WKTool.UControl
         {
             if (TxtModify.Text != TbName.Text)
             {
-                if (ModifyPathName(VideoModel.FileGuid, TxtModify.Text + "." + VideoModel.VideoType, out string ErrMessage))
+                if (ModifyPathName(_videoModel.FileGuid, TxtModify.Text + "." + _videoModel.VideoType, out string errMessage))
                 {
                     //保存成功
                     TbName.Text = TxtModify.Text.Length > 11 ? TxtModify.Text.Substring(0, 11) + "..." : TxtModify.Text;
                     TbName.ToolTip = TxtModify.Text;
                     TbName.Visibility = Visibility.Visible;
                     GridModify.Visibility = Visibility.Hidden;
-                    //BtnNameModifyOK.Visibility = Visibility.Hidden;
                 }
                 else
                 {
-                    MessageWindow.Show(ErrMessage);
+                    MessageWindow.Show(errMessage);
                 }
             }
             else
             {
                 TbName.Visibility = Visibility.Visible;
                 GridModify.Visibility = Visibility.Hidden;
-                //BtnNameModifyOK.Visibility = Visibility.Hidden;
             }
         }
 
         /// <summary>
         /// 修改视频文件名
         /// </summary>
-        /// <param name="Guid">唯一编号</param>
-        /// <param name="NewName">新文件名带后缀 不带路径</param>
-        /// <param name="Errmessage">错误信息</param>
+        /// <param name="fileGuid"></param>
+        /// <param name="newName">新文件名带后缀 不带路径</param>
+        /// <param name="errmessage">错误信息</param>
         /// <returns></returns>
-        private bool ModifyPathName(string FileGuid, string NewName, out string Errmessage)
+        private bool ModifyPathName(string fileGuid, string newName, out string errmessage)
         {
-            Errmessage = "";
-            foreach (ModelWkData WKData in App.WKDataList)
+            errmessage = "";
+            foreach (ModelWkData wkData in App.WKDataList)
             {
-                if (WKData.VideoList.Exists(x => x.FileGuid == FileGuid))
+                if (wkData.VideoList.Exists(x => x.FileGuid == fileGuid))
                 {
-                    ModelVideo model_Video = WKData.VideoList.Find(x => x.FileGuid == FileGuid);
-                    string filePathName = model_Video.VideoPath;
+                    ModelVideo modelVideo = wkData.VideoList.Find(x => x.FileGuid == fileGuid);
+                    string filePathName = modelVideo.VideoPath;
                     string filePath = FileToolsCommon.GetDirectoryName(filePathName);
-                    string newFilePathName = filePath + NewName;
+                    string newFilePathName = filePath + newName;
                     //缩略图
-                    string ThumbnailPath = filePath + "ThumbnailPath/";
-                    FileToolsCommon.CreateDirectory(ThumbnailPath);
+                    string thumbnailPath = filePath + "ThumbnailPath/";
+                    FileToolsCommon.CreateDirectory(thumbnailPath);
                     //缩略图存储位置
-                    string ThumbnailPathName = ThumbnailPath + NewName.Replace(".", "") + ".JPG";
+                    string thumbnailPathName = thumbnailPath + newName.Replace(".", "") + ".JPG";
                     if (FileToolsCommon.IsExistFile(newFilePathName))
                     {
-                        Errmessage = "文件已存在，请重新修改文件名！";
+                        errmessage = "文件已存在，请重新修改文件名！";
                         return false;
                     }
-                    else
-                    {
-                        //修改文件名
-                        FileToolsCommon.Copy(filePathName, newFilePathName);
-                        model_Video.VideoPath = newFilePathName;
-                        //修改缩略图名
-                        FileToolsCommon.DeleteFile(ThumbnailPathName);
-                        FileToolsCommon.Copy(model_Video.ThumbnailPath, ThumbnailPathName);
-                        model_Video.ThumbnailPath = ThumbnailPathName;
-                        App.SaveWkData();
-                        return true;
-                    }
-                }
-                else
-                {
-                    continue;
+                    //修改文件名
+                    FileToolsCommon.Copy(filePathName, newFilePathName);
+                    modelVideo.VideoPath = newFilePathName;
+                    //修改缩略图名
+                    FileToolsCommon.DeleteFile(thumbnailPathName);
+                    FileToolsCommon.Copy(modelVideo.ThumbnailPath, thumbnailPathName);
+                    modelVideo.ThumbnailPath = thumbnailPathName;
+                    App.SaveWkData();
+                    return true;
                 }
             }
-            Errmessage = "视频文件有改动，当前文件不存在，请关闭后重新打开“我的”";
+            errmessage = "视频文件有改动，当前文件不存在，请关闭后重新打开“我的”";
             return false;
         }
 
@@ -231,18 +220,21 @@ namespace XHWK.WKTool.UControl
                     {
                         continue;
                     }
-                    if (wKData.VideoList.Exists(x => x.FileGuid == VideoModel.FileGuid))
+                    if (wKData.VideoList.Exists(x => x.FileGuid == _videoModel.FileGuid))
                     {
                         try
                         {
-                            FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == VideoModel.FileGuid).VideoPath);
-                            string ThumbnailPath = wKData.VideoList.Find(x => x.FileGuid == VideoModel.FileGuid).ThumbnailPath;
-                            wKData.VideoList.Remove(wKData.VideoList.Find(x => x.FileGuid == VideoModel.FileGuid));
+                            FileToolsCommon.DeleteFile(wKData.VideoList.Find(x => x.FileGuid == _videoModel.FileGuid).VideoPath);
+                            string thumbnailPath = wKData.VideoList.Find(x => x.FileGuid == _videoModel.FileGuid).ThumbnailPath;
+                            wKData.VideoList.Remove(wKData.VideoList.Find(x => x.FileGuid == _videoModel.FileGuid));
                             //初始化页面  刷新视频列表
-                            Click_refreshVideoList();
+                            if (ClickRefreshVideoList != null)
+                            {
+                                ClickRefreshVideoList();
+                            }
                             ImgVideo.Source = null;
                             GC.Collect();
-                            FileToolsCommon.DeleteFile(ThumbnailPath);
+                            FileToolsCommon.DeleteFile(thumbnailPath);
                             Visibility = Visibility.Hidden;
                             return;
                         }
@@ -264,7 +256,7 @@ namespace XHWK.WKTool.UControl
         {
             try
             {
-                ProcessStartInfo psi = new ProcessStartInfo(VideoModel.VideoPath);
+                ProcessStartInfo psi = new ProcessStartInfo(_videoModel.VideoPath);
                 Process pro = new Process
                 {
                     StartInfo = psi
@@ -275,7 +267,6 @@ namespace XHWK.WKTool.UControl
             {
                 LogHelper.Logerror.Error("【视频播放】(BtnVideoPlay_Click)" + ex.Message, ex);
                 System.Windows.MessageBox.Show(ex.Message);
-                return;
             }
         }
 
@@ -288,7 +279,7 @@ namespace XHWK.WKTool.UControl
         {
             try
             {
-                ProcessStartInfo psi = new ProcessStartInfo(VideoModel.VideoPath);
+                ProcessStartInfo psi = new ProcessStartInfo(_videoModel.VideoPath);
                 Process pro = new Process
                 {
                     StartInfo = psi
@@ -299,7 +290,6 @@ namespace XHWK.WKTool.UControl
             {
                 LogHelper.Logerror.Error("【视频播放】(BtnVideoPlay_Click)" + ex.Message, ex);
                 System.Windows.MessageBox.Show(ex.Message);
-                return;
             }
         }
 
@@ -315,7 +305,10 @@ namespace XHWK.WKTool.UControl
             if (App.IsLoginType == false)
             {
                 //登录
-                Click_UploadLogin();
+                if (ClickUploadLogin != null)
+                {
+                    ClickUploadLogin();
+                }
                 if (App.IsLoginType == false)
                 {
                     return;
@@ -324,35 +317,30 @@ namespace XHWK.WKTool.UControl
             if (!App.IsUpLoad)
             {
                 App.IsUpLoad = true;
-                //BtnUpload.IsEnabled = false;
-                //BtnUpload.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#9EA0A7"));
-                //BtnUpload.Foreground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#999999"));
-                DalUpload dAL_Upload = new DalUpload();
-                if (dAL_Upload.UploadVideo(VideoModel.FileGuid, out string ErrMessage))
+                DalUpload dAlUpload = new DalUpload();
+                if (dAlUpload.UploadVideo(_videoModel.FileGuid, out string errMessage))
                 {
                     App.IsUpLoad = false;
                     //MessageWindow.Show("视频上传服务器成功！");
-                    if (W_UploadWindow == null)
+                    if (_wUploadWindow == null)
                     {
-                        W_UploadWindow = new UploadWindow { Owner = App.W_XHMicroLessonSystemWindow };
-                        W_UploadWindow.ChangeTextEvents += frm_ChangeTextEvents;
-                        ;
+                        _wUploadWindow = new UploadWindow { Owner = App.W_XHMicroLessonSystemWindow };
+                        _wUploadWindow.ChangeTextEvents += frm_ChangeTextEvents;
                     }
 
                     //long size = Convert.ToInt64(FileToolsCommon.GetFileSizeByMB(pageData.menuList[i].FilePath));
-                    W_UploadWindow.Initialize
-                    (
+                    _wUploadWindow.Initialize(
                         TbName.Text,
-                        VideoModel.VideoSizebyte,
-                        VideoModel.VideoType.ToString(),
-                        VideoModel.FileGuid,
+                        _videoModel.VideoSizebyte,
+                        _videoModel.VideoType.ToString(),
+                        _videoModel.FileGuid,
                         0
                     );
                 }
                 else
                 {
                     App.IsUpLoad = false;
-                    MessageWindow.Show(ErrMessage);
+                    MessageWindow.Show(errMessage);
                 }
             }
         }
@@ -361,12 +349,12 @@ namespace XHWK.WKTool.UControl
         /// 上传返回事件
         /// </summary>
         /// <param name="text"></param>
+        /// <param name="i"></param>
         private void frm_ChangeTextEvents(string text, int i)
         {
             if ("上传成功".Equals(text))
             {
-                W_UploadWindow.Close();
-                //BorUploadBtn.Visibility = Visibility.Hidden;
+                _wUploadWindow.Close();
                 BtnUpload.IsEnabled = false;
                 BtnUpload.Background.Opacity = 0.6;
             }
@@ -383,7 +371,7 @@ namespace XHWK.WKTool.UControl
             {
                 App.W_VideoClipWindow = new VideoClipWindow();
             }
-            if (App.W_VideoClipWindow.InitClipVideo(VideoModel.VideoPath))
+            if (App.W_VideoClipWindow.InitClipVideo(_videoModel.VideoPath))
             {
                 App.W_VideoClipWindow.ShowDialog();
             }

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

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