已知BUG修复。版本1.1.4

XHWK.Model/Properties/AssemblyInfo.cs

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

XHWK.WKTool/App.config

@@ -4,6 +4,7 @@
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
   <appSettings>
+    <!--0正式1测试-->
     <add key="IsDebug" value="1"/>
     <!--图片压缩等级-->
     <add key="ImageCompressionLevel" value="30" />
@@ -32,7 +33,7 @@
     <!--上传每片大小 Mb-->
     <add key="UploadSliceLen" value="1"/>
     <!--版本号-->
-    <add key="VersionCode" value="14"/>
-    <add key="VersionName" value="1.1.3"/>
+    <add key="VersionCode" value="15"/>
+    <add key="VersionName" value="1.1.4"/>
   </appSettings>
 </configuration>

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -26,6 +26,7 @@ namespace XHWK.WKTool
         public CreateAMicroLessonWindow()
         {
             InitializeComponent();
+            this.ResizeMode = ResizeMode.NoResize;
             if (!APP.CheckScreenCapturerRecorder())
             {
                 MessageWindow.Show("首次运行需安装环境,请在确定后依次点击“OK-Next>-Next>Install”完成安装！");

XHWK.WKTool/PracticeWindow.xaml.cs

@@ -385,7 +385,8 @@ namespace XHWK.WKTool
             {
                 APP.W_ScreenRecordingToolbarWindow.flg = 1;
             }
-            Hide();
+            APP.W_ScreenRecordingToolbarWindow.ReturnPractice();
+            //Hide();
         }
     }
 }

XHWK.WKTool/PrintWindow.xaml

@@ -111,7 +111,7 @@
             VerticalAlignment="Center"
             Background="#FAFAFA"
             CornerRadius="4"
-            Visibility="Visible">
+            Visibility="Collapsed">
             <Grid>
 
                 <ProgressBar BorderBrush="#4597FF"

XHWK.WKTool/PrintWindow.xaml.cs

@@ -94,10 +94,16 @@ namespace XHWK.WKTool
                 MessageWindow.Show("打印机不能为空！");
                 return;
             }
-            I = 1;
             APP.myloading.Show();
-            tip_outer.Visibility = Visibility.Visible;
-            Thread.Sleep(2000);
+            APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeServering, InvokeServerCompate);
+
+
+
+
+            //I = 1;
+            //APP.myloading.Show();
+            //tip_outer.Visibility = Visibility.Visible;
+            //Thread.Sleep(2000);
             //Times();
             //Dispatcher.Invoke(() =>
             //{
@@ -114,6 +120,90 @@ namespace XHWK.WKTool
 
 
 
