From 4b54e56ebcf55d51182c9b4def6369d66637b4a3 Mon Sep 17 00:00:00 2001
From: xu <pxzleo@126.com>
Date: Sun, 11 Jul 2021 23:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=9B=9E=E9=A3=9E=E8=A1=8C=E9=AD=94?=
 =?UTF-8?q?=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plane.FormationCreator/Formation/CopterManager.cs    | 2 +-
 Plane.FormationCreator/MainWindow.xaml               | 2 +-
 Plane.FormationCreator/Plane.FormationCreator.csproj | 4 ++--
 Plane.FormationCreator/Views/ConnectWindow.xaml      | 2 +-
 Plane.FormationCreator/Views/LoginView.xaml          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Plane.FormationCreator/Formation/CopterManager.cs b/Plane.FormationCreator/Formation/CopterManager.cs
index 4ccaa29..ea79b06 100644
--- a/Plane.FormationCreator/Formation/CopterManager.cs
+++ b/Plane.FormationCreator/Formation/CopterManager.cs
@@ -25,7 +25,7 @@ namespace Plane.FormationCreator.Formation
     public class CopterCollection : ObservableCollection<ICopter>
     {
         //软件过期时间---过期将无法添加飞机，并自动退出
-        public static DateTime Expire_App = DateTime.Parse("2021-08-10");
+        public static DateTime Expire_App = DateTime.Parse("2022-06-10");
         //超级用户过期时间--过期将无法使用内置超级用户登录
         public static DateTime Expire_SuperUser = Expire_App;
         //允许飞行的飞机数量
diff --git a/Plane.FormationCreator/MainWindow.xaml b/Plane.FormationCreator/MainWindow.xaml
index 95c8d7b..3c3e992 100644
--- a/Plane.FormationCreator/MainWindow.xaml
+++ b/Plane.FormationCreator/MainWindow.xaml
@@ -13,7 +13,7 @@
                WindowTransitionsEnabled="False"
                FontFamily="Microsoft YaHei"
                WindowState="Maximized"
-               Title="中科浩电无人机编队控制系统 V2.0"
+               Title="飞行魔方无人机编队控制系统 V2.0"
                PreviewKeyDown="MetroWindow_PreviewKeyDown"
                PreviewKeyUp="MetroWindow_PreviewKeyUp"
                Style="{StaticResource VSWindowStyleKey}"
diff --git a/Plane.FormationCreator/Plane.FormationCreator.csproj b/Plane.FormationCreator/Plane.FormationCreator.csproj
index 4bc5370..483c843 100644
--- a/Plane.FormationCreator/Plane.FormationCreator.csproj
+++ b/Plane.FormationCreator/Plane.FormationCreator.csproj
@@ -480,7 +480,7 @@
     <Resource Include="gcs.ico" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="SplashScreen1.png" />
+    <SplashScreen Include="SplashScreen1.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="bg.jpg" />
@@ -492,7 +492,7 @@
     <Resource Include="Resources\logo_big.png" />
   </ItemGroup>
   <ItemGroup>
-    <SplashScreen Include="SplashScreen2.png" />
+    <None Include="SplashScreen2.png" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.6">
diff --git a/Plane.FormationCreator/Views/ConnectWindow.xaml b/Plane.FormationCreator/Views/ConnectWindow.xaml
index 3a821b9..90fc952 100644
--- a/Plane.FormationCreator/Views/ConnectWindow.xaml
+++ b/Plane.FormationCreator/Views/ConnectWindow.xaml
@@ -85,7 +85,7 @@
 
 
 
-        <Image  Margin="0,0,0,0" x:Name="image1"  Grid.RowSpan="2"  Grid.Row="4"  Source="/Resources/Logo_small.png"   HorizontalAlignment="Left" Visibility="Hidden" />
+        <Image  Margin="0,0,0,0" x:Name="image1"  Grid.RowSpan="2"  Grid.Row="4"  Source="/Resources/Logo_small.png"   HorizontalAlignment="Left"  />
         <TextBlock Margin="5"    Grid.Row="5"  x:Name="about_ver" HorizontalAlignment="Right" VerticalAlignment="Bottom" Text="版本：V2.0.1213" />
         <TextBlock Margin="5"  Grid.Row="6" HorizontalAlignment="Right" x:Name="about_buildtm" VerticalAlignment="Bottom" Text="编译日期：2020.12.12" />
 
diff --git a/Plane.FormationCreator/Views/LoginView.xaml b/Plane.FormationCreator/Views/LoginView.xaml
index 22c0e46..63b027c 100644
--- a/Plane.FormationCreator/Views/LoginView.xaml
+++ b/Plane.FormationCreator/Views/LoginView.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:ignore="http://www.galasoft.ch/ignore"
         xmlns:Helper="clr-namespace:Plane.Util"
-        mc:Ignorable="d ignore" Height="253.421" Width="463.894" Title="中科浩电地面控制中心" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
+        mc:Ignorable="d ignore" Height="253.421" Width="463.894" Title="飞行魔方地面控制中心" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
  >
 
     <Grid HorizontalAlignment="Center" VerticalAlignment="Center">