From 417f761e407a051d2b969af3672cb1a00e11c7bc Mon Sep 17 00:00:00 2001
From: xu <pxzleo@126.com>
Date: Fri, 22 May 2020 22:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E9=A2=84=E5=85=88=E5=88=86?=
 =?UTF-8?q?=E9=85=8DVID=20=E8=87=AA=E5=8A=A8=E5=88=86=E9=85=8D=E5=90=8E?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Plane.FormationCreator/Formation/CopterManager.cs          | 7 +++++++
 .../ViewModels/ConfigVirtualIdViewModel.cs                 | 2 ++
 Plane.FormationCreator/ViewModels/CopterListViewModel.cs   | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Plane.FormationCreator/Formation/CopterManager.cs b/Plane.FormationCreator/Formation/CopterManager.cs
index 35df9da..7d4a0b2 100644
--- a/Plane.FormationCreator/Formation/CopterManager.cs
+++ b/Plane.FormationCreator/Formation/CopterManager.cs
@@ -284,6 +284,13 @@ namespace Plane.FormationCreator.Formation
             }
         }
 
+        public void ReSort()
+        {
+            SortType = _SortType;
+
+
+        }
+
 
 
         private int _EnCopterNumber = 0;
diff --git a/Plane.FormationCreator/ViewModels/ConfigVirtualIdViewModel.cs b/Plane.FormationCreator/ViewModels/ConfigVirtualIdViewModel.cs
index ced2182..f5f9e91 100644
--- a/Plane.FormationCreator/ViewModels/ConfigVirtualIdViewModel.cs
+++ b/Plane.FormationCreator/ViewModels/ConfigVirtualIdViewModel.cs
@@ -143,6 +143,7 @@ namespace Plane.FormationCreator.ViewModels
                         copter.VirtualId = SingleVirtualId;
                         Message.Show($"飞机{copter.Name} 设置编号={SingleVirtualId}");
                     }
+                    _copterManager.ReSort();
 
                 }));
             }
@@ -202,6 +203,7 @@ namespace Plane.FormationCreator.ViewModels
                                  }
                         }
                       }
+                     _copterManager.ReSort();
                 }));
             }
         }
diff --git a/Plane.FormationCreator/ViewModels/CopterListViewModel.cs b/Plane.FormationCreator/ViewModels/CopterListViewModel.cs
index 1ede92c..4fc0a96 100644
--- a/Plane.FormationCreator/ViewModels/CopterListViewModel.cs
+++ b/Plane.FormationCreator/ViewModels/CopterListViewModel.cs
@@ -336,7 +336,8 @@ namespace Plane.FormationCreator.ViewModels
                                 id: id,
                                 name: id
                             );
-                            copter.VirtualId = _virtualCopterId;
+                            //不再预先分配VID
+                           // copter.VirtualId = _virtualCopterId;
                             await copter.ConnectAsync();
                             await copter.GetCopterDataAsync();
                             _copterManager.Copters.AddCopter(copter, _copterManager.SortType);