更改名称

BPASmartClient/LoginOrderView.xaml

@@ -1,14 +1,21 @@
-<Window x:Class="BPASmartClient.LoginOrderView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:BPASmartClient"
-        xmlns:vm="clr-namespace:BPASmartClient.ViewModel;assembly=BPASmartClient.ViewModel"
-        mc:Ignorable="d" Background="{x:Null}" WindowStartupLocation="CenterScreen" WindowState="Maximized" WindowStyle="None"
-        Title="LoginOrderView" Height="450" Width="800">
+<Window
+    x:Class="BPASmartClient.LoginOrderView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.ViewModel;assembly=BPASmartClient.ViewModel"
+    Title="LoginOrderView"
+    Width="800"
+    Height="450"
+    Background="{x:Null}"
+    WindowStartupLocation="CenterScreen"
+    WindowState="Maximized"
+    WindowStyle="None"
+    mc:Ignorable="d">
     <Window.DataContext>
-        <vm:LoginViewModel x:Name="Login"/>
+        <vm:LoginViewModel x:Name="Login" />
     </Window.DataContext>
     <Window.Resources>
         <ResourceDictionary>
@@ -16,59 +23,77 @@
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
-            <LinearGradientBrush x:Key="wordColor" StartPoint="0,0" EndPoint="1,1" Opacity="1">
-                <GradientStop Offset="0" Color="#2160E6"/>
-                <GradientStop Offset="1" Color="#6682CA"/>
+            <LinearGradientBrush x:Key="wordColor" Opacity="1" StartPoint="0,0" EndPoint="1,1">
+                <GradientStop Offset="0" Color="#2160E6" />
+                <GradientStop Offset="1" Color="#6682CA" />
             </LinearGradientBrush>
-            <LinearGradientBrush x:Key="infoColor" StartPoint="0,0" EndPoint="1,1" Opacity="1">
-                <GradientStop Offset="0" Color="#0AB2F2"/>
-                <GradientStop Offset="1" Color="#48ADD8"/>
+            <LinearGradientBrush x:Key="infoColor" Opacity="1" StartPoint="0,0" EndPoint="1,1">
+                <GradientStop Offset="0" Color="#0AB2F2" />
+                <GradientStop Offset="1" Color="#48ADD8" />
             </LinearGradientBrush>
         </ResourceDictionary>
     </Window.Resources>
     <Grid Background="Transparent">
         <Grid x:Name="mainView" Visibility="Visible">
             <Grid.Background>
-                <LinearGradientBrush StartPoint="0,0" EndPoint="0,1" Opacity="0.9">
-                    <GradientStop Offset="0" Color="#ADD5FE"/>
-                    <GradientStop Offset="1" Color="#FFFFFF"/>
+                <LinearGradientBrush Opacity="0.9" StartPoint="0,0" EndPoint="0,1">
+                    <GradientStop Offset="0" Color="#ADD5FE" />
+                    <GradientStop Offset="1" Color="#FFFFFF" />
                 </LinearGradientBrush>
             </Grid.Background>
             <Grid.RowDefinitions>
-                <RowDefinition/>
-                <RowDefinition Height="7*"/>
-                <RowDefinition Height="0.4*"/>
+                <RowDefinition />
+                <RowDefinition Height="7*" />
+                <RowDefinition Height="0.4*" />
             </Grid.RowDefinitions>
             <Grid>
-                <TextBlock Foreground="{StaticResource wordColor}" VerticalAlignment="Bottom" Margin="50,0,0,10" FontFamily="STHupo" Text="煮面机程序" FontSize="40"/>
+                <TextBlock
+                    Margin="50,0,0,10"
+                    VerticalAlignment="Bottom"
+                    FontFamily="STHupo"
+                    FontSize="40"
+                    Foreground="{StaticResource wordColor}"
+                    Text="MORK-S智能捞煮机" />
             </Grid>
-           
-            <Grid Grid.Row="1" Background="Black" Margin="50,0">
+
+            <Grid
+                Grid.Row="1"
+                Margin="50,0"
+                Background="Black">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition  Width="1.2*"/>
-                    <ColumnDefinition/>
+                    <ColumnDefinition Width="1.2*" />
+                    <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Grid>
                     <Image Source="../../Image/noodle_1.jpg" Stretch="UniformToFill" />
-                    <Border BorderBrush="White" BorderThickness="0.8" Margin="10"/>
+                    <Border
+                        Margin="10"
+                        BorderBrush="White"
+                        BorderThickness="0.8" />
                 </Grid>
                 <Grid Grid.Column="1">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="0.6*"/>
-                        <RowDefinition/>
+                        <RowDefinition Height="0.6*" />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
                     <Grid>
                         <Border Margin="0,0,0,2" BorderThickness="0">
                             <Border.Background>
-                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1" Opacity="0.9">
+                                <LinearGradientBrush Opacity="0.9" StartPoint="0,0" EndPoint="1,1">
                                     <GradientStop Offset="0.0" Color="#F9AD39" />
                                     <GradientStop Offset="0.75" Color="#DE6A14" />
                                 </LinearGradientBrush>
                             </Border.Background>
                         </Border>
