zhao：解决冲突

Common/system/BlackboardNew.cs

@@ -332,14 +332,14 @@ 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)
         //    {
         //        if (stroke != null && stroke.StylusPoints.Count > 1)
         //        {
-        //             drawingAttributes = new DrawingAttributes();
+        //            drawingAttributes = new DrawingAttributes();
         //            //m_canvas.DefaultDrawingAttributes = drawingAttributes;
         //            drawingAttributes.Color = _color;
         //            drawingAttributes.Width = _size;
@@ -358,12 +358,12 @@ namespace Common.system
         //    }
         //    else
         //    {
-        //        if(isFirst)
+        //        if (isFirst)
         //        {
         //            stylusPoint.X = _x;
         //            stylusPoint.Y = _y;
         //            stylusPoints.Add(stylusPoint);
-        //            if (stylusPoints.Count>1)
+        //            if (stylusPoints.Count > 1)
         //            {
         //                stroke = new Stroke(stylusPoints);
         //                m_canvas.Strokes.Add(stroke);
@@ -372,6 +372,7 @@ namespace Common.system
         //        }
         //        else
         //        {
+        //            if(m_canvas.Strokes.Count)
         //            stylusPoint.X = _x;
         //            stylusPoint.Y = _y;
         //            stylusPoints.Add(stylusPoint);
@@ -405,8 +406,8 @@ namespace Common.system
                     drawingAttributes = new DrawingAttributes();
                     //m_canvas.DefaultDrawingAttributes = drawingAttributes;
                     drawingAttributes.Color = _color;
-                    drawingAttributes.Width = _size*5;
-                    drawingAttributes.Height = _size*5;
+                    drawingAttributes.Width = _size * 5;
+                    drawingAttributes.Height = _size * 5;
                     drawingAttributes.FitToCurve = true;
                     drawingAttributes.IgnorePressure = false;
 
@@ -430,6 +431,12 @@ namespace Common.system
                 stroke = new Stroke(stylusPoints);
             }
         }
+
+
+
+
+
+
         ////声明一个 DrawingAttributes 类型的变量  
         //DrawingAttributes drawingAttributes;
         //public void changepaget(double _x, double _y, bool _new,InkCanvas canvas) 

Common/system/CameraHelper.cs

@@ -99,15 +99,19 @@ namespace Common.system
             try
             {
                 Image bitmap = sourcePlayer.GetCurrentVideoFrame();
-                if (fileName == null) fileName = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
-                string fullPath = Path.Combine(filePath, fileName + "-cap.jpg");
-                bitmap.Save(fullPath, ImageFormat.Jpeg);
-                bitmap.Dispose();
-                return fullPath;
+                if(bitmap!=null)
+                {
+                    if (fileName == null) fileName = DateTime.Now.ToString("yyyy-MM-dd-HH-mm-ss");
+                    string fullPath = Path.Combine(filePath, fileName + "-cap.jpg");
+                    bitmap.Save(fullPath, ImageFormat.Jpeg);
+                    bitmap.Dispose();
+                    return fullPath;
+                }
+                return null;
             }
             catch (Exception e)
             {
-                System.Windows.Forms.MessageBox.Show(e.Message.ToString());
+          
                 return null;
             }
         }

XHWK.Model/Model_DrawData.cs

@@ -18,6 +18,7 @@ namespace XHWK.Model
         private string _pageImagePath;
         private TranslateTransform _ImageLocation;
         private ScaleTransform _ImageSize;
+        private ScaleTransform _ImageSizes;
         private bool _IsImageLocation;
         //private string _PenColor;
         //private int _PenWigth;
@@ -56,6 +57,7 @@ namespace XHWK.Model
         /// true 文档图片  folse 截图图片
         /// </summary>
         public bool ImgDocumentation { get => _imgDocumentation; set => _imgDocumentation = value; }
+        public ScaleTransform ImageSizes { get => _ImageSizes; set => _ImageSizes = value; }
         ///// <summary>
         ///// 笔颜色 十六进制
         ///// </summary>

