正式环境发版

XHWK.WKTool/App.config

@@ -5,10 +5,10 @@
   </startup>
   <appSettings>
     <!--0正式 1测试-->
-    <add key="IsDebug" value="1" />
+    <add key="IsDebug" value="0" />
     <!--版本号-->
-    <add key="VersionCode" value="132" />
-    <add key="VersionName" value="3.13.5" />
+    <add key="VersionCode" value="133" />
+    <add key="VersionName" value="3.13.6" />
     <!--皮肤样式 0白 1蓝 2黑色 -->
     <add key="SkinStyle" value="0" />
     <!--是否输出视频记录日志：0否-->

XHWK.WKTool/DAL/DalUpload.cs

@@ -14,7 +14,7 @@ namespace XHWK.WKTool.DAL
     using system;
 
     /// <summary>
-    /// 上传相关方法 创建人：赵耀 创建时间：2020年9月4日
+    ///     上传相关方法 创建人：赵耀 创建时间：2020年9月4日
     /// </summary>
     public class DalUpload
     {
@@ -22,13 +22,13 @@ namespace XHWK.WKTool.DAL
 
         //private string schoolfileRequestAddress = APP.showImageUrl;
         /// <summary>
-        /// 文件是否允许上传
+        ///     文件是否允许上传
         /// </summary>
         /// <param name="md5">
-        /// MD5
+        ///     MD5
         /// </param>
         /// <param name="message">
-        /// 错误消息
+        ///     错误消息
         /// </param>
         /// <returns>
         /// </returns>
@@ -65,27 +65,31 @@ namespace XHWK.WKTool.DAL
                     Thread.Sleep(1000);
                 }
             }
-
             string errMessage = "【文件是否存在】(IsUploaded):请求失败。" + message;
             LogHelper.Logerror.Error(errMessage, ex);
             return false;
         }
 
         /// <summary>
-        /// 上报文件合并指令
+        ///     上报文件合并指令
         /// </summary>
         /// <param name="savefolder">
-        /// 保存文件位置 学校id/resource
+        ///     保存文件位置 学校id/resource
         /// </param>
         /// <param name="fileCode">
-        /// 文件唯一编号 Guid
+        ///     文件唯一编号 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秒
@@ -119,14 +123,13 @@ namespace XHWK.WKTool.DAL
                     Thread.Sleep(1000);
                 }
             }
-
             string errMessage = "【上报合并文件】(ReportFileMerge):请求失败。" + message;
             LogHelper.Logerror.Error(errMessage, ex);
             return false;
         }
 
         /// <summary>
-        /// 上传视频
+        ///     上传视频
         /// </summary>
         /// <returns>
         /// </returns>
@@ -155,13 +158,11 @@ namespace XHWK.WKTool.DAL
                         break;
                     }
                 }
-
                 if (videoInfo == null)
                 {
                     errMessage = "未找到课程！";
                     return false;
                 }
-
                 if (videoInfo.IsUpload)
                 {
                     errMessage = "视频已上传";
@@ -177,7 +178,7 @@ namespace XHWK.WKTool.DAL
         }
 
         /// <summary>
-        /// 上传视频
+        ///     上传视频
         /// </summary>
         /// <returns>
         /// </returns>
@@ -206,7 +207,6 @@ namespace XHWK.WKTool.DAL
                         break;
                     }
                 }
-
                 if (videoInfo == null)
                 {
                     errMessage = "未找到课程！";
@@ -218,142 +218,122 @@ namespace XHWK.WKTool.DAL
                     errMessage = "视频已上传";
                     return false;
                 }
-                else
+                if (string.IsNullOrWhiteSpace(videoInfo.FileMD5))
                 {
-                    if (string.IsNullOrWhiteSpace(videoInfo.FileMD5))
-                    {
-                        videoInfo.FileMD5 = AesHelper.AesEncrypt(FileToolsCommon.ReadBigFileStr(videoInfo.VideoPath, 1024));
-                    }
+                    videoInfo.FileMD5 = AesHelper.AesEncrypt(FileToolsCommon.ReadBigFileStr(videoInfo.VideoPath, 1024));
+                }
 