-                        <Button Content="开始点餐" Tag="OrderStatusView" Style="{DynamicResource viewBtn_1}" Click="btnClick" FontSize="50" Foreground="White">
+                        <Button
+                            Click="btnClick"
+                            Content="开始点餐"
+                            FontSize="50"
+                            Foreground="White"
+                            Style="{DynamicResource viewBtn_1}"
+                            Tag="OrderStatusView">
                             <Button.Background>
-                                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/点餐.png"/>
+                                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/点餐.png" />
                             </Button.Background>
                         </Button>
                     </Grid>
@@ -76,14 +101,20 @@
                         <UniformGrid Columns="2">
                             <Border Margin="0,2,2,0" BorderThickness="0">
                                 <Border.Background>
-                                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,1" Opacity="0.8">
+                                    <LinearGradientBrush Opacity="0.8" StartPoint="0,0" EndPoint="1,1">
                                         <GradientStop Offset="0.0" Color="#3782B8" />
                                         <GradientStop Offset="0.75" Color="#38B0E6" />
                                     </LinearGradientBrush>
                                 </Border.Background>
-                                <Button Content="编辑菜谱" Tag="EditRecipeView" Click="btnClick" Style="{DynamicResource viewBtn_2}" FontSize="50" Foreground="White">
+                                <Button
+                                    Click="btnClick"
+                                    Content="编辑菜谱"
+                                    FontSize="50"
+                                    Foreground="White"
+                                    Style="{DynamicResource viewBtn_2}"
+                                    Tag="EditRecipeView">
                                     <Button.Background>
-                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/菜谱.png"/>
+                                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/菜谱.png" />
                                     </Button.Background>
                                 </Button>
                             </Border>
@@ -91,45 +122,62 @@
                                 <Grid>
                                     <Border Margin="2,2,0,2" BorderThickness="0">
                                         <Border.Background>
-                                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1" Opacity="0.9">
+                                            <LinearGradientBrush Opacity="0.9" StartPoint="0,0" EndPoint="1,1">
                                                 <GradientStop Offset="0.0" Color="#77D268" />
                                                 <GradientStop Offset="0.75" Color="#26D07F" />
                                             </LinearGradientBrush>
                                         </Border.Background>
                                     </Border>
-                                    <Button Content="订单状态" Tag="FoodMenuView" Click="btnClick" Style="{DynamicResource viewBtn_1}" FontSize="50" Foreground="White">
+                                    <Button
+                                        Click="btnClick"
+                                        Content="订单状态"
+                                        FontSize="50"
+                                        Foreground="White"
+                                        Style="{DynamicResource viewBtn_1}"
+                                        Tag="FoodMenuView">
                                         <Button.Background>
-                                            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/状态.png"/>
+                                            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/状态.png" />
                                         </Button.Background>
                                     </Button>
                                 </Grid>
                                 <Grid>
                                     <Border Margin="2,2,0,2" BorderThickness="0">
                                         <Border.Background>
-                                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1" Opacity="0.9">
+                                            <LinearGradientBrush Opacity="0.9" StartPoint="0,0" EndPoint="1,1">
                                                 <GradientStop Offset="0.0" Color="#6481CF" />
                                                 <GradientStop Offset="0.75" Color="#6A9FDD" />
                                             </LinearGradientBrush>
                                         </Border.Background>
                                     </Border>
-                                    <Button Content="设备调试" Tag="DeviceCtrlView" Click="btnClick" Style="{DynamicResource viewBtn_1}" FontSize="50" Foreground="White">
+                                    <Button
+                                        Click="btnClick"
+                                        Content="设备调试"
+                                        FontSize="50"
+                                        Foreground="White"
+                                        Style="{DynamicResource viewBtn_1}"
+                                        Tag="DeviceCtrlView">
                                         <Button.Background>
-                                            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/Settings.png"/>
+                                            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/Settings.png" />
                                         </Button.Background>
                                     </Button>
                                 </Grid>
                                 <Grid>
                                     <Border Margin="2,2,0,0" BorderThickness="0">
                                         <Border.Background>
-                                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1" Opacity="0.9">
+                                            <LinearGradientBrush Opacity="0.9" StartPoint="0,0" EndPoint="1,1">
                                                 <GradientStop Offset="0.0" Color="#AB52EE" />
                                                 <GradientStop Offset="0.75" Color="#AC78D6" />
                                             </LinearGradientBrush>
                                         </Border.Background>
                                     </Border>
-                                    <Button Content="管理员" Click="admin" Style="{DynamicResource viewBtn_1}" FontSize="50" Foreground="White">
+                                    <Button
+                                        Click="admin"
+                                        Content="管理员"
+                                        FontSize="50"
+                                        Foreground="White"
+                                        Style="{DynamicResource viewBtn_1}">
                                         <Button.Background>
