From 5c6cf9ecdb174133c923d3c597ab351cde3c9cfc Mon Sep 17 00:00:00 2001
From: xu <pxzleo@126.com>
Date: Tue, 4 Feb 2020 02:10:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=AA=97=E5=8F=A3=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=89=88=E6=9C=AC=E5=8F=B7=E5=92=8C=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plane.FormationCreator/MainWindow.xaml         |   2 +-
 Plane.FormationCreator/MainWindow.xaml.cs      |   8 ++++++--
 .../Plane.FormationCreator.csproj              |   3 +++
 .../Properties/AssemblyInfo.cs                 |   4 ++--
 .../Properties/Resources.Designer.cs           |  10 ++++++++++
 .../Properties/Resources.resx                  |  17 ++++++++++++-----
 .../Resources/Logo_small.png                   | Bin 0 -> 9759 bytes
 .../Views/ConnectWindow.xaml                   |  14 +++++++++++---
 .../Views/ConnectWindow.xaml.cs                |   7 +++++++
 9 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 Plane.FormationCreator/Resources/Logo_small.png

diff --git a/Plane.FormationCreator/MainWindow.xaml b/Plane.FormationCreator/MainWindow.xaml
index d2c6f7f..2da5bf9 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/MainWindow.xaml.cs b/Plane.FormationCreator/MainWindow.xaml.cs
index cf1026f..6f99c4d 100644
--- a/Plane.FormationCreator/MainWindow.xaml.cs
+++ b/Plane.FormationCreator/MainWindow.xaml.cs
@@ -21,6 +21,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using Plane.CommunicationManagement;
+using System.Reflection;
 
 namespace Plane.FormationCreator
 {
@@ -34,7 +35,10 @@ namespace Plane.FormationCreator
             InitializeComponent();
 
             this.DataContext = ServiceLocator.Current.GetInstance<MainViewModel>();
-            
+            //改到设置窗口显示版本信息
+            //  var version = Assembly.GetExecutingAssembly().GetName().Version;
+           // Title = "飞行魔方无人机编队控制系统 V" + version.ToString() + "编译时间[" + System.IO.File.GetLastWriteTime(this.GetType().Assembly.Location).ToString() + "]";
+
 
             //ShowConnectDialog();
             //if (_copterManager.CoptersForControlling.Count <= 0)
@@ -53,7 +57,7 @@ namespace Plane.FormationCreator
             {
                 loginWindow = new ConnectWindow();
             }
-            loginWindow.Show();
+            loginWindow.ShowDialog ();
         }
 
         private void btnLogin_Click(object sender, RoutedEventArgs e)
diff --git a/Plane.FormationCreator/Plane.FormationCreator.csproj b/Plane.FormationCreator/Plane.FormationCreator.csproj
index cfe3fd9..60e4950 100644
--- a/Plane.FormationCreator/Plane.FormationCreator.csproj
+++ b/Plane.FormationCreator/Plane.FormationCreator.csproj
@@ -450,6 +450,9 @@
   <ItemGroup>
     <Resource Include="bg.jpg" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Logo_small.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\System.Data.SQLite.Core.1.0.109.1\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.109.1\build\net46\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/Plane.FormationCreator/Properties/AssemblyInfo.cs b/Plane.FormationCreator/Properties/AssemblyInfo.cs
index 07a28c4..91b68c1 100644
--- a/Plane.FormationCreator/Properties/AssemblyInfo.cs
+++ b/Plane.FormationCreator/Properties/AssemblyInfo.cs
@@ -12,7 +12,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("GroupGCS")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("Copyright ©  2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.0.*")]
 [assembly: AssemblyFileVersion("2.0.0.0")]
