去掉主窗口灰边，优化窗口 功能页面切换。

XHWK.WKTool/CreateAMicroLessonWindow.xaml.cs

@@ -132,11 +132,15 @@ namespace XHWK.WKTool
             if (APP.W_XHMicroLessonSystemWindow == null)
             {
                 APP.W_XHMicroLessonSystemWindow = new XHMicroLessonSystemWindow();
+
                 //APP.W_XHMicroLessonSystemWindow .Topmost = true;
             }
             APP.W_XHMicroLessonSystemWindow.Show();
             this.Hide();
         }
+        double screeHeight = SystemParameters.FullPrimaryScreenHeight;
+
+        double screeWidth = SystemParameters.FullPrimaryScreenWidth;
         /// <summary>
         /// 窗体移动
         /// </summary>

XHWK.WKTool/ScreenRecordingToolbarWindow.xaml.cs

@@ -1,4 +1,5 @@
-using Common.system;
+using Aspose.Pdf.Text;
+using Common.system;
 
 using System;
 using System.Configuration;
@@ -62,6 +63,7 @@ namespace XHWK.WKTool
         /// 🖊状态 0红色 1蓝色 10红色批注内 11蓝色批注内
         /// </summary>
        public int flg = 0;
+        System.Timers.Timer timer = new System.Timers.Timer();
         #endregion
 
         #region 初始化
@@ -77,6 +79,11 @@ namespace XHWK.WKTool
         /// </summary>
         public void Initialize()
         {
+            //timer = new System.Timers.Timer(200);
+            //timer.Interval = 300;
+            //timer.Elapsed += new System.Timers.ElapsedEventHandler(TimerDealy);
+            //timer.Enabled = true; //启动计时器
+
             k_hook = new KeyboardHookCommon();
             k_hook.KeyDownEvent += K_hook_KeyDownEvent;
 
@@ -115,7 +122,32 @@ namespace XHWK.WKTool
             //ImgRecordingScreen.Source = new BitmapImage(new Uri("pack://application:,,,/Images/Toobar25.png"));
             //BtnRecordingScreen_Click(null, null);
         }
+        void TimerDealy(object o, EventArgs e)
+        {
+            Dispatcher.Invoke(() =>
+            {
+                if (this.Left > 1630)
+                {
+                    return;
+                }
+                //获取鼠标在屏幕上的位置
+                double mouse_x = Form.MousePosition.X;   //需要添加引用System.Drawing
+                double mouse_y = Form.MousePosition.Y;
+
+                bool is_in_collasped_range = (mouse_y > this.Left + this.Height) || (mouse_x < this.Left || mouse_x > this.Left + this.Width);//缩起的条件
+                bool is_in_visiable_range = (mouse_y < 1 && mouse_x >= this.Left && mouse_x <= this.Left + this.Width); //展开的条件         
 
+                if (this.Left < 1630 && this.Left >= 0 && is_in_collasped_range)
+                {
+                    System.Threading.Thread.Sleep(300);
+                    this.Left +=20 /*-this.ActualWidth - 3*/;
+                }
+                else if (this.Left < 0 && is_in_visiable_range)
+                {
+                    this.Left = 1;
+                }
+            });
+        }
         private void K_hook_KeyDownEvent(object sender, System.Windows.Forms.KeyEventArgs e)
         {
             if (e.KeyValue == (int)System.Windows.Forms.Keys.F5 && (int)Control.ModifierKeys == (int)Keys.Control)

XHWK.WKTool/XHMicroLessonSystemWindow.xaml

@@ -8,8 +8,8 @@
         xmlns:gifLib="http://wpfanimatedgif.codeplex.com"
         xmlns:local="clr-namespace:XHWK.WKTool"
         mc:Ignorable="d"
-        Title="星火微课系统" Height="1036" Width="1276" WindowStartupLocation="CenterScreen"
-    WindowStyle="None"    AllowsTransparency="True"  Background="#EFF1F8" ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="7">
+        Title="星火微课系统" Height="1036" Width="1276" 
+    WindowStyle="None"    AllowsTransparency="True"  Background="Transparent"    ShowInTaskbar="True" ResizeMode="CanMinimize" BorderThickness="7">
     <Window.Effect>
         <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
     </Window.Effect>
@@ -139,14 +139,17 @@
         </RadialGradientBrush>
     </Window.BorderBrush>
 
-    <Viewbox>
+    <Viewbox> 
+        <Canvas Height="1036" Width="1276">
+            
+     
         <Grid x:Name="GridContent" Height="1036" Width="1276">
 
             <!--分3行-->
             <Grid.RowDefinitions>
-                <RowDefinition Height="106"/>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="40"/>
+                <RowDefinition Height="10*"/>
+                <RowDefinition Height="86*"/>
+                <RowDefinition Height="3.5*"/>
             </Grid.RowDefinitions>
             <Grid Grid.Row="0" Background="#2D8CF0" MouseLeftButtonDown="Window_MouseLeftButtonDown" Margin="0,0,0,0">
                 <Grid.RowDefinitions>
@@ -576,5 +579,6 @@
                 </StackPanel>
             </Grid>
         </Grid>
+        </Canvas>
     </Viewbox>
 </Window>

XHWK.WKTool/ZConfig.cs

@@ -13,9 +13,9 @@ namespace XHWK.WKTool.Config
         /// <summary>
         /// 当前版本号
         /// </summary>
-        public static int versionCode = 5;
+        public static int versionCode = 6;
 
-        public static string versionName = "1.0.4";
+        public static string versionName = "1.0.5";
 
         //接口地址
         public static string apiUrl = isDebug ? "http://schoolapitest.xhkjedu.com" : "http://schoolapi.xhkjedu.com";