+            //string imgPath = FileToolsCommon.GetFileAbsolutePath("temp");
+            //FileToolsCommon.CreateFile(imgPath);
+            //string pdf = imgPath + "\\101.pdf";
+            //string tpf = imgPath + "\\102.TPF";
+            //string msg = string.Empty;
+            //string outPut = string.Empty;
+            ////if(rbnSquarePoint.IsChecked==false)
+            ////{
+            ////    pyte = 1;
+            ////}
+            //LatticeFileHelper.GeneratingPDF(pdf, tpf, out int pr, out msg, out outPut/*, pyte*/);
+            //if (pr == 0)
+            //{
+            //    //outPut = outPut.Replace("[", "").Replace("]", "").Replace("\"", "").Trim();
+            //    //APP.OutPut = outPut.Split(',');
+            //    //string []page= outPut.Split(',');
+            //    //for(int i=0;i<page.Length;i++) //增加页码编号
+            //    //{
+            //    //    APP.PageDrawList[i].PageCode = page[i];
+            //    //}
+
+            //    //string defa = string.Empty;
+            //    //List<string> defaList = LatticeFileHelper.GetPrinterList(out defa);
+
+            //    string standardError = string.Empty;
+            //    string standardOutput = string.Empty;
+            //    int frequency = Convert.ToInt32(txbNumberOfCopies.Text);
+            //    //for (int i=0;i< frequency;i++)
+            //    //{
+            //    LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out int printResult, out standardError, out standardOutput);
+            //    //}
+            //    if (printResult == 0)// 0为成功
+            //    {
+            //        new Thread(new ThreadStart(new Action(() =>
+            //        {
+            //            Dispatcher.Invoke(() =>
+            //            {
+            //                I = 100;
+            //                pgbProcess.Value = I * 100 / 100;
+            //                lbProcess.Content = string.Format("{0}/{1}", I, 100);
+            //                APP.myloading.Hide();
+            //                I = 0;
+            //            });
+            //            Thread.Sleep(2000);
+            //            Dispatcher.Invoke(() =>
+            //            {
+            //                //tip_outer.Visibility = Visibility.Collapsed;
+            //                MessageWindow.Show("打印成功");
+            //            });
+            //        }))).Start();
+
+
+                   
+                    
+                  
+            //    }
+            //    else
+            //    {
+            //        APP.myloading.Hide();
+            //        MessageWindow.Show(standardError);
+            //    }
+            //}
+            //else
+            //{
+            //    APP.myloading.Hide();
+            //    MessageWindow.Show(msg);
+            //}
+        }
+        /// <summary>
+        /// 打印-开始
+        /// </summary>
+        /// <returns></returns>
+        private object InvokeServering()
+        {
+            Dispatcher.Invoke(() =>
+                       {
+                           I = 1;
+                           pgbProcess.Value = I * 100 / 100;
+                           lbProcess.Content = string.Format("{0}/{1}", I, 100);
+                           tip_outer.Visibility = Visibility.Visible;
+                           //I = 0;
+                       });
+            Thread.Sleep(2000);
+
             string imgPath = FileToolsCommon.GetFileAbsolutePath("temp");
             FileToolsCommon.CreateFile(imgPath);
             string pdf = imgPath + "\\101.pdf";
@@ -140,47 +230,54 @@ namespace XHWK.WKTool
 
                 string standardError = string.Empty;
                 string standardOutput = string.Empty;
-                int frequency = Convert.ToInt32(txbNumberOfCopies.Text);
-                //for (int i=0;i< frequency;i++)
-                //{
-                LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out int printResult, out standardError, out standardOutput);
-                //}
-                if (printResult == 0)// 0为成功
+                int frequency = 1;
+                Dispatcher.Invoke(() =>
                 {
-                    new Thread(new ThreadStart(new Action(() =>
+                     frequency = Convert.ToInt32(txbNumberOfCopies.Text);
+                    LatticeFileHelper.PrinterTPFFile(tpf, frequency, cmbClass.Text, out int printResult, out standardError, out standardOutput);
+                    if (printResult == 0)// 0为成功
                     {
-                        Dispatcher.Invoke(() =>
-                        {
-                            I = 100;
-                            pgbProcess.Value = I * 100 / 100;
-                            lbProcess.Content = string.Format("{0}/{1}", I, 100);
-                            APP.myloading.Hide();
-                            I = 0;
-                        });
-                        Thread.Sleep(2000);
-                        Dispatcher.Invoke(() =>
+                        new Thread(new ThreadStart(new Action(() =>
                         {
-                            //tip_outer.Visibility = Visibility.Collapsed;
-                            MessageWindow.Show("打印成功");
-                        });
-                    }))).Start();
-
-
-                   
-                    
-                  
-                }
-                else
-                {
-                    APP.myloading.Hide();
-                    MessageWindow.Show(standardError);
-                }
+                            Dispatcher.Invoke(() =>
+                            {
+                                I = 100;
+                                pgbProcess.Value = I * 100 / 100;
+                                lbProcess.Content = string.Format("{0}/{1}", I, 100);
+                                APP.myloading.Hide();
+                                I = 0;
+                            });
+                            Thread.Sleep(3000);
+                            Dispatcher.Invoke(() =>
+                            {
+                                tip_outer.Visibility = Visibility.Collapsed;
+                                //tip_outer.Visibility = Visibility.Collapsed;
+                                MessageWindow.Show("打印成功");
+                            });
+                        }))).Start();
+                    }
+                    else
+                    {
+                        APP.myloading.Hide();
+                        MessageWindow.Show(standardError);
+                    }
+                });
+             
             }
             else
             {
                 APP.myloading.Hide();
                 MessageWindow.Show(msg);
             }