-                                            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/管理员-用户查询.png"/>
+                                            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/管理员-用户查询.png" />
                                         </Button.Background>
                                     </Button>
                                 </Grid>
@@ -143,38 +191,111 @@
         </Grid>
         <Grid x:Name="orderView" Visibility="Collapsed">
             <Grid.RowDefinitions>
-                <RowDefinition Height=" 0.08*"/>
-                <RowDefinition/>
+                <RowDefinition Height=" 0.08*" />
+                <RowDefinition />
             </Grid.RowDefinitions>
             <Border Background="#368CF2">
                 <Grid>
-                    <Button Style="{StaticResource viewBtn_1}"  Click="Button_Click" FontSize="30" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="20,0">
+                    <Button
+                        Margin="20,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Click="Button_Click"
+                        FontSize="30"
+                        Foreground="White"
+                        Style="{StaticResource viewBtn_1}">
                         <Button.Background>
-                            <ImageBrush ImageSource="../../Image/主页.png"/>
+                            <ImageBrush ImageSource="../../Image/主页.png" />
                         </Button.Background>
                     </Button>
                 </Grid>
             </Border>
-            <ContentControl Grid.Row="1" x:Name="orderContent"/>
+            <ContentControl x:Name="orderContent" Grid.Row="1" />
         </Grid>
-        <Grid  HorizontalAlignment="Center" Margin="0,10"  VerticalAlignment="Top" Background="Transparent">
-            <TextBlock Text="主页" x:Name="titleText" HorizontalAlignment="Center" Foreground="White" FontWeight="Black" FontSize="50" VerticalAlignment="Center"/>
+        <Grid
+            Margin="0,10"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Top"
+            Background="Transparent">
+            <TextBlock
+                x:Name="titleText"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="50"
+                FontWeight="Black"
+                Foreground="White"
+                Text="主页" />
         </Grid>
-        <Grid  HorizontalAlignment="Left" Margin="250,15"  VerticalAlignment="Top" Background="Transparent">
-            <TextBlock Text="设备未连接" x:Name="errorText" HorizontalAlignment="Center" Foreground="Red" FontWeight="Black" FontSize="40" VerticalAlignment="Center"/>
+        <Grid
+            Margin="250,15"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top"
+            Background="Transparent">
+            <TextBlock
+                x:Name="errorText"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="40"
+                FontWeight="Black"
+                Foreground="Red"
+                Text="设备未连接" />
         </Grid>
-        <Border Margin="0,10,40,0" HorizontalAlignment="Right" VerticalAlignment="Top" Height="60" Width="60" >
-            <Button Style="{StaticResource adbtn}" Height="60" Click="Close_Click" Width="60" BorderThickness="0"  HorizontalAlignment="Center" VerticalAlignment="Center">
+        <Border
+            Width="60"
+            Height="60"
+            Margin="0,10,40,0"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Top">
+            <Button
+                Width="60"
+                Height="60"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                BorderThickness="0"
+                Click="Close_Click"
+                Style="{StaticResource adbtn}">
                 <Button.Background>
-                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/退出_1.png"/>
+                    <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/退出_1.png" />
                 </Button.Background>
             </Button>
         </Border>
-        <Grid Visibility="Collapsed" x:Name="infoGrid" Margin="0,120" HorizontalAlignment="Center"  Height="60" Width="400" VerticalAlignment="Top" Background="Transparent">
-            <Border Background="{DynamicResource infoColor}" BorderBrush="Black" BorderThickness="2" />
-            <Button Margin="5,4,0,0" Click="Info_Click" Style="{StaticResource adbtn}" Background="Transparent" Content="关闭" FontSize="12" BorderThickness="0" Foreground="Black"  HorizontalAlignment="Left" VerticalAlignment="Top"/>
-            <TextBlock Text="下单成功" x:Name="infoText" Foreground="Black" FontWeight="Black" HorizontalAlignment="Center" FontSize="25" />
-            <Image Margin="0,0,20,0" Source="/BPASmartClient.CustomResource;component/Image/提示.png" HorizontalAlignment="Right" VerticalAlignment="Center" Height="30"/> 
+        <Grid
+            x:Name="infoGrid"
+            Width="400"
+            Height="60"
+            Margin="0,120"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Top"
+            Background="Transparent"
+            Visibility="Collapsed">
+            <Border
+                Background="{DynamicResource infoColor}"
+                BorderBrush="Black"
+                BorderThickness="2" />
+            <Button
+                Margin="5,4,0,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Background="Transparent"
+                BorderThickness="0"
+                Click="Info_Click"
+                Content="关闭"
+                FontSize="12"
+                Foreground="Black"
+                Style="{StaticResource adbtn}" />
+            <TextBlock
+                x:Name="infoText"
+                HorizontalAlignment="Center"
+                FontSize="25"
+                FontWeight="Black"
+                Foreground="Black"
+                Text="下单成功" />
+            <Image
+                Height="30"
+                Margin="0,0,20,0"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                Source="/BPASmartClient.CustomResource;component/Image/提示.png" />
         </Grid>
     </Grid>
 </Window>