zhao：增加视频上传

Common/Common.csproj

@@ -134,6 +134,7 @@
     <Compile Include="system\LogHelper.cs" />
     <Compile Include="system\PrimaryScreen.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="system\QueueSync.cs" />
     <Compile Include="system\SplashScreen.cs" />
     <Compile Include="system\XmlUtilHelper.cs" />
   </ItemGroup>

Common/system/FileToolsCommon.cs

@@ -562,6 +562,43 @@ namespace Common.system
                 fs.Close();
             }
         }
+        /// <summary>
+        /// 读取大文件用,读取文件前面指定长度字节数
+        /// </summary>
+        /// <param name="filePath">文件路径</param>
+        /// <param name="Length">读取长度,单位字节</param>
+        /// <returns></returns>
+        public static byte[] ReadBigFile(string filePath, int Length)
+        {
+            FileStream stream = new FileStream(filePath, FileMode.Open);
+            byte[] buffer = new byte[Length];
+            //stream.Position = startIndex;
+            stream.Read(buffer, 0, Length);
+            stream.Close();
+            stream.Dispose();
+            return buffer;
+        }
+        /// <summary>
+        /// 读取指定长度的流
+        /// </summary>
+        /// <param name="filePath">文件位置</param>
+        /// <param name="startIndex">开始位置</param>
+        /// <param name="Length">长度</param>
+        /// <returns></returns>
+        public static byte[] ReadBigFileSpecifyLength(string filePath, long startIndex, int Length)
+        {
+            FileStream stream = new FileStream(filePath, FileMode.Open);
+            if (startIndex + Length + 1 > stream.Length)
+            {
+                Length = (int)(stream.Length - startIndex);
+            }
+            byte[] buffer = new byte[Length];
+            stream.Position = startIndex;
+            stream.Read(buffer, 0, Length);
+            stream.Close();
+            stream.Dispose();
+            return buffer;
+        }
         #endregion
 
         #region 将文件读取到字符串中
@@ -598,6 +635,18 @@ namespace Common.system
                 reader.Close();
             }
         }
+        /// <summary>
+        /// 读取大文件用,读取文件前面指定长度字节的字符串
+        /// </summary>
+        /// <param name="filePath">文件路径</param>
+        /// <param name="Length">读取长度,单位字节</param>
+        /// <returns></returns>
+        public static string ReadBigFileStr(string filePath, int Length)
+        {
+            byte[] buffer =ReadBigFile(filePath, Length);
+            return Encoding.Default.GetString(buffer);
+        }
+       
         #endregion
 
         #region 从文件的绝对路径中获取文件名( 包含扩展名 )

Common/system/HttpHelper.cs

@@ -1,5 +1,8 @@
-using System;
+using Newtonsoft.Json.Linq;
+
+using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.IO;
 using System.Net;
 using System.Net.Security;
@@ -109,7 +112,7 @@ namespace Common.system
         {
             try
             {
-                var request = GetHttpWebRequest(url);
+                HttpWebRequest request = GetHttpWebRequest(url);
                 if (request != null)
                 {
                     string retval = null;
@@ -117,7 +120,7 @@ namespace Common.system
                     request.Method = "POST";
                     request.ServicePoint.Expect100Continue = false;
                     request.ContentType = "application/json; charset=utf-8";
-                    request.Timeout = 800;
+                    request.Timeout = 5000;
                     var bytes = System.Text.UTF8Encoding.UTF8.GetBytes(data);
                     request.ContentLength = bytes.Length;
                     using (var stream = request.GetRequestStream())
@@ -163,7 +166,7 @@ namespace Common.system
                     string respstr = GetStreamReader(url, responseStream, requestStream, streamReader, webResponse, timeout, encode, postData, contentType);
                     return JsonHelper.JsonToObj<T>(respstr);
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
                 }
                 finally
@@ -193,20 +196,354 @@ namespace Common.system
         }
         private static string GetStreamReader(string url, Stream responseStream, Stream requestStream, StreamReader streamReader, WebResponse webResponse, int timeout, string encode, string postData, string contentType)
         {
-            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;
-            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();
+            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;
+                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 ex)
+            {
+                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>
+        /// <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 == null || 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;
+
+                string strContent = strcontent;
+                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();
+
+            var boundarybytes = System.Text.Encoding.ASCII.GetBytes("\r\n--" +
+                                                                    boundary + "\r\n");
+            var 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);
+                var header = string.Format(headerTemplate, "file", files[i]);
+                var headerbytes = System.Text.Encoding.UTF8.GetBytes(header);
+
+                memStream.Write(headerbytes, 0, headerbytes.Length);
+
+                using (var fileStream = new FileStream(files[i], FileMode.Open, FileAccess.Read))
+                {
+                    var buffer = new byte[1024];
+                    var 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 (var 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 ex)
+            {
+                //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();
+                    //MessageBox.Show(returnValue);
+                    LogHelper.WriteInfoLog("【文件上传】" + returnValue);
+                }
+                return jobResult;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【文件上传】" + ex.Message, ex);
+                return null;
+            }
+            finally
+            {
+                httpReq = null;
+            }
+        }
     }
 }

