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

Common/AESHelper.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Common
+{
+    /// <summary>
+    /// AES加密
+    /// 创建人：赵耀
+    /// 创建时间：2020年9月7日
+    /// </summary>
+    public class AESHelper
+    {
+        public static string QrcodeLoginKey = "zyyxhlywkdatakey";
+
+        /// <summary>
+        /// AES 加密
+        /// </summary>
+        /// <param name="content">Need encrypted string</param>
+        /// <returns>Encrypted 16 hex string</returns>
+        public static string AESEncrypt(String Data)
+        {
+            string key = QrcodeLoginKey.PadRight(16, '0');
+            // 256-AES key      
+            byte[] keyArray = UTF8Encoding.ASCII.GetBytes(key);
+            byte[] toEncryptArray = UTF8Encoding.ASCII.GetBytes(Data);
+
+            RijndaelManaged rDel = new RijndaelManaged();
+            rDel.Key = keyArray;
+            rDel.Mode = CipherMode.ECB;
+            rDel.Padding = PaddingMode.PKCS7;
+
+            ICryptoTransform cTransform = rDel.CreateEncryptor();
+            byte[] resultArray = cTransform.TransformFinalBlock(toEncryptArray, 0,
+                    toEncryptArray.Length);
+
+            return BytesToHexString(resultArray);
+        }
+
+        /// <summary>
+        /// AES 解密
+        /// </summary>
+        /// <param name="hexString">Encrypted 16 hex string</param>
+        /// <returns>Decrypted string</returns>
+        public static string AESDecrypt(String hexString)
+        {
+            string key = QrcodeLoginKey.PadRight(16, '0');
+            // 256-AES key      
+            byte[] keyArray = UTF8Encoding.ASCII.GetBytes(key);
+            byte[] toEncryptArray = HexStringToBytes(hexString);
+
+            RijndaelManaged rDel = new RijndaelManaged();
+            rDel.Key = keyArray;
+            rDel.Mode = CipherMode.ECB;
+            rDel.Padding = PaddingMode.PKCS7;
+
+            ICryptoTransform cTransform = rDel.CreateDecryptor();
+            byte[] resultArray = cTransform.TransformFinalBlock(toEncryptArray, 0,
+                    toEncryptArray.Length);
+
+            return UTF8Encoding.ASCII.GetString(resultArray);
+        }
+
+        /// <summary>
+        /// Byte array to convert 16 hex string
+        /// </summary>
+        /// <param name="bytes">byte array</param>
+        /// <returns>16 hex string</returns>
+        public static string BytesToHexString(byte[] bytes)
+        {
+            StringBuilder returnStr = new StringBuilder();
+            if (bytes != null || bytes.Length == 0)
+            {
+                for (int i = 0; i < bytes.Length; i++)
+                {
+                    returnStr.Append(bytes[i].ToString("X2"));
+                }
+            }
+            return returnStr.ToString();
+        }
+
+        /// <summary>
+        /// 16 hex string converted to byte array
+        /// </summary>
+        /// <param name="hexString">16 hex string</param>
+        /// <returns>byte array</returns>
+        public static byte[] HexStringToBytes(String hexString)
+        {
+            if (hexString == null || hexString.Equals(""))
+            {
+                return null;
+            }
+            int length = hexString.Length / 2;
+            if (hexString.Length % 2 != 0)
+            {
+                return null;
+            }
+            byte[] d = new byte[length];
+            for (int i = 0; i < length; i++)
+            {
+                d[i] = Convert.ToByte(hexString.Substring(i * 2, 2), 16);
+            }
+            return d;
+        }
+    }
+}

Common/Common.csproj

@@ -116,6 +116,7 @@
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AESHelper.cs" />
     <Compile Include="Model\DownloadInfoModel.cs" />
     <Compile Include="system\LatticeFileHelper.cs" />
     <Compile Include="system\PdfTrunImage.cs" />

Common/system/BlackboardNew.cs

@@ -332,7 +332,7 @@ namespace Common.system
         StylusPointCollection stylusPoints = new StylusPointCollection();
         StylusPoint stylusPoint = new StylusPoint();
         Stroke stroke;
-        bool isFirst = true;
+        //bool isFirst = true;
         //public void changepages(double _x, double _y, bool _new, Color _color, int _size)
         //{
         //    if (_new)