+            return "";
+        }
+        /// <summary>
+        /// 打印-结束
+        /// </summary>
+        /// <returns></returns>
+        public void InvokeServerCompate(object obj)
+        {
+            APP.myloading.Hide();
         }
         /// <summary>
         /// 时钟回调
@@ -211,13 +308,21 @@ namespace XHWK.WKTool
             }
 
             string time = string.Format("{0:D2}:{1:D2}",/* _timeSpan.Hours,*/ _timeSpan.Minutes, _timeSpan.Seconds);
-            if(I <= 90 && I != 0)
+            if(I < 90 && I != 0)
             {
                 Dispatcher.Invoke(() =>
                 {
+                 
                     pgbProcess.Value = I * 100 / 100;
             lbProcess.Content = string.Format("{0}/{1}", I, 100);
-            I++;
+                    if (I == 1)
+                    {
+                        I = 30;
+                    }
+                    else
+                    {
+                        I += 30;
+                    }
                 });
             }
         }
@@ -301,5 +406,10 @@ namespace XHWK.WKTool
                 txbNumberOfCopies.Text = num.ToString();
             }
         }
+
+        private void Window_MouseLeftButtonDown_1(object sender, MouseButtonEventArgs e)
+        {
+
+        }
     }
 }

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -409,13 +409,13 @@ namespace XHWK.WKTool
                 IsSuspend = true;
                 ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar26.png"));//大圆圈三角形
                 BtnStopRecordingScreen.IsEnabled = false; //停止录制按钮不点击
-                imgBlackPenOne.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
-                btnBlackPenOne.IsEnabled = false;//蓝笔不可点击
-                imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
-                btnBlackPenTwo.IsEnabled = false;//红笔不可点击
+                //imgBlackPenOne.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
+                //btnBlackPenOne.IsEnabled = false;//蓝笔不可点击
+                //imgBlackPenTwo.Source = new BitmapImage(new Uri("pack://application:,,,/Images/31.png"));
+                //btnBlackPenTwo.IsEnabled = false;//红笔不可点击
                 txbTime.Visibility = Visibility.Hidden;//时间不显示
                 imgReturn.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar29.png"));
-                //btnReturn.IsEnabled = true;//返回主界面可点击
+                btnReturn.IsEnabled = true;//返回主界面可点击
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
@@ -1005,5 +1005,18 @@ namespace XHWK.WKTool
             APP.W_XHMicroLessonSystemWindow.Show();
             Hide();
         }
+        /// <summary>
+        /// 批注退出
+        /// </summary>
+        public void ReturnPractice()
+        {
+            Dispatcher.Invoke(() =>
+            {
+                borOne.Background = new SolidColorBrush(Colors.DodgerBlue);
+                borTwo.Background = new SolidColorBrush(Colors.DodgerBlue);
+            });
+            flg = 0;
+            APP.W_PracticeWindow.Hide();
+        }
     }
 }

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -9,7 +9,7 @@
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
         Title="星火微课系统" Height="1036" Width="1290" 
-    WindowStyle="None"  WindowStartupLocation="CenterScreen"  AllowsTransparency="True"  Background="Transparent"    ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="7">
+    WindowStyle="None"  WindowStartupLocation="CenterScreen"  AllowsTransparency="True"  Background="Transparent"    ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="7" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
@@ -277,9 +277,9 @@
             </Grid>
 
         <!--主内容-->
-        <Grid Grid.Row="1" x:Name="GridMain" Visibility="Visible">
-            <ScrollViewer x:Name="scroMain" VerticalScrollBarVisibility="Visible">
-                <Grid x:Name="gridM"  Margin="0,0,0,0" Background="#FFFFFF" Visibility="Visible" Height="1780">
+            <Grid Grid.Row="1" x:Name="GridMain" Visibility="Visible" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
+                <ScrollViewer x:Name="scroMain" VerticalScrollBarVisibility="Visible" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
+                    <Grid x:Name="gridM"  Margin="0,0,0,0" Background="#FFFFFF" Visibility="Visible" Height="1780" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
                     <Grid>
                         <Border Grid.Row="1"  CornerRadius="5">
                             <Grid x:Name="IMG" Margin="0,0,0,0">