Common/system/ImageHelper.cs

@@ -364,6 +364,7 @@ namespace Common.system
             try
             {
                 System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
+                //在位图中呈现UI元素
                 RenderTargetBitmap bmp = new RenderTargetBitmap(width, height, 96d, 96d,
                 PixelFormats.Pbgra32);
                 bmp.Render(ui);

XHWK.Model/Model_Video.cs

@@ -1,4 +1,6 @@
-namespace XHWK.Model
+using System.Collections.Generic;
+
+namespace XHWK.Model
 {
     /// <summary>
     /// 视频模型
@@ -11,6 +13,12 @@
         private Enum_WKVidetype _wkType;
         private string _RSTime;
         private string _videoSize;
+        private bool _IsUpload=false;
+        private string _FileGuid;//= System.Guid.NewGuid().ToString()
+        private string _FileMD5;
+        private string _Savefolder;
+        private int _Block;
+        private int _Uploaded;
         /// <summary>
         /// 视频路径
         /// </summary>
@@ -32,10 +40,35 @@
         /// </summary>
         public string RSTime { get => _RSTime; set => _RSTime = value; }
         /// <summary>
-        /// 视频大小
+        /// 视频大小MB
         /// </summary>
         public string VideoSize { get => _videoSize; set => _videoSize = value; }
+        /// <summary>
+        /// 是否已上传
+        /// </summary>
+        public bool IsUpload { get => _IsUpload; set => _IsUpload = value; }
+        /// <summary>
+        /// 文件唯一标示
+        /// </summary>
+        public string FileGuid { get => _FileGuid; set => _FileGuid = value; }
+        /// <summary>
+        /// 文件MD5
+        /// </summary>
+        public string FileMD5 { get => _FileMD5; set => _FileMD5 = value; }
+        /// <summary>
+        /// 文件保存地址 学校id/resource
+        /// </summary>
+        public string Savefolder { get => _Savefolder; set => _Savefolder = value; }
+        /// <summary>
+        /// 分块 每块最大5M
+        /// </summary>
+        public int Block { get => _Block; set => _Block = value; }
+        /// <summary>
+        /// 当前已上传到第几块
+        /// </summary>
+        public int Uploaded { get => _Uploaded; set => _Uploaded = value; }
     }
+
     /// <summary>
     /// 视频格式类型
     /// </summary>

XHWK.WKTool/App.config

@@ -18,5 +18,15 @@
     <add key="userName" value="" />
     <!--记住密码-->
     <add key="isRemind" value="" />
+    <!--API请求地址-->
+    <add key="APIRequestAddress" value="https://schoolapitest.xhkjedu.com"/>
+    <!--文件平台请求地址-->
+    <add key="FileRequestAddress" value="https://schoolfiletest.xhkjedu.com"/>
+    <!--<add key="FileRequestAddress" value="http://192.168.2.18:8908"/>-->
+    <!--展示文件服务器请求地址-->
+    <add key="schoolfileRequestAddress" value="https://schoolfiletest.xhkjedu.com"/>
+    <!--接口地址： https://schoolapitest.xhkjedu.com/
+    文件上传： https://schoolfiletest.xhkjedu.com/
+    展示文件:   https://schoolfiletest.xhkjedu.com/-->
   </appSettings>
 </configuration>

XHWK.WKTool/App.cs

@@ -108,6 +108,10 @@ namespace XHWK.WKTool
         /// 批注
         /// </summary>
         public static PracticeWindow W_PracticeWindow = null;
+        /// <summary>
+        /// 我的视频
+        /// </summary>
+        public static FileDirectoryWindow fileDirectoryWindow = null;
         #endregion
         #endregion
 

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -0,0 +1,109 @@
+using Common.system;
+
+using Newtonsoft.Json.Linq;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace XHWK.WKTool.DAL
+{
+    /// <summary>
+    /// 上传相关方法
+    /// 创建人：赵耀
+    /// 创建时间：2020年9月4日
+    /// </summary>
+    public class DAL_Upload
+    {
+        string APIRequestAddress = FileToolsCommon.GetConfigValue("APIRequestAddress");
+        string FileRequestAddress = FileToolsCommon.GetConfigValue("FileRequestAddress");
+        string schoolfileRequestAddress = FileToolsCommon.GetConfigValue("schoolfileRequestAddress");
+        /// <summary>
+        /// 文件是否允许上传
+        /// </summary>
+        /// <param name="MD5">MD5</param>
+        /// <param name="Message">错误消息</param>
+        /// <returns></returns>
+        public bool IsAllowUploaded(string MD5, out string Message)
+        {
+            Exception ex = null;
+            Message = "";//请求重试5次 共5秒
+            for (int num = 0; num < 5; num++)
+            {
+                try
+                {
+                    JObject jo = HttpHelper.PostFunction(FileRequestAddress + @"/chunkdb/isexist", @"application/x-www-form-urlencoded", @"md5=" + MD5, "");
+                    //0成功，1失败
+                    if(jo["code"].ToString()=="0")
+                    {
+                        if (string.IsNullOrWhiteSpace(jo["obj"].ToString()))
+                        {
+                            //不存在 允许上传
+                            return true;
+                        }
+                        else
+                        {
+                            //已存在 不允许上传
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        Message=jo["msg"].ToString();
+                        return false;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Message = e.Message;
+                    ex = e;
+                    Thread.Sleep(1000);
+                }
+            }
+            string ErrMessage = "【文件是否存在】(IsUploaded):请求失败。" + Message;
+            LogHelper.WriteErrLog(ErrMessage, ex);
+            return false;
+        }
+        /// <summary>
+        /// 上报文件合并指令
+        /// </summary>
+        /// <param name="Savefolder">保存文件位置  学校id/resource</param>
+        /// <param name="FileCode">文件唯一编号 Guid</param>
+        /// <param name="Message">错误信息</param>
+        /// <returns></returns>
+        public bool ReportFileMerge(string Savefolder,string FileCode, out string Message)
+        {
+            Exception ex = null;
+            Message = "";//请求重试5次 共5秒
+            for (int num = 0; num < 5; num++)
+            {
+                try
+                {
+                    JObject jo = HttpHelper.PostFunction(FileRequestAddress + @"/chunkdb/mergechunk", @"application/x-www-form-urlencoded", @"savefolder=" + Savefolder+ "&identifier="+ FileCode, "");
+                    //0成功，1失败
+                    if (jo["code"].ToString() == "0")
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        Message = jo["msg"].ToString();
+                        return false;
+                    }
+                }
+                catch (Exception e)
+                {
+                    Message = e.Message;
+                    ex = e;
+                    Thread.Sleep(1000);
+                }
+            }
+            string ErrMessage = "【上报合并文件】(ReportFileMerge):请求失败。" + Message;
+            LogHelper.WriteErrLog(ErrMessage, ex);
+            return false;
+        }
+    }
+}

XHWK.WKTool/DAL/Interface.cs

@@ -10,7 +10,9 @@ namespace XHWK.WKTool.DAL
 {
     public class Interface
     {
- 
+        string APIRequestAddress = FileToolsCommon.GetConfigValue("APIRequestAddress");
+        string FileRequestAddress = FileToolsCommon.GetConfigValue("FileRequestAddress");
+        string schoolfileRequestAddress = FileToolsCommon.GetConfigValue("schoolfileRequestAddress");
         /// <summary>
         /// 登陆
         /// </summary>
@@ -18,7 +20,7 @@ namespace XHWK.WKTool.DAL
         /// <returns></returns>
         public int Login(string loginname, string loginpwd)
         {
-            string url = "http://schoolapi.xhkjedu.com/user/login";//地址
+            string url = APIRequestAddress + "/user/login";//地址
             Dictionary<string, object> dic = new Dictionary<string, object>
             {
                 { "loginname", loginname},

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -1,5 +1,8 @@
-using System.Windows;
+using Org.BouncyCastle.Asn1.Crmf;
+using System.Collections.Generic;
+using System.Windows;
 using System.Windows.Input;
+using XHWK.Model;
 
 namespace XHWK.WKTool
 {
@@ -8,12 +11,57 @@ namespace XHWK.WKTool
     /// </summary>
     public partial class FileDirectoryWindow : Window
     {
+        /// <summary>
+        /// 视频模型
+        /// </summary>
+        List<Model_Video> model_VideoList =null;
         /// <summary>
         /// 文件目录
         /// </summary>
         public FileDirectoryWindow()
         {
             InitializeComponent();
+            Initialize();
+        } 
+        /// <summary>
+        /// 初始化
+        /// </summary>
+        public void Initialize()
+        {
+            //加载视频列表
+            LoadingVideoList();
+            //显示视频
+            foreach (Model_Video videoinfo in model_VideoList)
+            {
+                //是否已上传
+                //videoinfo.IsUpload;
+                //录制时间
+                //videoinfo.RSTime;
+                //文件大小
+                //videoinfo.VideoSize;
+                //文件缩略图路径
+                //videoinfo.ThumbnailPath;
+                //文件唯一标示 上传事件筛选需要上传的视频
+                //videoinfo.FileGuid;
+                //文件存储路径
+                //videoinfo.VidePath;
+            }
+        }
+        /// <summary>
+        /// 加载视频列表
+        /// </summary>
+        public void LoadingVideoList()
+        {
+            model_VideoList = new List<Model_Video>();
+            foreach(Model_WKData Vdata in APP.WKDataList)
+            {
+                if (Vdata.VideoList == null)
+                    continue;
+                foreach(Model_Video videoinfo in Vdata.VideoList)
+                {
+                    model_VideoList.Add(videoinfo);
+                }
+            }
         }
         /// <summary>
         /// 关闭

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -19,6 +19,9 @@ using Aspose.Slides;
 using static Common.system.PdfTrunImage;
 using TStudyDigitalPen.HID;
 using System.Drawing;
+using XHWK.WKTool.DAL;
+using System.Text;
+using System.Collections.Specialized;
 
 namespace XHWK.WKTool
 {
@@ -47,7 +50,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 图片
         /// </summary>
-        string [] ImgPDFPath = new string[300]; 
+        string[] ImgPDFPath = new string[300];
         #endregion
 
         #region 初始化
@@ -82,7 +85,6 @@ namespace XHWK.WKTool
         /// </summary>
         public void Initialize()
         {
-
             //创建 DrawingAttributes 类的一个实例  
             drawingAttributes = new DrawingAttributes();
             //将 InkCanvas 的 DefaultDrawingAttributes 属性的值赋成创建的 DrawingAttributes 类的对象的引用  
@@ -154,7 +156,7 @@ namespace XHWK.WKTool
                 {
                     Dispatcher.Invoke(() =>
                     {
-                        if(I>10010)
+                        if (I > 10010)
                         {
                             long time = Timestamp();
                             //string FilePathName = ImgPath + RsImgName.Count + ".png";
@@ -185,7 +187,7 @@ namespace XHWK.WKTool
             imgPlayer.Visibility = Visibility.Hidden;
             CameraHelper.CloseDevice();
             I = 9999;
-        } 
+        }
         #endregion
         #endregion
         /// <summary>
@@ -233,8 +235,54 @@ namespace XHWK.WKTool
                 Login();
                 return;
             }
-            FileDirectoryWindow fileDirectoryWindow = new FileDirectoryWindow();
-            fileDirectoryWindow.Show();
+            APP.fileDirectoryWindow = new FileDirectoryWindow();
+            APP.fileDirectoryWindow.Show();
+
+            #region 测试上传
+            //string path = "E:/临时文件/test.txt";
+            //string newpath = "E:/临时文件/test1.txt";
+            //string identifier = Guid.NewGuid().ToString();
+            //FileToolsCommon.CreateFile(newpath);
+            //DAL_Upload DU = new DAL_Upload();
+            //string FileRequestAddress = FileToolsCommon.GetConfigValue("FileRequestAddress");
+            //string url = FileRequestAddress+"/chunkdb/upchunk";
+            ////是否可以上传
+            //if (DU.IsAllowUploaded("TestABC", out string ErrMessage))
+            //{
+            //    long len = 0;
+            //    long filelen = 0;
+            //    //文件总长度
+            //    using (FileStream stream = new FileStream(path, FileMode.Open))
+            //    {
+            //        filelen = stream.Length;
+            //    }
+            //    //分块
+            //    for (int i = 0; len + 102400 < filelen; i++)
+            //    {
+            //        len = i * 102400;
+            //        //取指定长度的流
+            //        byte[] byteArray = FileToolsCommon.ReadBigFileSpecifyLength(path, len, 102400);
+            //        //参数
+            //        NameValueCollection formFields = new NameValueCollection();
+            //        formFields.Add("identifier", identifier);
+            //        formFields.Add("chunkNumber", (i + 1).ToString());
+            //        formFields.Add("filename", "test.txt");
+            //        formFields.Add("totalchunk", "13");
+            //        formFields.Add("md5", "TestABC");
+            //        HttpHelper.UploadRequestflow(url, byteArray, "test.txt", formFields);
+            //    }
+            //    //
+            //    bool isres=DU.ReportFileMerge(APP.UserInfo.Schoolid.ToString() + "/resource", identifier, out string Message);
+            //    if(!isres)
+            //    {
+            //        System.Windows.MessageBox.Show(Message);
+            //    }
+            //}
+            //else
+            //{
+            //    System.Windows.MessageBox.Show(ErrMessage);
+            //}
+            #endregion
         }
         /// <summary>
         /// 关闭事件
@@ -535,10 +583,10 @@ namespace XHWK.WKTool
         {
             if ("关闭窗口".Equals(text))
             {
-                if(!string.IsNullOrWhiteSpace(APP.ImgPath)&&File.Exists(APP.ImgPath))
+                if (!string.IsNullOrWhiteSpace(APP.ImgPath) && File.Exists(APP.ImgPath))
                 {
-                    APP.JPaths[APP.pageData.currpage]= APP.ImgPath;
-                    if(!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
+                    APP.JPaths[APP.pageData.currpage] = APP.ImgPath;
+                    if (!string.IsNullOrWhiteSpace(APP.JPaths[APP.pageData.currpage]))
                     {
                         imgCanvas.Source = new BitmapImage(new Uri(APP.JPaths[APP.pageData.currpage]));
                     }
@@ -717,7 +765,7 @@ namespace XHWK.WKTool
                         }
                     }
 
-              
+
                 }
             }
         }
@@ -819,7 +867,7 @@ namespace XHWK.WKTool
                     FileToolsCommon.CreateDirectory(AudioPathName);
                     AudioPathName += APP.WKData.WkName + ".MP3";
                     VideoSavePathName = RecordingPath + APP.WKData.WkName + "_录制." + VideoInfo.VideoType.ToString();
-                    
+
                     if (FileToolsCommon.IsExistFile(VideoSavePathName))
                     {
                         MessageBoxResult dr = System.Windows.MessageBox.Show("课程已录制，是否覆盖？", "提示", MessageBoxButton.OKCancel);
@@ -1083,18 +1131,18 @@ namespace XHWK.WKTool
             int pr = 1;
             string msg = string.Empty;
             string outPut = string.Empty;
-            LatticeFileHelper.GeneratingPDF(@"G:\101.pdf", @"G:\102.TPF",out pr, out msg, out outPut);
-            if(pr==0)
+            LatticeFileHelper.GeneratingPDF(@"G:\101.pdf", @"G:\102.TPF", out pr, out msg, out outPut);
+            if (pr == 0)
             {
-                outPut = outPut.Replace("[", "").Replace("]","").Replace("\"","").Trim();
+                outPut = outPut.Replace("[", "").Replace("]", "").Replace("\"", "").Trim();
                 APP.OutPut = outPut.Split(',');
                 string defa = string.Empty;
-             List<string>defaList=   LatticeFileHelper.GetPrinterList(out defa);
+                List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
 
                 int printResult = 1;
                 string standardError = string.Empty;
                 string standardOutput = string.Empty;
-                LatticeFileHelper.PrinterTPFFile(@"G:\102.TPF",1, /*defa*/"导出为WPS PDF", out printResult,out standardError,out standardOutput);
+                LatticeFileHelper.PrinterTPFFile(@"G:\102.TPF", 1, /*defa*/"导出为WPS PDF", out printResult, out standardError, out standardOutput);
 
             }
         }
@@ -1139,7 +1187,7 @@ namespace XHWK.WKTool
                 myblackboard.changepage(APP.pageData.currpage - 1);
                 if (APP.Paths.Length > 0)
                 {
-                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.Paths.Length&& APP.pageData.currpage > 0)
+                    if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage < APP.Paths.Length && APP.pageData.currpage > 0)
                     {
                         imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));
                     }
@@ -1183,10 +1231,10 @@ namespace XHWK.WKTool
                 myblackboard.changepage(APP.pageData.currpage - 1);
                 if (APP.Paths.Length > 0)
                 {
-                  
+
                     if (!string.IsNullOrWhiteSpace(txbCurrpage.Text) && APP.pageData.currpage <= APP.Paths.Length)
                     {
-                        imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage-1]));
+                        imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage - 1]));
                     }
                     else
                     {
@@ -1502,7 +1550,7 @@ namespace XHWK.WKTool
             {
                 myblackboard.changepages(0, 0, true);
             }));