-                    //视频长度
-                    long filelen = FileToolsCommon.GetFileSize(videoInfo.VideoPath);
-                    //每片的长度
-                    double uploadSliceLenMb = double.Parse(FileToolsCommon.GetConfigValue("UploadSliceLen"));
-                    string fileName = FileToolsCommon.GetFileName(videoInfo.VideoPath);
-                    //是否续传
-                    //分块数为0时 从未上传过
-                    if (videoInfo.Block > 0)
+                //视频长度
+                long filelen = FileToolsCommon.GetFileSize(videoInfo.VideoPath);
+                //每片的长度
+                double uploadSliceLenMb = double.Parse(FileToolsCommon.GetConfigValue("UploadSliceLen"));
+                string fileName = FileToolsCommon.GetFileName(videoInfo.VideoPath);
+                //是否续传
+                //分块数为0时 从未上传过
+                if (videoInfo.Block > 0)
+                {
+                    //是否已上传所有分块
+                    if (videoInfo.Block > videoInfo.Uploaded)
                     {
-                        //是否已上传所有分块
-                        if (videoInfo.Block > videoInfo.Uploaded)
-                        {
-                            //已上传，未上传完
-                        }
-                        else
-                        {
-                            //上传完,未合并
-
-                            #region 合并文件
-
-                            //合并文件
-                            bool isres = ReportFileMerge
-                            (
-                                App.UserInfo.cloudcode + "/" + App.UserInfo.Schoolid.ToString() + "/resource",
-                                videoInfo.FileGuid,
-                                out errMessage
-                            );
-                            if (isres)
-                            {
-                                videoInfo.IsUpload = true;
-                                return true;
-                            }
-                            else
-                            {
-                                return false;
-                            }
-
-                            #endregion 合并文件
-                        }
+                        //已上传，未上传完
                     }
                     else
                     {
-                        //是否允许上传
-                        if (IsAllowUploaded(videoInfo.FileMD5, out errMessage))
-                        {
-                            if (videoInfo.SliceLen == 0)
-                            {
-                                videoInfo.SliceLen = (long)(uploadSliceLenMb * 1024 * 1024);
-                                videoInfo.Block = (int)(filelen / videoInfo.SliceLen +
-                                                        (filelen % videoInfo.SliceLen > 0 ? 1 : 0));
-                            }
-                        }
-                        else
-                        {
-                            //文件在服务器上已存在  空间是否存在未知 若增加空间是否存在判断在此处添加
-                            videoInfo.Block = 1;
-                            videoInfo.Uploaded = 1;
-
-                            videoInfo.IsUpload = true;
-                            return true;
-                        }
-                    }
-
-                    ////临时修改 没有断点续传，每次上传都重新上传。
-                    //VideoInfo.Uploaded = 0;
-                    {
-                        //已上传长度
-                        long len;
-
-                        //分块
-                        do
-                        {
-                            len = videoInfo.Uploaded * videoInfo.SliceLen;
-                            //取指定长度的流
-                            byte[] byteArray = FileToolsCommon.ReadBigFileSpecifyLength(videoInfo.VideoPath, len,
-                                (int)videoInfo.SliceLen);
-                            //参数
-                            NameValueCollection formFields = new NameValueCollection
-                            {
-                                { "identifier", videoInfo.FileGuid },
-                                { "chunkNumber", (videoInfo.Uploaded + 1).ToString() },
-                                { "filename", fileName },
-                                { "totalchunk", videoInfo.Block.ToString() },
-                                { "md5", videoInfo.FileMD5 }
-                            };
-                            //formFields.Add();///教材
-                            //if()//章节若没选不传
-                            //{
-                            //    formFields.Add();
-                            //}
-                            JObject jo = ZHttpUtil.UploadFile(
-                                uploadUrl,
-                                byteArray,
-                                fileName,
-                                formFields
-                            );
-                            //0成功，1失败
-                            if (jo["code"]?.ToString() != "0")
-                            {
-                                errMessage = jo["msg"]?.ToString();
-                                return false;
-                            }
-                            else
-                            {
-                                videoInfo.Uploaded++;
-                            }
-                        } while (len + videoInfo.SliceLen < filelen);
+                        //上传完,未合并
 
                         #region 合并文件
 
                         //合并文件
-                        bool isres = ReportFileMerge
-                        (
+                        bool isres = ReportFileMerge(
                             App.UserInfo.cloudcode + "/" + App.UserInfo.Schoolid.ToString() + "/resource",
                             videoInfo.FileGuid,
                             out errMessage
                         );
                         if (isres)
                         {
-                            //VideoInfo.IsUpload = true;
                             return true;
                         }
-                        else
+                        return false;
+
+                        #endregion 合并文件
+                    }
+                }
+                else
+                {
+                    //是否允许上传
+                    if (IsAllowUploaded(videoInfo.FileMD5, out errMessage))
+                    {
+                        if (videoInfo.SliceLen == 0)
+                        {
+                            videoInfo.SliceLen = (long)(uploadSliceLenMb * 1024 * 1024);
+                            videoInfo.Block = (int)(filelen / videoInfo.SliceLen + (filelen % videoInfo.SliceLen > 0 ? 1 : 0));
+                        }
+                    }
+                    else
+                    {
+                        //文件在服务器上已存在  空间是否存在未知 若增加空间是否存在判断在此处添加
+                        videoInfo.Block = 1;
+                        videoInfo.Uploaded = 1;
+                        return true;
+                    }
+                }
+
+                ////临时修改 没有断点续传，每次上传都重新上传。
+                //VideoInfo.Uploaded = 0;
+                {
+                    //已上传长度
+                    long len;
+
+                    //分块
+                    do
+                    {
+                        len = videoInfo.Uploaded * videoInfo.SliceLen;
+                        //取指定长度的流
+                        byte[] byteArray = FileToolsCommon.ReadBigFileSpecifyLength(
+                            videoInfo.VideoPath,
+                            len,
+                            (int)videoInfo.SliceLen
+                        );
+                        //参数
+                        NameValueCollection formFields = new NameValueCollection
+                        {
+                            { "identifier", videoInfo.FileGuid },
+                            { "chunkNumber", (videoInfo.Uploaded + 1).ToString() },
+                            { "filename", fileName },
+                            { "totalchunk", videoInfo.Block.ToString() },
+                            { "md5", videoInfo.FileMD5 }
+                        };
+                        JObject jo = ZHttpUtil.UploadFile(
+                            uploadUrl,
+                            byteArray,
+                            fileName,
+                            formFields
+                        );
+                        //0成功，1失败
+                        if (jo["code"]?.ToString() != "0")
                         {
+                            errMessage = jo["msg"]?.ToString();
                             return false;
                         }
+                        videoInfo.Uploaded++;
+                    }
+                    while (len + videoInfo.SliceLen < filelen);
 
-                        #endregion 合并文件
+                    #region 合并文件
+
+                    //合并文件
+                    bool isres = ReportFileMerge(
+                        App.UserInfo.cloudcode + "/" + App.UserInfo.Schoolid + "/resource",
+                        videoInfo.FileGuid,
+                        out errMessage
+                    );
+                    if (isres)
+                    {
+                        return true;
                     }
+                    return false;
+
+                    #endregion 合并文件
                 }
             }
             catch (Exception ex)