@@ -315,7 +315,7 @@
 
                     <!--导入图片-->
                     <!--<Button Cursor="Hand" x:Name="btnOk" Height="50" Width="50" Content="√" FontSize="26" Background="#2E8CF0" Foreground="#FFFFFF" Click="btnOk_Click" Visibility="Collapsed"/>-->
-                    <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2" />
+                        <InkCanvas Grid.Row="0" x:Name="blackboard_canvas"  Background="Transparent" Visibility="Collapsed" Grid.ColumnSpan="2"/>
 
 
                     <!--摄像头-->
@@ -339,7 +339,7 @@
             <!--<TextBlock x:Name="txbTime" Text="123456" FontSize="20" Foreground="#000000" Margin="0,0,0,10" HorizontalAlignment="Left" VerticalAlignment="Bottom"/>-->
         </Grid>
         <!--页码-->
-        <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed">
+            <Grid Grid.Row="1" x:Name="gridPage" Visibility="Collapsed" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
             <StackPanel Grid.Row="0" Orientation="Horizontal" Background="Transparent" Width="180" HorizontalAlignment="Center"
             Height="30" Margin="0,0,0,0" Grid.Column="1" VerticalAlignment="Bottom">
                 <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
@@ -352,7 +352,7 @@
                         </StackPanel>
                     </Button.Content>
                 </Button>