-          
+
         }
 
         /// <summary>
@@ -1522,7 +1570,7 @@ namespace XHWK.WKTool
             {
                 APP.PenSerial = penSerial;
                 APP.PenStatus = false;
-           
+
                 Dispatcher.Invoke(new Action(() =>
                 {
                     txbNotConnected.Text = "未连接";
@@ -1559,7 +1607,7 @@ namespace XHWK.WKTool
                     txbNotConnected.Text = "已连接";
                     txbNotConnecteds.Text = "已连接";
                 }));
-              
+
             }
         }
         /// <summary>
@@ -1631,16 +1679,16 @@ namespace XHWK.WKTool
                 double PropW = blackboard_canvas.ActualWidth / A4_WIDTH;
                 double PropH = blackboard_canvas.ActualHeight / A4_HEIGHT;
                 //点
-                double testX=(double)cx * PropW;
-                double testY=(double)cy * PropH;
+                double testX = (double)cx * PropW;
+                double testY = (double)cy * PropH;
                 //pageSerial //点阵IP地址  与打印的页面关联
 
                 Dispatcher.Invoke(new Action(() =>
                 {
-                    myblackboard.changepages(testX, testY,false);
+                    myblackboard.changepages(testX, testY, false);
                 }));
 
-             
+
                 ////每3个点画一条曲线
                 //if (stroke.Count % 3 == 0)
                 //{
@@ -1712,8 +1760,8 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnShrink_Click(object sender, RoutedEventArgs e)
         {
-            if(Visibility== Visibility.Hidden)
-            Visibility = Visibility.Visible;
+            if (Visibility == Visibility.Hidden)
+                Visibility = Visibility.Visible;
             else
                 Visibility = Visibility.Hidden;
         }

XHWK.WKTool/XHWK.WKTool.csproj

@@ -68,6 +68,10 @@
     <Reference Include="log4net">
       <HintPath>..\Common\dlls\log4net.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\Common\dlls\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
@@ -113,6 +117,7 @@
     <Compile Include="CountdownWindow.xaml.cs">
       <DependentUpon>CountdownWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="DAL\DAL_Upload.cs" />
     <Compile Include="DAL\Interface.cs" />
     <Compile Include="DAL\ResultVo.cs" />
     <Compile Include="FileDirectoryWindow.xaml.cs">