diff --git a/Plane.FormationCreator/Properties/Resources.Designer.cs b/Plane.FormationCreator/Properties/Resources.Designer.cs
index daba46d..29c85c9 100644
--- a/Plane.FormationCreator/Properties/Resources.Designer.cs
+++ b/Plane.FormationCreator/Properties/Resources.Designer.cs
@@ -59,5 +59,15 @@ namespace Plane.FormationCreator.Properties {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap Logo_small {
+            get {
+                object obj = ResourceManager.GetObject("Logo_small", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }
diff --git a/Plane.FormationCreator/Properties/Resources.resx b/Plane.FormationCreator/Properties/Resources.resx
index af7dbeb..2bf4ce0 100644
--- a/Plane.FormationCreator/Properties/Resources.resx
+++ b/Plane.FormationCreator/Properties/Resources.resx
@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -85,9 +87,10 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -109,9 +112,13 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Logo_small" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Logo_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Plane.FormationCreator/Resources/Logo_small.png b/Plane.FormationCreator/Resources/Logo_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5de718ed9345a60cb623712005a665901f95e46
GIT binary patch
literal 9759
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
bU@ZNdt`CaUHE)0ag-cUaSLKb8ZP@<-B|wHZ

literal 0
HcmV?d00001

diff --git a/Plane.FormationCreator/Views/ConnectWindow.xaml b/Plane.FormationCreator/Views/ConnectWindow.xaml
index b5daa58..0a23acf 100644
--- a/Plane.FormationCreator/Views/ConnectWindow.xaml
+++ b/Plane.FormationCreator/Views/ConnectWindow.xaml
@@ -7,9 +7,9 @@
                xmlns:c="http://metro.mahapps.com/winfx/xaml/controls"
                xmlns:ec="clr-namespace:Plane.Windows.Controls;assembly=Plane.Windows"
                mc:Ignorable="d"
-               Title="设置"
-               Width="496.634"
-               Height="205.942"
+               Title=""
+               Width="500"
+               Height="300"
              
                WindowStartupLocation="CenterScreen"
                FontFamily="Microsoft YaHei"
@@ -23,6 +23,8 @@
             <RowDefinition Height="40"  />
             <RowDefinition Height="40"  />
             <RowDefinition Height="40" />
+            <RowDefinition Height="50" />
+            <RowDefinition Height="30" />
         </Grid.RowDefinitions>
 
         <Grid.ColumnDefinitions>
@@ -58,6 +60,12 @@
             <Button Content="搜索飞机" Width="90"  Margin="5,5,5,5"  Command="{Binding QueryAllCopterCommand}"/>
         </StackPanel>
 
+        <Image  Margin="0,0,0,0" x:Name="image1"  Grid.RowSpan="2"  Grid.Row="3"  Source="/Resources/Logo_small.png"   HorizontalAlignment="Left" />
+        <TextBlock Margin="5"    Grid.Row="3"  x:Name="about_ver" HorizontalAlignment="Right" VerticalAlignment="Bottom" Text="版本：V2.0.1213" />
+        <TextBlock Margin="5"  Grid.Row="4" HorizontalAlignment="Right" x:Name="about_buildtm" VerticalAlignment="Bottom" Text="编译日期：2020.12.12" />
+
+
+
 
     </Grid>
 </c:MetroWindow>
diff --git a/Plane.FormationCreator/Views/ConnectWindow.xaml.cs b/Plane.FormationCreator/Views/ConnectWindow.xaml.cs
index 2a11a6b..605cac5 100644
--- a/Plane.FormationCreator/Views/ConnectWindow.xaml.cs
+++ b/Plane.FormationCreator/Views/ConnectWindow.xaml.cs
@@ -16,6 +16,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using Plane.FormationCreator.Util;
+using System.Reflection;
 
 namespace Plane.FormationCreator.Views
 {
@@ -46,6 +47,12 @@ namespace Plane.FormationCreator.Views
                 panel3.Visibility = Visibility.Collapsed;
             }
 
+            var version = Assembly.GetExecutingAssembly().GetName().Version;
+            about_ver.Text = "版本：" + version.ToString();
+            about_buildtm .Text= "编译时间：" + System.IO.File.GetLastWriteTime(this.GetType().Assembly.Location).ToString() ;
+
+
+
             //txtIPs.Focus();
         }
     }