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

解决冲突
# Conflicts:
#	XHWK.WKTool/PrintWindow.xaml.cs

XHWK.WKTool/App.config

@@ -5,7 +5,7 @@
   </startup>
   <appSettings>
     <!--0正式 1测试-->
-    <add key="IsDebug" value="1" />
+    <add key="IsDebug" value="0" />
     <add key="OutputVideoLog" value="0"/>
     <!--图片压缩等级-->
     <add key="ImageCompressionLevel" value="30" />
@@ -34,8 +34,8 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1" />
     <!--版本号-->
-    <add key="VersionCode" value="35" />
-    <add key="VersionName" value="1.3.4" />
+    <add key="VersionCode" value="37" />
+    <add key="VersionName" value="1.3.6" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>

XHWK.WKTool/App.cs

@@ -243,16 +243,16 @@ namespace XHWK.WKTool
                 //}
                 #endregion
 
-                //try
-                //{
-                //    if(Directory.Exists(AppDomain.CurrentDomain.BaseDirectory+"temp"))//清除临时文件
-                //    {
-                //        Directory.Delete(AppDomain.CurrentDomain.BaseDirectory + "temp",true);
-                //    }
-                //}
-                //catch (Exception)
-                //{
-                //}
+                try
+                {
+                    if (Directory.Exists(AppDomain.CurrentDomain.BaseDirectory + "temp"))//清除临时文件
+                    {
+                        Directory.Delete(AppDomain.CurrentDomain.BaseDirectory + "temp", true);
+                    }
+                }
+                catch (Exception)
+                {
+                }
 
                 //如果本地文件为空，弹出弹窗 输密匙
                 //本地文件不为空， 解析

XHWK.WKTool/PrintWindow.xaml.cs

@@ -98,8 +98,18 @@ namespace XHWK.WKTool
             //FileToolsCommon.CreateFile(imgPath);
             //string pdf = imgPath + "\\101.pdf";
             //PDF位置
-            string SourcePath = FileToolsCommon.GetFileAbsolutePath("/temp/101.pdf");
-            StrList.Add(SourcePath);
+            //string SourcePath = FileToolsCommon.GetFileAbsolutePath("/temp/101.pdf");
+            //StrList.Add(SourcePath);
+            int ipdf = 102;
+            string imgPath = FileToolsCommon.GetFileAbsolutePath("temp/");
+            string tempImgPath = imgPath;
+            imgPath += "101.pdf";
+            while (File.Exists(imgPath))
+            {
+                imgPath = tempImgPath + ipdf.ToString() + ".pdf";
+                ipdf++;
+            }
+            StrList.Add(imgPath);
             //打印数量
             int PrinterNum = Convert.ToInt32(txbNumberOfCopies.Text);
             StrList.Add(PrinterNum.ToString());
@@ -151,17 +161,10 @@ namespace XHWK.WKTool
                 //iTextSharp.text.Rectangle page = new iTextSharp.text.Rectangle(iTextSharp.text.PageSize.A4., 250f);//cs
                 ////设置纸张横向
                 //document.SetPageSize(iTextSharp.text.PageSize.A4.Rotate());
-                int ipdf = 102;
-                string imgPath = FileToolsCommon.GetFileAbsolutePath("temp/");
-                string tempImgPath = imgPath;
-                FileToolsCommon.CreateDirectory(imgPath);
-                imgPath += "101.pdf";
-                while (File.Exists(imgPath))
-                {
-                    imgPath = tempImgPath + ipdf.ToString() + ".pdf";
-                    ipdf++;
-                }
-                iTextSharp.text.pdf.PdfWriter.GetInstance(document, new FileStream(imgPath, FileMode.Create, FileAccess.ReadWrite));
+
+                List<string> objStr1 = (List<string>)obj;
+                string SourcePath1 = objStr1[0];
+                iTextSharp.text.pdf.PdfWriter.GetInstance(document, new FileStream(SourcePath1, FileMode.Create, FileAccess.ReadWrite));
                 document.Open();
                 iTextSharp.text.Image image;
                 for (int i = 0; i < APP.PageDrawList.Count; i++)

XHWK.WKTool/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.4.0")]
-[assembly: AssemblyFileVersion("1.3.4.0")]
+[assembly: AssemblyVersion("1.3.6.0")]
+[assembly: AssemblyFileVersion("1.3.6.0")]

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -185,6 +185,8 @@ namespace XHWK.WKTool
         public void Initialize()
         {
             #region 数据初始化
+            string pathTemp = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
+            FileToolsCommon.CreateDirectory(pathTemp);
             APP.pageData.pagenum = 0;
             APP.pageData.currpage = APP.pageData.pagenum;
             btnStop.IsEnabled = false;//停止录制按钮不可点击
@@ -3579,6 +3581,10 @@ namespace XHWK.WKTool
             imgCanvas.Source = null;
             imgDocumentation.Source = null;
             imgPPT.Source = null;
+            if(APP.pageData.pagenum == 1)
+            {
+                APP.PageDrawList = new List<Model_DrawData>();
+            }
             ///画板模型增加一页
             Model_DrawData model_DrawData = new Model_DrawData
             {