XHWK.WKTool/CountdownWindow.xaml.cs

@@ -42,10 +42,13 @@ namespace XHWK.WKTool
             else
             {
                 timer.Enabled = false;
-                Dispatcher.Invoke(() =>
-                {
-                    Hide();
-                });
+                Dispatcher.Invoke(
+                  DispatcherPriority.Send,
+                  new Action(() =>
+                  {
+                      imgLoding.Source = new BitmapImage(new Uri("pack://application:,,/Images/countdown3_3.png"));
+                      Hide();
+                  }));
             }
         }
         /// <summary>

XHWK.WKTool/LoginWindow.xaml.cs

@@ -1,6 +1,7 @@
 using Common.system;
 using System;
 using System.Configuration;
+using System.IO;
 using System.Text;
 using System.Windows;
 using XHWK.WKTool.DAL;
@@ -23,11 +24,21 @@ namespace XHWK.WKTool
         }
         public void Initialize() 
         {
-            if (GetSettingString("isRemind").Equals("True"))
+
+            if (FileToolsCommon.IsExistFile(APP.DataPath + "accountNumber.txt"))
             {
-                ckSaveName.IsChecked = true;
-                txbAccountNumber.Text = GetSettingString("userName");
+                string accountNumber = System.IO.File.ReadAllText(APP.DataPath + "accountNumber.txt", Encoding.Default);
+                if(!string.IsNullOrWhiteSpace(accountNumber))
+                {
+                    txbAccountNumber.Text = accountNumber;
+                    ckSaveName.IsChecked = true;
+                }
             }
+            //if (GetSettingString("isRemind").Equals("True"))
+            //{
+            //    ckSaveName.IsChecked = true;
+            //    txbAccountNumber.Text = GetSettingString("userName");
+            //}
         }
         /// <summary>
         /// 关闭事件
