zhao：1修改测试配置 2解决导入无法取消截图拉伸边框 3修改录制定时器

XHWK.WKTool/App.config

@@ -4,6 +4,7 @@
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
   <appSettings>
+    <add key="IsDebug" value="1"/>
     <!--图片压缩等级-->
     <add key="ImageCompressionLevel" value="30" />
     <!--文件存放路径  路径\账户名\讲解名称_x.MP4-->

XHWK.WKTool/App.cs

@@ -23,7 +23,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 是否为测试版
         /// </summary>
-        public static bool isDebug = false;
+        public static bool isDebug =FileToolsCommon.GetConfigValue("IsDebug")!="0";
         /// <summary>
         /// 接口地址
         /// </summary>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -148,7 +148,7 @@
             <RowDefinition Height="85*"/>
             <RowDefinition Height="5*"/>
         </Grid.RowDefinitions>
-        <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0" MinHeight="100px">
+        <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0" MinHeight="100px" MouseDown="Grid_MouseDown">
             <Grid.RowDefinitions>
                 <RowDefinition Height="auto"/>
                 <RowDefinition Height="auto"/>
@@ -258,8 +258,6 @@
                     </StackPanel>
                 </Button>
             </StackPanel>
-
-
         </Grid>
 
         <!--主内容-->
@@ -322,6 +320,7 @@
             <Label Content="" Grid.Column="1" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,16,0"/>
             <Label Content="" Grid.Column="0" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="1,0,0,0"/>
             <Label Content="" Grid.Column="1" Height="2" Width="2" Background="#FF0F0F0F" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,0"/>
+            <!--<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">

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -82,6 +82,7 @@ namespace XHWK.WKTool
         /// 计时用
         /// </summary>
         private TimeSpan _timeSpan = new TimeSpan(0, 0, 0, 0, 0);
+
         #region 上传
         /// <summary>
         /// 视频模型
@@ -884,6 +885,7 @@ namespace XHWK.WKTool
             try
             {
                 Record();
+                HideAngleBorder();
                 string desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
                 ofd = new System.Windows.Forms.OpenFileDialog
                 {
@@ -1767,6 +1769,15 @@ namespace XHWK.WKTool
         /// 是否录制了音频
         /// </summary>
         private bool IsRecordAudio = false;
+
+        /// <summary>
+        /// 截图定时器
+        /// </summary>
+        private System.Threading.Timer timer;
+        /// <summary>
+        /// 录制计时
+        /// </summary>
+        private DateTime SRTime = DateTime.Now;
         #endregion
 
         #region 录屏
@@ -1899,8 +1910,6 @@ namespace XHWK.WKTool
             EndRecord();
         }
 
-        private System.Timers.Timer timer;
-
         /// <summary>
         /// 设置录屏文件地址
         /// </summary>
@@ -1961,15 +1970,16 @@ namespace XHWK.WKTool
                     #endregion
 
                     #region 计时器初始化
-                    if (t == null)
-                    {
-                        t = new DispatcherTimer();
-                        t.Tick += OnTimer;
-                        t.Interval = new TimeSpan(0, 0, 0, 1);
-                        t.IsEnabled = true;
-                        t.Start();
-                    }
-                    t.Interval = new TimeSpan(0, 0, 0, 1);
+                    
+                    //if (t == null)
+                    //{
+                    //    t = new DispatcherTimer();
+                    //    t.Tick += OnTimer;
+                    //    t.Interval = new TimeSpan(0, 0, 0, 1);
+                    //    t.IsEnabled = true;
+                    //    t.Start();
+                    //}
+                    //t.Interval = new TimeSpan(0, 0, 0, 1);
                     txbTime.Visibility = Visibility.Visible;
                     #endregion
 
@@ -2079,12 +2089,14 @@ namespace XHWK.WKTool
                     #endregion
                     IsFirstR = false;
                     RsImgName = new List<string>();
-                    timer = new System.Timers.Timer(200)
-                    {
-                        AutoReset = true//设置是否执行System.Timers.Timer.Elapsed事件
-                    };//设置执行一次（false）还是一直执行(true)
-                    timer.Elapsed += new System.Timers.ElapsedEventHandler(Timer_Elapsed);
-                    timer.Enabled = true; //启动计时器
+                    ///启动截图
+                    timer = new System.Threading.Timer(new TimerCallback(Timer_Elapsed), null, 0, 200);
+                    SRTime = Convert.ToDateTime("2020-01-01 00:00:00");
+                    //{
+                    //    AutoReset = true//设置是否执行System.Timers.Timer.Elapsed事件
+                    //};//设置执行一次（false）还是一直执行(true)
+                    //timer.Elapsed += new System.Timers.ElapsedEventHandler(Timer_Elapsed);
+                    //timer.Enabled = true; //启动计时器
                 }
 
                 //继续录制