-                <Grid Width="60"  Background="Transparent">
+                    <Grid Width="60"  Background="Transparent" MouseLeftButtonDown="Window_MouseLeftButtonDown_1">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="311*"/>
                         <RowDefinition Height="483*"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -564,124 +564,131 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnSave_Click(object sender, RoutedEventArgs e)
         {
-            ImgRecord.Visibility = Visibility.Visible;//设置结束时可录制
-            ImgRecordTwo.Visibility = Visibility.Collapsed;//设置结束时可录制
-            BtnRecord.IsEnabled = true;//设置结束时可录制
-
-            if (!string.IsNullOrWhiteSpace(txbInterfaceAddress.Text))
-            {
-                string ApplicationData = APP.dataPath + "interfaceAddress.txt";
-                string temp = "http://" + txbInterfaceAddress.Text;
-                System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
-            }
-            else
-            {
-                MessageWindow.Show("接口地址未输入");
-                return;
-            }
-            if (!string.IsNullOrWhiteSpace(txbImageUploadAddress.Text))//图片上传地址
-            {
-                string ApplicationData = APP.dataPath + "imageUploadAddress.txt";
-                string temp = "http://" + txbImageUploadAddress.Text + "/";
-                System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
-            }
-            else
-            {
-                MessageWindow.Show("上传地址未输入");
-                return;
-            }
-            if (!string.IsNullOrWhiteSpace(txbPictureShowsAddress.Text))
-            {
-                string ApplicationData = APP.dataPath + "pictureShowsAddress.txt";
-                string temp = "http://" + txbPictureShowsAddress.Text + "/static/";
-                System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
-            }
-            else
-            {
-                MessageWindow.Show("下载地址未输入");
-                return;
-            }
-            if (!APP.apiUrl.Equals("http://" + txbInterfaceAddress.Text))
+            try
             {
-                APP.apiUrl = "http://" + txbInterfaceAddress.Text;
-              
-                if(!txbLoginType.Text.Equals("未登录"))
+                ImgRecord.Visibility = Visibility.Visible;//设置结束时可录制
+                ImgRecordTwo.Visibility = Visibility.Collapsed;//设置结束时可录制
+                BtnRecord.IsEnabled = true;//设置结束时可录制
+
+                if (!string.IsNullOrWhiteSpace(txbInterfaceAddress.Text))
                 {
-                    LoginType();
-                    MessageWindow.Show("接口地址已修改，请重新登陆！");
+                    string ApplicationData = APP.dataPath + "interfaceAddress.txt";
+                    string temp = "http://" + txbInterfaceAddress.Text;
+                    System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
                 }
-            }
-            if (!APP.uploadUrl.Equals(txbImageUploadAddress.Text))
-            {
-                APP.uploadUrl = "http://" + txbImageUploadAddress.Text + "/";
-            }
-            if (!APP.showImageUrl.Equals(txbPictureShowsAddress.Text))
-            {
-                APP.showImageUrl = "http://" + txbPictureShowsAddress.Text + "/static/";
-            }
-            if (rbnMP4.IsChecked == true)
-            {
-                //存储文件
-                FileToolsCommon.SetConfigValue("VideoType", "1");
-            }
-            else if (rbnFLV.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("VideoType", "2");
-            }
-            else
-            {
-                FileToolsCommon.SetConfigValue("VideoType", "3");
-            }
-            if (rbnY.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("IsSound", "true");
-            }
-            else
-            {
-                FileToolsCommon.SetConfigValue("IsSound", "false");
-            }
-            ///  < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
-            if (rbnRight.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("CameraPosition", "1");
-            }
-            else if (rbnLeft.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("CameraPosition", "2");
-            }
-            else if (rbnRightUnder.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("CameraPosition", "3");
-            }
-            else if (rbnLeftUnder.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("CameraPosition", "4");
-            }
+                else
+                {
+                    MessageWindow.Show("接口地址未输入");
+                    return;
+                }
+                if (!string.IsNullOrWhiteSpace(txbImageUploadAddress.Text))//图片上传地址
+                {
+                    string ApplicationData = APP.dataPath + "imageUploadAddress.txt";
+                    string temp = "http://" + txbImageUploadAddress.Text + "/";
+                    System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
+                }
+                else
+                {
+                    MessageWindow.Show("上传地址未输入");
+                    return;
+                }
+                if (!string.IsNullOrWhiteSpace(txbPictureShowsAddress.Text))
+                {
+                    string ApplicationData = APP.dataPath + "pictureShowsAddress.txt";
+                    string temp = "http://" + txbPictureShowsAddress.Text + "/static/";
+                    System.IO.File.WriteAllText(ApplicationData, temp, Encoding.Default);
+                }
+                else
+                {
+                    MessageWindow.Show("下载地址未输入");
+                    return;
+                }
+                if (!APP.apiUrl.Equals("http://" + txbInterfaceAddress.Text))
+                {
+                    APP.apiUrl = "http://" + txbInterfaceAddress.Text;
 
-            if (rbnMP4.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("VideoType", "1");
-            }
-            else if (rbnFLV.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("VideoType", "2");
-            }
-            else if (rbnAVI.IsChecked == true)
-            {
-                FileToolsCommon.SetConfigValue("VideoType", "3");
+                    if (!txbLoginType.Text.Equals("未登录"))
+                    {
+                        LoginType();
+                        MessageWindow.Show("接口地址已修改，请重新登陆！");
+                    }
+                }
+                if (!APP.uploadUrl.Equals(txbImageUploadAddress.Text))
+                {
+                    APP.uploadUrl = "http://" + txbImageUploadAddress.Text + "/";
+                }
+                if (!APP.showImageUrl.Equals(txbPictureShowsAddress.Text))
+                {
+                    APP.showImageUrl = "http://" + txbPictureShowsAddress.Text + "/static/";
+                }
+                if (rbnMP4.IsChecked == true)
+                {
+                    //存储文件
+                    FileToolsCommon.SetConfigValue("VideoType", "1");
+                }
+                else if (rbnFLV.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("VideoType", "2");
+                }
+                else
+                {
+                    FileToolsCommon.SetConfigValue("VideoType", "3");
+                }
+                if (rbnY.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("IsSound", "true");
+                }
+                else
+                {
+                    FileToolsCommon.SetConfigValue("IsSound", "false");
+                }
+                ///  < !--摄像头位置 1.右上 2.左上 3.右下 4.左下-- >
+                if (rbnRight.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("CameraPosition", "1");
+                }
+                else if (rbnLeft.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("CameraPosition", "2");
+                }
+                else if (rbnRightUnder.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("CameraPosition", "3");
+                }
+                else if (rbnLeftUnder.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("CameraPosition", "4");
+                }
+
+                if (rbnMP4.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("VideoType", "1");
+                }
+                else if (rbnFLV.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("VideoType", "2");
+                }
+                else if (rbnAVI.IsChecked == true)
+                {
+                    FileToolsCommon.SetConfigValue("VideoType", "3");
+                }
+                APP.CameraPosition = FileToolsCommon.GetConfigValue("CameraPosition");
+                GridMain.Visibility = Visibility.Visible;
+                gridSetUp.Visibility = Visibility.Collapsed;
+                imgPlayerRight.Visibility = Visibility.Collapsed;
+                imgPlayerLeft.Visibility = Visibility.Collapsed;
+                imgPlayerRightUnder.Visibility = Visibility.Collapsed;
+                imgPlayerLeftUnder.Visibility = Visibility.Collapsed;
+                if (!txbStoragePath.Content.ToString().Equals(APP.WKData.WkPath))
+                {
+                    //存储文件
+                    FileToolsCommon.SetConfigValue("VideoSavePath", txbStoragePath.Content.ToString());
+                    MessageWindow.Show("路径已变更，下次创建微课时自动生效！！！");
+                }
             }
-            APP.CameraPosition = FileToolsCommon.GetConfigValue("CameraPosition");
-            GridMain.Visibility = Visibility.Visible;
-            gridSetUp.Visibility = Visibility.Collapsed;
-            imgPlayerRight.Visibility = Visibility.Collapsed;
-            imgPlayerLeft.Visibility = Visibility.Collapsed;
-            imgPlayerRightUnder.Visibility = Visibility.Collapsed;
-            imgPlayerLeftUnder.Visibility = Visibility.Collapsed;
-            if (!txbStoragePath.Content.ToString().Equals(APP.WKData.WkPath))
+            catch (Exception ex)
             {
-                //存储文件
-                FileToolsCommon.SetConfigValue("VideoSavePath", txbStoragePath.Content.ToString());
-                MessageWindow.Show("路径已变更，下次创建微课时自动生效！！！");
+                LogHelper.WriteErrLog("XHMicroLessonSystemWindow(设置保存事件报错：)" + ex.Message,ex);
             }
         }
         /// <summary>