@@ -363,4 +343,4 @@ namespace XHWK.WKTool.DAL
             return false;
         }
     }
-}
+}

XHWK.WKTool/UploadWindow.xaml.cs

@@ -50,7 +50,7 @@ namespace XHWK.WKTool
         private string _guid = string.Empty;
 
         //定义事件
-        public event ChangeTextHandlers ChangeTextEvents;
+        public event ChangeTextHandlers ResultEvents;
 
         /// <summary>
         /// 当前视频的下标
@@ -374,9 +374,9 @@ namespace XHWK.WKTool
                                 Hide();
                                 tip_outer.Visibility = Visibility.Collapsed;
                                 MessageWindow.Show("视频上传成功！");
-                                if (ChangeTextEvents != null)
+                                if (ResultEvents != null)
                                 {
-                                    ChangeTextEvents("上传成功", _i);
+                                    ResultEvents("上传成功", _i);
                                 }
                             }
                         );

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

@@ -325,7 +325,7 @@ namespace XHWK.WKTool.UControl
                     if (_wUploadWindow == null)
                     {
                         _wUploadWindow = new UploadWindow { Owner = App.W_XHMicroLessonSystemWindow };
-                        _wUploadWindow.ChangeTextEvents += frm_ChangeTextEvents;
+                        _wUploadWindow.ResultEvents += FrmResultEvents;
                     }
 
                     //long size = Convert.ToInt64(FileToolsCommon.GetFileSizeByMB(pageData.menuList[i].FilePath));
@@ -346,11 +346,11 @@ namespace XHWK.WKTool.UControl
         }
 
         /// <summary>
-        /// 上传返回事件
+        ///     上传返回事件
         /// </summary>
         /// <param name="text"></param>
         /// <param name="i"></param>
-        private void frm_ChangeTextEvents(string text, int i)
+        private void FrmResultEvents(string text, int i)
         {
             if ("上传成功".Equals(text))
             {

星火微课/星火微课-正式.iss → 打包/星火微课-正式.iss

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

星火微课/星火微课-测试.iss → 打包/星火微课-测试.iss

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