Merge branch 'master' of http://git.xhkjedu.com/zhaoyaoyao/XHPZPC

# Conflicts:
#	XHPZ.Desktop/MainWindow.xaml

XHPZ.Desktop/MainWindow.xaml

@@ -5,12 +5,34 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:XHPZ.Desktop"
         mc:Ignorable="d"
+<<<<<<< HEAD
         Title="智慧批注" Height="300" Width="300">
+=======
+        Title="MainWindow" 
+    WindowStyle="None" AllowsTransparency="True"    WindowState="Normal"
+    ShowInTaskbar="False"  Topmost="True" ResizeMode="NoResize" 
+        d:DesignHeight="250" Width="500" Height="250"  MouseMove="Window_MouseMove"  BorderThickness="7">
+    <Window.Effect>
+        <DropShadowEffect BlurRadius="10" Color="#bababa" Direction="80" ShadowDepth="0"/>
+    </Window.Effect>
+>>>>>>> c3ffa44dd9c0e70fe134cf74c328dc36897b6b64
     <Grid>
-        <TextBlock Text="欢迎使用批注！" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="28"/>
+        <TextBlock Text="欢迎使用星火批注！" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" Margin="0,0,0,35"/>
+        <TextBlock Text="使用点阵笔时自动批注，右键退出批注。" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" Margin="0,35,0,0"/>
         <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Right"  Margin="10">
             <TextBlock Text="设备状态：" FontSize="18"/>
             <TextBlock x:Name="txbType" Text="未连接" FontSize="18"/>
         </StackPanel>
+        <Grid Grid.Row="0" Margin="0,0,0,190" Background="#FF00BAF4">
+            <Image Source="/Images/144.png" RenderTransformOrigin="0.1,0.61" HorizontalAlignment="Left" Margin="5,5,0,5" />
+            <Label x:Name="lblTitle" Content="星火批注" HorizontalAlignment="Left" Margin="45,7,0,0" VerticalAlignment="Top" Foreground="#FFFFFFFF" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" FontSize="20" FontWeight="Bold"/>
+            <Button Cursor="Hand" x:Name="BtnClose" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="30" HorizontalAlignment="Right" Margin="0,0,10,0" Click="BtnClose_Click"  >
+                <Image Source="./Images/Toobar5.png"/>
+            </Button>
+            <Button Cursor="Hand" x:Name="BtnMin" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Width="30" HorizontalAlignment="Right" Margin="0,0,50,0" Height="30" Click="BtnMin_Click"  >
+                <Image Source="./Images/microLessonSystem_19.png"/>
+            </Button>
+
+        </Grid>
     </Grid>
 </Window>

XHPZ.Desktop/MainWindow.xaml.cs

@@ -50,6 +50,36 @@ namespace XHPZ.Desktop
             APP.W_PracticeWindow.Initialize();
             APP.W_PracticeWindow.Show();
         }
+
+        private void Window_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                //this.DragMove();              
+                DragMove();
+            }
+        }
+
+        private void BtnClose_Click(object sender, RoutedEventArgs e)
+        {
+            MessageBoxResult br = MessageWindow.Show("确定退出系统？", "退出", MessageBoxButton.OKCancel);
+            if (br == MessageBoxResult.OK)
+            {
+                System.Environment.Exit(0);
+            }
+        }
+
+        private void BtnMin_Click(object sender, RoutedEventArgs e)
+        {
+            if (WindowState == WindowState.Minimized)
+            {
+                WindowState = WindowState.Normal;
+            }
+            else
+            {
+                WindowState = WindowState.Minimized;
+            }
+        }
     }
 
 

XHPZ.Desktop/XHPZ.Desktop.csproj

@@ -150,5 +150,11 @@
   <ItemGroup>
     <Resource Include="xhpz.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\microLessonSystem_19.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Toobar5.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>