@@ -986,7 +993,7 @@ namespace XHWK.WKTool
                 };
 
 
-                APP.myloading.Show();
+                //APP.myloading.Show();
                 APP.BackgroundWorkerHelper.RunWorkerAsync(InvokeServering, InvokeServerCompate);
 
 
@@ -1019,13 +1026,16 @@ namespace XHWK.WKTool
             Dispatcher.Invoke(new Action(() =>
             {
                 result = ofd.ShowDialog();
-                if (result == System.Windows.Forms.DialogResult.OK)
+            }));
+            if (result == System.Windows.Forms.DialogResult.OK)
                 {
                     if (ofd.FileName != "")
+                    {
+                    Dispatcher.Invoke(new Action(() =>
                     {
                         APP.myloading.Show();
-
                         myblackboard.changepage(APP.pageData.pagenum);
+                    }));
                         #region PPT转PDF
                         string filepath = ofd.FileName;
                         string path = ofd.SafeFileName.Replace(".ppt", "").Replace(".pptx", "").Trim();
@@ -1077,8 +1087,11 @@ namespace XHWK.WKTool
                                         File.Delete(filePathOutPut);
                                     }
                                 }
-                                #endregion
-                                string[] page = images.ToArray();
+                            #endregion
+
+                            Dispatcher.Invoke(new Action(() =>
+                            {
+                            string[] page = images.ToArray();
                                 int num = 0;
                                 for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
                                 {
@@ -1101,6 +1114,7 @@ namespace XHWK.WKTool
                                         };
                                         APP.PageDrawList.Add(model_DrawData);
                                     }
+                      
                                     ImgPrint.Visibility = Visibility.Visible;//导入成功可打印
                                     ImgPrintTwo.Visibility = Visibility.Collapsed;
                                     btnPrint.IsEnabled = true;
@@ -1130,11 +1144,11 @@ namespace XHWK.WKTool
                                     ImgScreenshotTwo.Visibility = Visibility.Collapsed;
                                     btnScreenshot.IsEnabled = true;
                                 }
-                                APP.myloading.Hide();
-                            }
+                           
+                            }));
+                        }
                             catch (Exception ex)
                             {
-                                APP.myloading.Hide();
                                 MessageWindow.Show("文件无效或者文件被加密！");
                                 LogHelper.WriteErrLog("【打开ppt】(OpenDialog PPT)" + ex.Message, ex);
                             }