@@ -2120,7 +2132,7 @@ namespace XHWK.WKTool
                         Dispatcher.Invoke(() =>
                         {
                             IsStartCount = true;
-                            Stack();
+                            //Stack();
                             //timer.Start();
                         });
                     }))).Start();
@@ -2138,7 +2150,7 @@ namespace XHWK.WKTool
                 ImgStop.Visibility = Visibility.Visible;
                 ImgStopTwo.Visibility = Visibility.Collapsed;
                 TxbRecordingWord.Text = "继续";
-                TimeOut();
+                //TimeOut();
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
                 {
@@ -2177,8 +2189,7 @@ namespace XHWK.WKTool
         /// 录制保存图片
         /// </summary>
         /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+        private void Timer_Elapsed(object sender)
         {
             if (IsStartCount)
             {
@@ -2187,8 +2198,17 @@ namespace XHWK.WKTool
                     Dispatcher.Invoke(() =>
                     {
                         string FilePathName = ImgPath + RsImgName.Count + ".png";
-                        ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)ActualWidth, (int)ActualHeight);
                         RsImgName.Add(FilePathName);
+                        ImageHelper.SaveUIToImage(GridMain, FilePathName, (int)ActualWidth, (int)ActualHeight);
+                        SRTime=SRTime.AddMilliseconds(200);
+                        if (SRTime.Hour > 0)
+                        {
+                            txbTime.Text = SRTime.ToString("HH:mm:ss");
+                        }
+                        else
+                        {
+                            txbTime.Text = SRTime.ToString("mm:ss");
+                        }
                     });
                 }
                 catch (Exception ex)
@@ -2241,7 +2261,7 @@ namespace XHWK.WKTool
                 ImgRecord.Source = new BitmapImage(new Uri("pack://application:,,,/Images/microLessonSystem_14.png"));
                 ImgStop.Visibility = Visibility.Visible;
                 ImgStopTwo.Visibility = Visibility.Collapsed;
-                TimeOut();
+                //TimeOut();
                 txbType.Text = "保存中";
                 #region 2秒内不可点击
                 new Thread(new ThreadStart(new Action(() =>
@@ -2298,8 +2318,9 @@ namespace XHWK.WKTool
                         Dispatcher.Invoke(() =>
                         {
                             IsStartCount = false;
-                            timer.Stop();
-                            End();
+                            timer.Change(-1, 0);
+                            timer.Dispose();
+                                    //End();
                             txbTime.Text = "";
                             txbTime.Visibility = Visibility.Hidden;
                         });
@@ -3911,6 +3932,19 @@ namespace XHWK.WKTool
             float x = PrimaryScreen.ScaleX;
             float y = PrimaryScreen.ScaleY;
         }
+        /// <summary>
+        /// 点击标题栏 隐藏截图的四个点和线
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Grid_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            HideAngleBorder();
+        }
 
+        private void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+            Thread.Sleep(2000);
+        }
     }
 }