@@ -76,11 +87,20 @@ namespace XHWK.WKTool
             {
                 FileToolsCommon.CreateDirectory(APP.DataPath);
                 string applicationData = APP.DataPath + "accountNumber.txt";
-                string accountNumbers = DateTime.Now.ToLongDateString().ToString();//当前时间 
-                System.IO.File.WriteAllText(applicationData, accountNumbers, Encoding.Default);//存放签名验证日期
+                if (ckSaveName.IsChecked==true)
+                {
+                    
+                    string accountNumbers = txbAccountNumber.Text;
+                    System.IO.File.WriteAllText(applicationData, accountNumbers, Encoding.Default);//存放账号
+                }
+                else
+                {
+                    string accountNumbers = "";
+                    System.IO.File.WriteAllText(applicationData, accountNumbers, Encoding.Default);//存放账号
+                }
 
 
-                UpdateSettingString("userName", txbAccountNumber.Text);
+                //UpdateSettingString("userName", txbAccountNumber.Text);
                 APP.IsLoginType = true;
                 txbAccountNumber.Text = string.Empty;
                 pobPassword.Password = string.Empty;
@@ -124,14 +144,14 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void CkSaveName_Click(object sender, RoutedEventArgs e)
         {
-            if (ckSaveName.IsChecked == false)
-            {
-                UpdateSettingString("isRemind", ckSaveName.IsChecked.ToString());
-            }
-            else
-            {
-                UpdateSettingString("isRemind", ckSaveName.IsChecked.ToString());
-            }
+            //if (ckSaveName.IsChecked == false)
+            //{
+            //    UpdateSettingString("isRemind", ckSaveName.IsChecked.ToString());
+            //}
+            //else
+            //{
+            //    UpdateSettingString("isRemind", ckSaveName.IsChecked.ToString());
+            //}
         }
         /// <summary>
         /// 读取客户设置

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -106,13 +106,6 @@
                             <TextBlock Text="上传" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnMyMine" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,0,30,0" Click="BtnMyMine_Click">
-                        <StackPanel Orientation="Vertical">
-                            <Image x:Name="ImgMyMine" Source="./Images/microLessonSystem_22.png" Visibility="Collapsed"/>
-                            <Image x:Name="ImgMyMineTwo" Source="./Images/microLessonSystem_1.png" Visibility="Visible"/>
-                            <TextBlock Text="我的" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
-                        </StackPanel>
-                    </Button>
                     <Button Cursor="Hand" x:Name="btnSetUp" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnSetUp_Click">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgSetUp" Source="./Images/microLessonSystem_18.png" Visibility="Visible"/>

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -157,7 +157,7 @@ namespace XHWK.WKTool
             {
                 CameraHelper.SetCameraDevice(0);
                 RbnOpen = new List<string>();
-                times = new System.Timers.Timer(200);//设置执行一次（false）还是一直执行(true)
+                times = new System.Timers.Timer(300);//设置执行一次（false）还是一直执行(true)
                 times.AutoReset = true;//设置是否执行System.Timers.Timer.Elapsed事件
                 times.Elapsed += new System.Timers.ElapsedEventHandler(Times_Elapsed);
                 times.Enabled = true; //启动计时器
@@ -286,7 +286,6 @@ namespace XHWK.WKTool
             //    }
             //}
             #endregion   
-
             if (APP.W_ScreenRecordingToolbarWindow == null)
             {
                 APP.W_ScreenRecordingToolbarWindow = new ScreenRecordingToolbarWindow
@@ -637,8 +636,6 @@ namespace XHWK.WKTool
             {
                 txbLoginType.Text = APP.UserInfo.Username;
 
-                ImgMyMine.Visibility = Visibility.Visible;
-                ImgMyMineTwo.Visibility = Visibility.Collapsed;
                 ImgUpload.Visibility = Visibility.Visible;
                 ImgUploadTwo.Visibility = Visibility.Collapsed;
             }
@@ -646,8 +643,6 @@ namespace XHWK.WKTool
             {
                 txbLoginType.Text = "未登录";
 
-                ImgMyMine.Visibility = Visibility.Collapsed;
-                ImgMyMineTwo.Visibility = Visibility.Visible;
                 ImgUpload.Visibility = Visibility.Collapsed;
                 ImgUploadTwo.Visibility = Visibility.Visible;
             }
@@ -1118,10 +1113,6 @@ namespace XHWK.WKTool
                     ImgUploadTwo.Visibility = Visibility.Visible;
                     btnUpload.IsEnabled = false;
 
-                    ImgMyMine.Visibility = Visibility.Collapsed;//录制中不可点击我的
-                    ImgMyMineTwo.Visibility = Visibility.Visible;
-                    btnMyMine.IsEnabled = false;
-
                     ImgSetUp.Visibility = Visibility.Collapsed;//录制中不可设置
                     ImgSetUpTwo.Visibility = Visibility.Visible;
                     btnSetUp.IsEnabled = false;
@@ -1247,10 +1238,6 @@ namespace XHWK.WKTool
                 ImgUploadTwo.Visibility = Visibility.Collapsed;
                 btnUpload.IsEnabled = true;
 
-                ImgMyMine.Visibility = Visibility.Visible;
-                ImgMyMineTwo.Visibility = Visibility.Collapsed;
-                btnMyMine.IsEnabled = true;
-
                 ImgSetUp.Visibility = Visibility.Visible;
                 ImgSetUpTwo.Visibility = Visibility.Collapsed;
                 btnSetUp.IsEnabled = true;
@@ -1404,7 +1391,7 @@ namespace XHWK.WKTool
             if (APP.W_PrintWindow == null)
             {
                 APP.W_PrintWindow = new PrintWindow();
-                APP.W_PrintWindow.Topmost = true;
+                //APP.W_PrintWindow.Topmost = true;
                 APP.W_PrintWindow.Owner = this;
             }
             if (APP.PageDrawList.Count > 0 && !string.IsNullOrWhiteSpace(APP.PageDrawList[0].PdfImagePath))
@@ -1434,15 +1421,6 @@ namespace XHWK.WKTool
 
             //}
         }
-        /// <summary>
-        /// 我的
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void BtnMyMine_Click(object sender, RoutedEventArgs e)
-        {
-        }
-        /// <summary>
         /// 上一页
         /// </summary>
         /// <param name="sender"></param>
@@ -1489,17 +1467,19 @@ namespace XHWK.WKTool
                         {
                             imgDocumentation.Source = null;
                             imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
-                      
+                            APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
                             if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X > 0)
                             {
                                 var group = IMG.FindResource("Imageview") as TransformGroup;
                                 var transform = group.Children[1] as TranslateTransform;
-                                //if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
-                                //{
-                                //    var transform1 = group.Children[0] as ScaleTransform;
-                                //    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
-                                //    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
-                                //}
+                                if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
+                                {
+                                    var transform1 = group.Children[0] as ScaleTransform;
+                                    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
+                                    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
+                                    imgCanvas.Width = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX;
+                                    imgCanvas.Height = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY;
+                                }
                                 //var position = e.GetPosition(img);
                                 transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
                                 transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
@@ -1566,21 +1546,26 @@ namespace XHWK.WKTool
                         {
                             //imgCanvas.Source = new BitmapImage(new Uri(APP.Paths[APP.pageData.currpage-1]));
                             imgDocumentation.Source = null;
+
                             imgCanvas.Source = new BitmapImage(new Uri(APP.PageDrawList[APP.pageData.currpage - 1].PageImagePath));
+                            APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
                             if (APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation != null && APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X > 0)
                             {
                                 var group = IMG.FindResource("Imageview") as TransformGroup;
-                                //if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
-                                //{
-                                //    var transform1 = group.Children[0] as ScaleTransform;
-                                //    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
-                                //    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
-                                //}
+                                if (APP.PageDrawList[APP.pageData.currpage - 1].ImageSize != null)
+                                {
+                                    var transform1 = group.Children[0] as ScaleTransform;
+                                    transform1.ScaleX = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX;
+                                    transform1.ScaleY = APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY;
+                                    imgCanvas.Width = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX;
+                                    imgCanvas.Height = APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY;
+                                }
                                 var transform = group.Children[1] as TranslateTransform;
                                 //var position = e.GetPosition(img);
                                 transform.X = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X;
                                 transform.Y = APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y;
 
+                                
 
                                 mouseDown = false;
                             }
@@ -1779,15 +1764,22 @@ namespace XHWK.WKTool
             var transform1 = group.Children[1] as TranslateTransform;
             transform1.X = -1 * ((pointToContent.X * transform.ScaleX) - point.X);
             transform1.Y = -1 * ((pointToContent.Y * transform.ScaleY) - point.Y);
+            LogHelper.WriteInfoLog("【img宽高】" + imgCanvas.ActualWidth.ToString() + ":"
+                 + imgCanvas.ActualHeight.ToString() + "百分比:" + transform.ScaleX.ToString() + ":" + transform.ScaleY.ToString()
+                );
+
             //Console.WriteLine("transform.ScaleX = " + transform.ScaleX + "; transform.ScaleY = " + transform.ScaleY);
 
-            //APP.PageDrawList[APP.pageData.currpage - 1].ImageSize = new ScaleTransform();
-            //APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX = transform.ScaleX;
-            //APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY = transform.ScaleY;
-            //APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation = new TranslateTransform();
-            //APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X = transform1.X;
-            //APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y = transform1.Y;
-            //APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageSize = new ScaleTransform();
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleX = transform.ScaleX;
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageSize.ScaleY = transform.ScaleY;
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation = new TranslateTransform();
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.X = transform1.X;
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageLocation.Y = transform1.Y;
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes = new ScaleTransform();
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterX = imgCanvas.ActualWidth;
+            APP.PageDrawList[APP.pageData.currpage - 1].ImageSizes.CenterY = imgCanvas.ActualHeight;
+            APP.PageDrawList[APP.pageData.currpage - 1].IsImageLocation = false;
         }
         #endregion