@@ -1238,6 +1252,8 @@ namespace XHWK.WKTool
                                 string paths = AppDomain.CurrentDomain.BaseDirectory + "Temp\\";
                                 string[] page = ConvertWordToImage(filepath, paths, "", 0, 0, null, 0).ToArray();
                                 int num = 0;
+                            Dispatcher.Invoke(new Action(() =>
+                            {
                                 for (int i = 0 + APP.pageData.pagenum; i < page.Length + APP.pageData.pagenum; i++)//给画板模型加图片路径
                                 {
                                     if (APP.PageDrawList != null && APP.PageDrawList.Count > i)
@@ -1290,8 +1306,9 @@ namespace XHWK.WKTool
                                     ImgScreenshotTwo.Visibility = Visibility.Collapsed;
                                     btnScreenshot.IsEnabled = true;
                                 }
-                                APP.myloading.Hide();
-                            }
+                                
+                            }));
+                        }
                             catch (Exception ex)
                             {
                                 APP.myloading.Hide();
@@ -1300,31 +1317,6 @@ namespace XHWK.WKTool
                         }
                     }
                 }
-            }
-                   ));
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
             //OpenDialog();
             return "";
         }
@@ -1335,7 +1327,7 @@ namespace XHWK.WKTool
         public void InvokeServerCompate(object obj)
         {
             //APP.myloading.Hide();
-           
+            APP.myloading.Hide();
         }
         /// <summary>
         /// 导入文档
@@ -1641,11 +1633,7 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnUpload_Click(object sender, RoutedEventArgs e)
         {
-            if (APP.IsLoginType == false)
-            {
-                Login();
-                return;
-            }
+            
             if (gridUpload.Visibility == Visibility.Visible)
             {
                 gridUpload.Visibility = Visibility.Collapsed;
@@ -1845,6 +1833,11 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnUploads_Click(object sender, RoutedEventArgs e)
         {
+            if (APP.IsLoginType == false)
+            {
+                Login();
+                return;
+            }
             pageData.menuList[Subscript].IsEnabled = false;
             List<System.Windows.Controls.Button> buttons = FindChilds<System.Windows.Controls.Button>(listView1, "btnUpload");
             for (int i = 0; i < buttons.Count; i++)
@@ -3043,15 +3036,15 @@ namespace XHWK.WKTool
             {
                 txbLoginType.Text = APP.UserInfo.Username;
 
-                ImgUpload.Visibility = Visibility.Visible;
-                ImgUploadTwo.Visibility = Visibility.Collapsed;
+                //ImgUpload.Visibility = Visibility.Visible;
+                //ImgUploadTwo.Visibility = Visibility.Collapsed;
             }
             else
             {
                 txbLoginType.Text = "未登录";
 
-                ImgUpload.Visibility = Visibility.Collapsed;
-                ImgUploadTwo.Visibility = Visibility.Visible;
+                //ImgUpload.Visibility = Visibility.Collapsed;
+                //ImgUploadTwo.Visibility = Visibility.Visible;
             }
         }
         /// <summary>
@@ -4545,5 +4538,17 @@ namespace XHWK.WKTool
         {
             HideAngleBorder();
         }
+        /// <summary>
+        /// 鼠标左键点击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Window_MouseLeftButtonDown_1(object sender, MouseButtonEventArgs e)
+        {
+            if (RectImgBorder.Visibility != Visibility.Hidden)
+            {
+                HideAngleBorder();
+            }
+        }
     }
 }