Common/system/QueueSync.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Common.system
+{
+    /// <summary>
+    /// 队列操作类 默认队列数1000
+    /// 创建人：赵耀
+    /// 创建时间：2019年8月22日
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class QueueSync<T>
+    {
+        int _maxcount = 10000;
+        Queue<T> _queue = new Queue<T>();
+        /// <summary>
+        /// 获取该队列包含的元素数
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                if (_queue == null)
+                {
+                    return 0;
+                }
+                else
+                {
+                    return _queue.Count;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 默认1000
+        /// </summary>
+        public QueueSync() : this(1000) { }
+
+        /// <summary>
+        /// 定义一个指定容量的队列
+        /// </summary>
+        /// <param name="maxcount"></param>
+        public QueueSync(int maxcount)
+        {
+            //_maxcount = Math.Max(maxcount, _maxcount);
+            _maxcount = maxcount;
+        }
+
+        /// <summary>
+        /// 入队列
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public bool Enqueue(T obj)
+        {
+            bool result = false;
+            lock (this)
+            {
+                if (_queue.Count > _maxcount)
+                {
+                    _queue.Dequeue();
+                }
+                _queue.Enqueue(obj);
+                result = true;
+            }
+            return result;
+        }
+        /// <summary>
+        /// 出队列
+        /// </summary>
+        /// <returns></returns>
+        public T Dequeue()
+        {
+            T obj = default(T);
+            lock (this)
+            {
+                try
+                {
+                    obj = _queue.Dequeue();
+                }
+                catch
+                {
+
+                }
+            }
+            return obj;
+        }
+    }
+}

XHWK.Model/Model_Video.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Runtime.Remoting.Messaging;
 
 namespace XHWK.Model
 {
@@ -7,7 +8,7 @@ namespace XHWK.Model
     /// </summary>
     public class Model_Video
     {
-        private string _videPath;
+        private string _videoPath;
         private string _thumbnailPath;
         private Enum_VideoType _videoType;
         private Enum_WKVidetype _wkType;
@@ -19,10 +20,11 @@ namespace XHWK.Model
         private string _Savefolder;
         private int _Block;
         private int _Uploaded;
+        private long _SliceLen;
         /// <summary>
         /// 视频路径
         /// </summary>
-        public string VidePath { get => _videPath; set => _videPath = value; }
+        public string VideoPath { get => _videoPath; set => _videoPath = value; }
         /// <summary>
         /// 缩略图路径
         /// </summary>
@@ -67,6 +69,10 @@ namespace XHWK.Model
         /// 当前已上传到第几块
         /// </summary>
         public int Uploaded { get => _Uploaded; set => _Uploaded = value; }
+        /// <summary>
+        /// 视频每片长度
+        /// </summary>
+        public long SliceLen { get => _SliceLen; set => _SliceLen = value; }
     }
 
     /// <summary>

XHWK.WKTool/App.config

@@ -30,5 +30,7 @@
     展示文件:   https://schoolfiletest.xhkjedu.com/-->
     <!--摄像头位置 1.右上 2.左上 3.右下 4.左下-->
     <add key="CameraPosition" value=""/>
+    <!--上传每片大小 Mb-->
+    <add key="UploadSliceLen" value="1"/>
   </appSettings>
 </configuration>

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -23,7 +23,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 计时器
         /// </summary>
-        new System.Timers.Timer timer;
+        System.Timers.Timer timer;
         int ImgNum = 3;
         public void Initialize(int changeTime=650)
         {

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -120,7 +120,7 @@ namespace XHWK.WKTool
                 //APP.W_XHMicroLessonSystemWindow .Topmost = true;
             }
             this.Hide();
-            APP.W_XHMicroLessonSystemWindow.ShowDialog();
+            APP.W_XHMicroLessonSystemWindow.Show();
           
         }
         /// <summary>

XHWK.WKTool/DAL/DAL_Upload.cs

@@ -1,14 +1,19 @@
-using Common.system;
+using Common;
+using Common.system;
 
 using Newtonsoft.Json.Linq;
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
+using XHWK.Model;
+
 namespace XHWK.WKTool.DAL
 {
     /// <summary>
@@ -37,7 +42,7 @@ namespace XHWK.WKTool.DAL
                 {
                     JObject jo = HttpHelper.PostFunction(FileRequestAddress + @"/chunkdb/isexist", @"application/x-www-form-urlencoded", @"md5=" + MD5, "");
                     //0成功，1失败
-                    if(jo["code"].ToString()=="0")
+                    if (jo["code"].ToString() == "0")
                     {
                         if (string.IsNullOrWhiteSpace(jo["obj"].ToString()))
                         {
@@ -52,7 +57,7 @@ namespace XHWK.WKTool.DAL
                     }
                     else
                     {
-                        Message=jo["msg"].ToString();
+                        Message = jo["msg"].ToString();
                         return false;
                     }
                 }
@@ -74,7 +79,7 @@ namespace XHWK.WKTool.DAL
         /// <param name="FileCode">文件唯一编号 Guid</param>
         /// <param name="Message">错误信息</param>
         /// <returns></returns>
-        public bool ReportFileMerge(string Savefolder,string FileCode, out string Message)
+        public bool ReportFileMerge(string Savefolder, string FileCode, out string Message)
         {
             Exception ex = null;
             Message = "";//请求重试5次 共5秒
@@ -82,7 +87,7 @@ namespace XHWK.WKTool.DAL
             {
                 try
                 {
-                    JObject jo = HttpHelper.PostFunction(FileRequestAddress + @"/chunkdb/mergechunk", @"application/x-www-form-urlencoded", @"savefolder=" + Savefolder+ "&identifier="+ FileCode, "");
+                    JObject jo = HttpHelper.PostFunction(FileRequestAddress + @"/chunkdb/mergechunk", @"application/x-www-form-urlencoded", @"savefolder=" + Savefolder + "&identifier=" + FileCode, "");
                     //0成功，1失败
                     if (jo["code"].ToString() == "0")
                     {
@@ -105,5 +110,88 @@ namespace XHWK.WKTool.DAL
             LogHelper.WriteErrLog(ErrMessage, ex);
             return false;
         }
+
+        /// <summary>
+        /// 上传视频
+        /// </summary>
+        /// <returns></returns>
+        public bool UploadVideo(string VideoGuid, out string ErrMessage)
+        {
+            ErrMessage = "";
+            try
+            {
+                Model_Video VideoInfo = APP.VideoList.Find(x => x.FileGuid == VideoGuid);
+                string UploadUrl = FileRequestAddress + "/chunkdb/upchunk";
+                if (VideoInfo.IsUpload)
+                {
+                    ErrMessage = "视频已上传";
+                    return false;
+                }
+                else
+                {
+                    if (string.IsNullOrWhiteSpace(VideoInfo.FileMD5))
+                    {
+                        VideoInfo.FileMD5 = AESHelper.AESEncrypt(FileToolsCommon.ReadBigFileStr(VideoInfo.VideoPath, 1024));
+                    }
+                    if (IsAllowUploaded(VideoInfo.FileMD5, out ErrMessage))
+                    {
+                        //视频长度
+                        long filelen = FileToolsCommon.GetFileSize(VideoInfo.VideoPath);
+                        //每片的长度
+                        double UploadSliceLenMB = double.Parse(FileToolsCommon.GetConfigValue("UploadSliceLen"));
+                        if (VideoInfo.SliceLen == 0)
+                        {
+                            VideoInfo.SliceLen = (long)(UploadSliceLenMB * 1024 * 1024);
+                            VideoInfo.Block = (int)(filelen / VideoInfo.SliceLen + (filelen % VideoInfo.SliceLen > 0 ? 1 : 0));
+                        }
+                        //已上传长度
+                        long len = VideoInfo.Uploaded * VideoInfo.SliceLen;
+                        string fileName = FileToolsCommon.GetFileName(VideoInfo.VideoPath);
+                        //分块
+                        for (; len + VideoInfo.SliceLen < filelen; VideoInfo.Uploaded++)
+                        {
+                            len = VideoInfo.Uploaded * VideoInfo.SliceLen;
+                            //取指定长度的流
+                            byte[] byteArray = FileToolsCommon.ReadBigFileSpecifyLength(VideoInfo.VideoPath, len, 102400);
+                            //参数
+                            NameValueCollection formFields = new NameValueCollection();
+                            formFields.Add("identifier", VideoInfo.FileGuid);
+                            formFields.Add("chunkNumber", (VideoInfo.Uploaded + 1).ToString());
+                            formFields.Add("filename", fileName);
+                            formFields.Add("totalchunk", VideoInfo.Block.ToString());
+                            formFields.Add("md5", VideoInfo.FileMD5);
+                            JObject jo = HttpHelper.UploadRequestflow(UploadUrl, byteArray, fileName, formFields);
+                            //0成功，1失败
+                            if (jo["code"].ToString() != "0")
+                            {
+                                ErrMessage = jo["msg"].ToString();
+                                return false;
+                            }
+                        }
+                        //合并文件
+                        bool isres = ReportFileMerge(APP.UserInfo.Schoolid.ToString() + "/resource", VideoInfo.FileGuid, out ErrMessage);
+                        if (isres)
+                        {
+                            return true;
+                        }
+                        else
+                        {
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        ErrMessage = "上传失败：" + ErrMessage;
+                        return false;
+                    }
+                }
+
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteErrLog("【视频上传】（UploadVideo）视频上传失败：" + ex.Message, ex);
+            }
+            return false;
+        }
     }
 }

XHWK.WKTool/FileDirectoryWindow.xaml.cs

@@ -9,6 +9,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using XHWK.Model;
+using XHWK.WKTool.DAL;
 
 namespace XHWK.WKTool
 {
@@ -77,12 +78,12 @@ namespace XHWK.WKTool
                 pageData.menuList.Add(new FileDirectoryModel()
                 {
                     SerialNumber = i,
-                    VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VidePath),
+                    VideoName = Common.system.FileToolsCommon.GetIOFileName(videoinfo.VideoPath),
                     VideoDuration = 0,
                     VideoSize = videoinfo.VideoSize,
                     VideoTime = videoinfo.RSTime,
                     IsEnabled = false,
-                    Path = videoinfo.VidePath,
+                    Path = videoinfo.VideoPath,
                     Colour = colour,
                     Visi = vis,
                     Coll=cos,

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -186,7 +186,7 @@ namespace XHWK.WKTool
                             try
                             {
                                 FileToolsCommon.DeleteFile(VideoSavePathName);
-                                APP.VideoList.RemoveAll(x => x.VidePath == VideoSavePathName);
+                                APP.VideoList.RemoveAll(x => x.VideoPath == VideoSavePathName);
                             }
                             catch (Exception ex)
                             {
@@ -291,7 +291,7 @@ namespace XHWK.WKTool
                         FileToolsCommon.DeleteFile(ThumbnailPathName);
                         VideoInfo.VideoSize = FileToolsCommon.GetFileSizeByMB(VideoSavePathName).ToString() + " MB";
                         VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                        VideoInfo.VidePath = VideoSavePathName;
+                        VideoInfo.VideoPath = VideoSavePathName;
                         VideoInfo.ThumbnailPath = ThumbnailPathName;
                         APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName);
                         VideoInfo.FileGuid = Guid.NewGuid().ToString();

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -8,7 +8,7 @@
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
         Title="XHMicroLessonSystemWindow" Height="1040.8" Width="875" WindowStartupLocation="CenterScreen"
-    WindowStyle="None"    AllowsTransparency="True"  Background="#EFF1F8"
+    WindowStyle="None"    AllowsTransparency="True"  Background="#EFF1F8" ShowInTaskbar="True"
    >
     
     <Viewbox>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -310,52 +310,6 @@ namespace XHWK.WKTool
                 Initialize();
             }
             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>
         /// 关闭事件
@@ -1013,6 +967,7 @@ namespace XHWK.WKTool
             long timestr = Convert.ToInt64(ts.TotalMilliseconds);
             return timestr;
         }
+
         #region 录制窗口
         #region 变量
         /// <summary>
@@ -1140,7 +1095,7 @@ namespace XHWK.WKTool
                             try
                             {
                                 FileToolsCommon.DeleteFile(VideoSavePathName);
-                                APP.VideoList.RemoveAll(x => x.VidePath == VideoSavePathName);
+                                APP.VideoList.RemoveAll(x => x.VideoPath == VideoSavePathName);
                             }
                             catch (Exception ex)
                             {
@@ -1320,7 +1275,7 @@ namespace XHWK.WKTool
                         FileToolsCommon.DeleteFile(ThumbnailPathName);
                         VideoInfo.VideoSize = FileToolsCommon.GetFileSizeByMB(VideoSavePathName).ToString() + " MB";
                         VideoInfo.RSTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-                        VideoInfo.VidePath = VideoSavePathName;
+                        VideoInfo.VideoPath = VideoSavePathName;
                         VideoInfo.ThumbnailPath = ThumbnailPathName;
                         APP.FFmpeg.GenerateThumbnails(VideoSavePathName, ThumbnailPathName);
                         VideoInfo.FileGuid = Guid.NewGuid().ToString();