zhao：修改首页布局

Common/system/ImageHelper.cs

@@ -366,7 +366,7 @@ namespace Common.system
             {
                 System.IO.FileStream fs = new System.IO.FileStream(filePathName, System.IO.FileMode.Create);
                 //在位图中呈现UI元素
-                RenderTargetBitmap bmp = new RenderTargetBitmap(width, height, 96d, 96d,
+                RenderTargetBitmap bmp = new RenderTargetBitmap(width, height, PrimaryScreen.DpiX, PrimaryScreen.DpiY,
                 PixelFormats.Pbgra32);
                 bmp.Render(ui);
                 BitmapEncoder encoder = new PngBitmapEncoder();

Common/system/PrimaryScreen.cs

@@ -21,17 +21,35 @@ namespace Common.system
         static extern IntPtr ReleaseDC(IntPtr hWnd, IntPtr hDc);
         #endregion
         #region DeviceCaps常量
+        /// <summary>
+        /// 屏幕的宽度（像素）；
+        /// </summary>
         const int HORZRES = 8;
+        /// <summary>
+        /// 屏幕的高度
+        /// </summary>
         const int VERTRES = 10;
+        /// <summary>
+        /// 沿屏幕宽度每逻辑英寸的像素数，在多显示器系统中，该值对所显示器相同
+        /// </summary>
         const int LOGPIXELSX = 88;
+        /// <summary>
+        /// 沿屏幕高度每逻辑英寸的像素数，在多显示器系统中，该值对所显示器相同；
+        /// </summary>
         const int LOGPIXELSY = 90;
+        /// <summary>
+        /// Windows NT：可视桌面的以像素为单位的高度。
+        /// </summary>
         const int DESKTOPVERTRES = 117;
+        /// <summary>
+        /// DESKTOPHORZRES：Windows NT：可视桌面的以像素为单位的宽度。如果设备支持一个可视桌面或双重显示则此值可能大于VERTRES；
+        /// </summary>
         const int DESKTOPHORZRES = 118;
         #endregion
 
         #region 属性
         /// <summary>
-        /// 获取屏幕分辨率当前物理大小
+        /// 获取屏幕分辨率当前物理大小 设置缩放后
         /// </summary>
         public static Size WorkingArea
         {

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -7,12 +7,12 @@
         xmlns:aforge ="clr-namespace:AForge.Controls;assembly=AForge.Controls"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
-        Title="星火微课系统" Height="725.8" Width="975" WindowStartupLocation="CenterScreen"
+        Title="星火微课系统" Height="1040" Width="1276" WindowStartupLocation="CenterScreen"
     WindowStyle="None"    AllowsTransparency="True"  Background="#EFF1F8" ShowInTaskbar="True"
    >
     
     <Viewbox>
-        <Grid Height="725.8" Width="975">
+        <Grid x:Name="GridContent" Height="1040">
             <!--分3行-->
             <Grid.RowDefinitions>
                 <RowDefinition Height="110"/>
@@ -48,35 +48,35 @@
                 </StackPanel>
                 <!--第二行-->
                 <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,6,0,0">
-                    <Button Cursor="Hand" x:Name="btnScreenRecording" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnScreenRecording_Click">
+                    <Button Cursor="Hand" x:Name="btnScreenRecording" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnScreenRecording_Click" Margin="30,0,0,0">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgScreenRecording" Source="./Images/microLessonSystem_2.png"/>
                             <Image x:Name="ImgScreenRecordingTwo" Source="./Images/microLessonSystem_3.png" Visibility="Collapsed"/>
                             <TextBlock x:Name="TxbRecordScreenWord" Text="录屏" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnScreenshot" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,0,30,0" Click="BtnScreenshot_Click">
+                    <Button Cursor="Hand" x:Name="btnScreenshot" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,0,0,0" Click="BtnScreenshot_Click">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgScreenshot" Source="./Images/microLessonSystem_12.png"/>
                             <Image x:Name="ImgScreenshotTwo" Source="./Images/microLessonSystem_11.png" Visibility="Collapsed"/>
                             <TextBlock Text="截图" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnImport" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnImport_Click">
+                    <Button Cursor="Hand" x:Name="btnImport" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnImport_Click" Margin="30,0,0,0">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgImport" Source="./Images/microLessonSystem_6.png"/>
                             <Image x:Name="ImgImportTwo" Source="./Images/microLessonSystem_7.png" Visibility="Collapsed"/>
                             <TextBlock Text="导入" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
-                    <Button Cursor="Hand" x:Name="BtnRecord" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="60,0,30,0" Click="BtnRecord_Click">
+                    <Button Cursor="Hand" x:Name="BtnRecord" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="100,0,0,0" Click="BtnRecord_Click">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgRecord" Source="./Images/microLessonSystem_14.png"/>
                             <Image x:Name="ImgRecordTwo" Source="./Images/microLessonSystem_13.png" Visibility="Collapsed"/>
                             <TextBlock x:Name="TxbRecordingWord" Text="录制" Padding="0,6,0,0" FontSize="14" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnStop" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnStop_Click">
+                    <Button Cursor="Hand" x:Name="btnStop" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnStop_Click" Margin="30,0,0,0">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgStop" Source="./Images/microLessonSystem_21.png"/>
                             <Image x:Name="ImgStopTwo" Source="./Images/microLessonSystem_20.png" Visibility="Collapsed"/>
@@ -85,28 +85,28 @@
                     </Button>
                 </StackPanel>
                 <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="10,10,10,0">
-                    <Button Cursor="Hand" x:Name="btnAdd" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnAdd_Click">
+                    <Button Cursor="Hand" x:Name="btnAdd" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnAdd_Click" Margin="0,0,30,0">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgAdd" Source="./Images/microLessonSystem_25.png" Visibility="Visible"/>
                             <Image x:Name="ImgAddTwo" Source="./Images/microLessonSystem_24.png" Visibility="Collapsed"/>
                             <TextBlock Text="增加" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnPrint" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,0,30,0" Click="BtnPrint_Click">
+                    <Button Cursor="Hand" x:Name="btnPrint" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnPrint_Click">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgPrint" Source="./Images/microLessonSystem_4.png" Visibility="Collapsed"/>
                             <Image x:Name="ImgPrintTwo" Source="./Images/microLessonSystem_5.png" Visibility="Visible"/>
                             <TextBlock Text="打印" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnUpload" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnUpload_Click">
+                    <Button Cursor="Hand" x:Name="btnUpload" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnUpload_Click" Margin="0,0,30,0">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgUpload" Source="./Images/microLessonSystem_15.png" Visibility="Collapsed"/>
                             <Image x:Name="ImgUploadTwo" Source="./Images/microLessonSystem_16.png" Visibility="Visible"/>
                             <TextBlock Text="上传" FontSize="14" Padding="0,6,0,0" Foreground="#FFFFFF" HorizontalAlignment="Center"/>
                         </StackPanel>
                     </Button>
-                    <Button Cursor="Hand" x:Name="btnSetUp" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="30,0,0,0" Click="BtnSetUp_Click">
+                    <Button Cursor="Hand" x:Name="btnSetUp" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Margin="0,0,30,0" Click="BtnSetUp_Click">
                         <StackPanel Orientation="Vertical">
                             <Image x:Name="ImgSetUp" Source="./Images/microLessonSystem_18.png" Visibility="Visible"/>
                             <Image x:Name="ImgSetUpTwo" Source="./Images/microLessonSystem_17.png" Visibility="Collapsed"/>
@@ -114,11 +114,12 @@
                         </StackPanel>
                     </Button>
                 </StackPanel>
+                <Button Content="Button" HorizontalAlignment="Left" Margin="573,29,0,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Click="Button_Click"/>
             </Grid>
             <!--主内容-->
-            <Grid Grid.Row="1" x:Name="GridMain" Width="793.700787401575">
-                <ScrollViewer x:Name="scroMain" Height="580" VerticalScrollBarVisibility="Visible">
-                    <Grid x:Name="gridM"  Margin="0,0,0,0" Background="#FFFFFF" Width="793.700787401575" Height="1142.51968503937" Visibility="Visible">
+            <Grid Grid.Row="1" x:Name="GridMain" Width="1276">
+                <ScrollViewer x:Name="scroMain" VerticalScrollBarVisibility="Visible">
+                    <Grid x:Name="gridM"  Margin="0,0,0,0" Background="#FFFFFF" Visibility="Visible" Height="1780">
                         <Grid>
                             <Border Grid.Row="1"  CornerRadius="5">
                                 <Grid x:Name="IMG" Margin="0,0,0,0">
@@ -167,7 +168,7 @@
            
             <Grid Grid.Row="1">
                 <StackPanel Grid.Row="0" Orientation="Horizontal" Background="#FFFFFF" Width="180" HorizontalAlignment="Center"
-            Height="58" Margin="0,520,0,0" Grid.Column="1">
+            Height="58" Margin="0,520,0,0" Grid.Column="1" VerticalAlignment="Bottom">
                     <Button Cursor="Hand" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
                     x:Name="last_button"
                     Width="60" Height="50"

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -58,7 +58,7 @@ namespace XHWK.WKTool
         /// <summary>
         /// 笔迹粗细
         /// </summary>
-        private int Size = 2;
+        private int PenSize = 2;
         #endregion
 
         #region 初始化
@@ -117,14 +117,26 @@ namespace XHWK.WKTool
             blackboard_canvas.UseCustomCursor = true;
             drawingAttributes.FitToCurve = true;
             drawingAttributes.IgnorePressure = false;
-            drawingAttributes.Width = Size;
-            drawingAttributes.Height = Size;
+            drawingAttributes.Width = PenSize;
+            drawingAttributes.Height = PenSize;
             drawingAttributes.Color = Color;
             blackboard_canvas.Cursor = System.Windows.Input.Cursors.Pen;
             //wfhCamera.Visibility = Visibility.Hidden;
             ImgPDFPath = null;
             ImgPDFPath = new string[300];
         }
+        /// <summary>
+        /// 修改布局
+        /// </summary>
+        public void SetUpLayout()
+        {
+            //宽高比1276，1040
+            //double AspectRatio = 1276.0 / 1040.0;
+            ////System.Drawing.Size des = PrimaryScreen.DESKTOP;
+            //System.Drawing.Size workingArea = PrimaryScreen.WorkingArea;
+            //this.Height = workingArea.Height;
+
+        }
         #endregion
 
         #region 事件
@@ -611,7 +623,7 @@ namespace XHWK.WKTool
         {
             drawingAttributes.Width = 1;
             drawingAttributes.Height = 1;
-            Size = 1;
+            PenSize = 1;
         }
         /// <summary>
         /// 画笔粗细事件 中
@@ -622,7 +634,7 @@ namespace XHWK.WKTool
         {
             drawingAttributes.Width = 3;
             drawingAttributes.Height = 3;
-            Size = 3;
+            PenSize = 3;
         }
         /// <summary>
         /// 画笔粗细事件 粗
@@ -633,7 +645,7 @@ namespace XHWK.WKTool
         {
             drawingAttributes.Width = 5;
             drawingAttributes.Height = 5;
-            Size = 5;
+            PenSize = 5;
         }
         /// <summary>
         /// 登陆事件
@@ -2147,7 +2159,7 @@ namespace XHWK.WKTool
             {
                 Dispatcher.Invoke(new Action(() =>
                 {
-                    myblackboard.changepages(0, 0, true, Color, Size, APP.pageData.currpage - 1);
+                    myblackboard.changepages(0, 0, true, Color, PenSize, APP.pageData.currpage - 1);
                 }));
             }
 
@@ -2288,7 +2300,7 @@ namespace XHWK.WKTool
                     Dispatcher.Invoke(new Action(() =>
                     {
                         //myblackboard.changepages(testX, testY,false);
-                        myblackboard.changepages(testX, testY, false, Color, Size, APP.pageData.currpage - 1);
+                        myblackboard.changepages(testX, testY, false, Color, PenSize, APP.pageData.currpage - 1);
                     }));
                 }