From 1e69baaf9dad343348181dcd5c7b7c75a9affc63 Mon Sep 17 00:00:00 2001
From: zxd <zxdaa217@qq.com>
Date: Thu, 3 Jan 2019 14:30:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=B5=B7=E9=A3=9E?=
 =?UTF-8?q?=E7=9A=84bug=20=E6=B7=BB=E5=8A=A0=E4=BA=86=E8=BF=94=E8=88=AA?=
 =?UTF-8?q?=E7=94=B5=E5=8E=8B=20=E6=B7=BB=E5=8A=A0=E4=BA=86=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E6=8E=A7=E5=88=B6=E4=B8=AD=E9=A3=9E=E6=9C=BA=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Formation/CopterManager.cs                | 25 ++++++++++---------
 .../Formation/FlightTask_TakeOff.cs           |  3 ---
 Plane.FormationCreator/MainWindow.xaml        | 11 +++++---
 Plane.FormationCreator/ModifyParam.xaml       | 12 ++++++---
 Plane.FormationCreator/ModifyParam.xaml.cs    |  4 +++
 Plane.FormationCreator/Util/VersionControl.cs | 17 ++++++++++++-
 .../ViewModels/ControlPanelViewModel.cs       | 17 +++++++++++--
 .../ViewModels/CopterListViewModel.cs         |  9 ++++---
 .../Views/ConnectWindow.xaml                  | 13 +++++++---
 .../Views/ConnectWindow.xaml.cs               |  8 ++++++
 .../Views/ControlPanelView.xaml               |  6 +++--
 .../Views/ModifyTaskView.xaml                 |  2 +-
 .../Views/ModifyTaskView.xaml.cs              |  5 ++++
 13 files changed, 96 insertions(+), 36 deletions(-)

diff --git a/Plane.FormationCreator/Formation/CopterManager.cs b/Plane.FormationCreator/Formation/CopterManager.cs
index 0811f6e..8b8d26c 100644
--- a/Plane.FormationCreator/Formation/CopterManager.cs
+++ b/Plane.FormationCreator/Formation/CopterManager.cs
@@ -7,6 +7,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Plane.FormationCreator.Util;
 
 namespace Plane.FormationCreator.Formation
 {
@@ -21,18 +22,18 @@ namespace Plane.FormationCreator.Formation
         {
 
             ////给第三方时候限制数量和时间用
-//             DateTime dateTime2019 = DateTime.Parse("2019-06-20");
-// 
-//             if (DateTime.UtcNow > dateTime2019)
-//             {
-//                 throw new NotImplementedException();
-//             }
-// 
-// 
-//             if (this.Count >= 50)
-//             {
-//                 return 0;
-//             }
+            DateTime dateTime2019 = DateTime.Parse("2019-06-20");
+
+            if (DateTime.UtcNow > dateTime2019)
+            {
+                throw new NotImplementedException();
+            }
+
+
+            if (this.Count >= VersionControl.CopterUpperLimit)
+            {
+                return 0;
+            }
 
             int _index = 0;
             if (this.Count == 0)
diff --git a/Plane.FormationCreator/Formation/FlightTask_TakeOff.cs b/Plane.FormationCreator/Formation/FlightTask_TakeOff.cs
index 0f44e08..b56dacf 100644
--- a/Plane.FormationCreator/Formation/FlightTask_TakeOff.cs
+++ b/Plane.FormationCreator/Formation/FlightTask_TakeOff.cs
@@ -100,7 +100,6 @@ namespace Plane.FormationCreator.Formation
             var copter = info.Copter;
 
             //等待起飞时间
-            Windows.Messages.Message.Show($"{copter.Name}:等待起飞 = {info.TakeOffWaitTime}");
             while ((int)ts.TotalMilliseconds < (int)info.TakeOffWaitTime * 1000)
             {
                 if (_flightTaskManager.IsPaused == true)
@@ -138,12 +137,10 @@ namespace Plane.FormationCreator.Formation
             ts = dtNow - dtLastTime;
             FlightTask task = _flightTaskManager.CurrentRunningTask;
 
-            Windows.Messages.Message.Show($"{copter.Name}:等待到达飞行时间 = {task.TakeOffTime}");
             while (ts.TotalMilliseconds < task.TakeOffTime * 1000)
             {
                 if (_flightTaskManager.IsPaused == true)
                 {
-                    //Windows.Messages.Message.Show($"{copter.Name}:悬停");
                     await info.Copter.HoverAsync();
                     return;
                 }
diff --git a/Plane.FormationCreator/MainWindow.xaml b/Plane.FormationCreator/MainWindow.xaml
index 6ea6386..094666f 100644
--- a/Plane.FormationCreator/MainWindow.xaml
+++ b/Plane.FormationCreator/MainWindow.xaml
@@ -42,15 +42,17 @@
 
     <c:MetroWindow.RightWindowCommands>
         <c:WindowCommands>
-            <Button Content="切换地图"  Command="{Binding ChangeMapModeCommand}"></Button>
+
             <Button Content="{Binding AppEx.ShowModifyTaskView, Converter={StaticResource ShowModifyTaskViewButtonContentConverter}}"
                     Command="{Binding ShowOrHideModifyTaskViewCommand}" />
+            <Button Content="切换地图"  
+                    Command="{Binding ChangeMapModeCommand}"/>
             <Button Content="重启监听"
                     Visibility="Collapsed"
                     Command="{Binding RestartListeningCommand}" />
             <Button Content="{Binding SwitchVelocityModeButtonContent}"
-                    
-                    Command="{Binding SwitchVelocityModeCommand}" />
+                    Command="{Binding SwitchVelocityModeCommand}" 
+                    Visibility="Collapsed"/>
             <!--// 林俊清, 20150930, 不分这些模式了。
             <Button Content="进入任务模式"
                     Command="{Binding SwitchAppModeCommand}"
@@ -62,7 +64,8 @@
                     Visibility="{Binding Source={x:Static local:AppEx.Current}, Path=AppMode, Converter={StaticResource AppModeToVisibilityConverter}, ConverterParameter=SwitchToControllingCoptersModeButton}" />-->
             <Button Name="btnGoHome"
                     Content="回家"
-                    Click="btnGoHome_Click" />
+                    Click="btnGoHome_Click"
+                    Visibility="Collapsed"/>
             <Button Name="btnRefreshMap"
                     Content="刷新地图"
                     Visibility="Collapsed"
diff --git a/Plane.FormationCreator/ModifyParam.xaml b/Plane.FormationCreator/ModifyParam.xaml
index 6b7bed8..b2963c4 100644
--- a/Plane.FormationCreator/ModifyParam.xaml
+++ b/Plane.FormationCreator/ModifyParam.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Plane.FormationCreator"
         mc:Ignorable="d"
-        Title="修改参数" Height="418.215" Width="715.206" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
+        Title="修改参数" Height="469.53" Width="710.075" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
     <Grid Margin="0,0,5,3.5">
         <Grid.ColumnDefinitions>
             <ColumnDefinition/>
@@ -32,6 +32,10 @@
                     <Button Content="š开关灯" Tag="NTF_G_OFF" Click="Modify_Select" Width="130"/>
                     <Label Content="_NTF_G_OFF"/>
                 </StackPanel>
+                <StackPanel Orientation="Horizontal" Margin="2">
+                    <Button Content="š返航电压" Tag="FS_BATT_VOLTAGE" Click="Modify_Select" Width="130"/>
+                    <Label Content="_FS_BATT_VOLTAGE"/>
+                </StackPanel>
             </WrapPanel>
 
             <StackPanel Name="hide_panel">
@@ -77,11 +81,13 @@
                 </StackPanel>
             </StackPanel>
         </WrapPanel>
-        
+
         <StackPanel Grid.Column="1" HorizontalAlignment="Center" Orientation ="Horizontal">
             <WrapPanel VerticalAlignment="Center" Orientation="Vertical" >
-                <Label x:Name="label" Content="参数名称" Margin="5,0,5,5"/>
+                <Label x:Name="label" Content="参数" Margin="5,0,5,5"/>
                 <TextBox x:Name="textParamName" Width="160" Margin="5" />
+                <Label x:Name="label_cn" Content="描述" Margin="5,0,5,5"/>
+                <TextBox x:Name="textParamName_cn" Width="160" Margin="5" IsReadOnly="True"/>
                 <Label x:Name="label_Copy" Content="参数值" Margin="5"/>
                 <TextBox x:Name="textParamValue" Margin="5"/>
                 <Button x:Name="btnModify" Content="修改" Width="100" Margin="10" Click="btnModify_Click"/>
diff --git a/Plane.FormationCreator/ModifyParam.xaml.cs b/Plane.FormationCreator/ModifyParam.xaml.cs
index eb5b9d2..3f90084 100644
--- a/Plane.FormationCreator/ModifyParam.xaml.cs
+++ b/Plane.FormationCreator/ModifyParam.xaml.cs
@@ -29,6 +29,9 @@ namespace Plane.FormationCreator
                 hide_panel.Visibility = Visibility.Collapsed;
                 textParamName.IsReadOnly = true;
                 btnLoad.Visibility = Visibility.Collapsed;
+
+                label.Visibility = Visibility.Collapsed;
+                textParamName.Visibility = Visibility.Collapsed;
             }
         }
 
@@ -41,6 +44,7 @@ namespace Plane.FormationCreator
         private void Modify_Select(object sender, RoutedEventArgs e)
         {
             textParamName.Text = ((Button)sender).Tag.ToString();
+            textParamName_cn.Text = ((Button)sender).Content.ToString();
         }
 
         private void btnLoad_Click(object sender, RoutedEventArgs e)
diff --git a/Plane.FormationCreator/Util/VersionControl.cs b/Plane.FormationCreator/Util/VersionControl.cs
index 0c14d19..cd2e7d2 100644
--- a/Plane.FormationCreator/Util/VersionControl.cs
+++ b/Plane.FormationCreator/Util/VersionControl.cs
@@ -10,16 +10,31 @@ namespace Plane.FormationCreator.Util
     public static class VersionControl
     {
         public static int Version = 0;
+        /// <summary>
+        /// 是否是完整版本 仅在Version = 255时为完整版本
+        /// </summary>
         public static bool IsFullVersion = false;
 
+        /// <summary>
+        /// 默认的飞机上限
+        /// </summary>
+        public static int CopterUpperLimit = 50;
+
         public static void GetVersionFromIni()
         {
             IniFiles iniFiles = new IniFiles();
-            string readvalue = iniFiles.IniReadvalue("Version", "Version");
+
             int intTemp;
+            string readvalue;
+
+            readvalue = iniFiles.IniReadvalue("Version", "Version");
             if (readvalue != "" && int.TryParse(readvalue, out intTemp))
                 Version = int.Parse(readvalue);
             IsFullVersion = Version == 255;
+
+            readvalue = iniFiles.IniReadvalue("Version", "CopterUpperLimit");
+            if (readvalue != "" && int.TryParse(readvalue, out intTemp))
+                CopterUpperLimit = int.Parse(readvalue);
         }
     }
 }
diff --git a/Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs b/Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs
index dea2564..717c730 100644
--- a/Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs
+++ b/Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs
@@ -335,6 +335,16 @@ namespace Plane.FormationCreator.ViewModels
             }
         }
 
+        /// <summary>
+        /// 是否允许开始任务，全部解锁会在3秒内循环发送3次，该过程中不允许开始任务
+        /// </summary>
+        private bool _AllowMissionStart = true;
+        public bool AllowMissionStart
+        {
+            get { return _AllowMissionStart; }
+            set { Set(nameof(AllowMissionStart), ref _AllowMissionStart, value); }
+        }
+
 
         private ICommand _UnlockAllCommand;
         public ICommand UnlockAllCommand
@@ -343,13 +353,16 @@ namespace Plane.FormationCreator.ViewModels
             {
                 return _UnlockAllCommand ?? (_UnlockAllCommand = new RelayCommand(async () =>
                 {
+                    AllowMissionStart = false;
                     // await Task.WhenAll(_copterManager.AcceptingControlCopters.Select(copter => copter.UnlockAsync()));
                     for (int i = 0; i < 3; i++)
                     {
                         await _commModuleManager.UnlockAsync();
                         await Task.Delay(1000).ConfigureAwait(false);
                     }
-                    
+                    await Task.Delay(100);
+                    AllowMissionStart = true;
+
                     /*
                     await Task.WhenAll(_copterManager.Copters.Select(async c => {
                         await c.UnlockAsync();
@@ -963,7 +976,7 @@ namespace Plane.FormationCreator.ViewModels
                     int utchour = DateTime.UtcNow.AddSeconds(5).Hour;
                     int utcminute = DateTime.UtcNow.AddSeconds(5).Minute;
                     int utcsecond = DateTime.UtcNow.AddSeconds(5).Second;
-
+                    Message.Show("开始任务");
                     //循环3次 发送起飞命令 避免通信问题
                     for (int i = 0; i < 5; i++)
                     {
diff --git a/Plane.FormationCreator/ViewModels/CopterListViewModel.cs b/Plane.FormationCreator/ViewModels/CopterListViewModel.cs
index 6acb844..341f335 100644
--- a/Plane.FormationCreator/ViewModels/CopterListViewModel.cs
+++ b/Plane.FormationCreator/ViewModels/CopterListViewModel.cs
@@ -16,6 +16,7 @@ using System.Threading;
 using Plane.Communication;
 using Plane.Geography;
 using Microsoft.Practices.ServiceLocation;
+using Plane.FormationCreator.Util;
 
 namespace Plane.FormationCreator.ViewModels
 {
@@ -131,10 +132,10 @@ namespace Plane.FormationCreator.ViewModels
                 return _AddVirtualCopterCommand ?? (_AddVirtualCopterCommand = new RelayCommand<int>(async addcount =>
                 {
                     //给第三方时候限制数量用
-//                     if (_copterManager.Copters.Count() >= 50)
-//                     {
-//                         return;
-//                     }
+                    if (_copterManager.Copters.Count() >= VersionControl.CopterUpperLimit)
+                    {
+                        return;
+                    }
 
                     var center = _mapManager.Center;
                     string id;
diff --git a/Plane.FormationCreator/Views/ConnectWindow.xaml b/Plane.FormationCreator/Views/ConnectWindow.xaml
index 3ad72fa..2ab71df 100644
--- a/Plane.FormationCreator/Views/ConnectWindow.xaml
+++ b/Plane.FormationCreator/Views/ConnectWindow.xaml
@@ -88,7 +88,9 @@
         <StackPanel Orientation="Horizontal"
                     HorizontalAlignment="Center"
                     Grid.Row="1"
-                    Grid.ColumnSpan="3">
+                    Grid.ColumnSpan="3"
+                    Name="panel1">
+            
             <ec:ProgressButton HorizontalAlignment="Center"
                                VerticalAlignment="Center"
                                Margin="10"
@@ -128,7 +130,8 @@
         <StackPanel Orientation="Horizontal"
                     HorizontalAlignment="Center"
                     Grid.Row="2"
-                    Grid.ColumnSpan="3">
+                    Grid.ColumnSpan="3"
+                    Name="panel2">
             <Button Content="通信模块状态" Margin="5" Command="{Binding Path=StateInquireCommand}"/>
             <Button Content="设置总数" Margin="5" Command="{Binding Path=SendCommand}" />
             <Button Content="切换写航点"  Margin="5" Command="{Binding Path=ChangeWriteMissionCommand}" />
@@ -142,14 +145,16 @@
             <TextBox Margin="2,5,5,5" Width="30" Text="{Binding CopterNum}"></TextBox>
             <Button Content="    对频    "  Margin="5,5,0,5" Command="{Binding Path=WriteIdCommand}" />
             <Button Content="闪灯"  Margin="5" Command="{Binding CommDataAsync}"/>
-            <Button Content="搜索飞机"  Margin="5" Command="{Binding QueryAllCopterCommand}"/>
+            
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" 
                     HorizontalAlignment="Center"
                     Grid.Row="4"
-                    Grid.ColumnSpan="3">
+                    Grid.ColumnSpan="3"
+                    Name="panel3">
             <Button Content="空中升级" Margin="5" Command="{Binding UpdateAllCopterCommand}"></Button>
+            <Button Content="搜索飞机"  Margin="5" Command="{Binding QueryAllCopterCommand}"/>
         </StackPanel>
 
     </Grid>
diff --git a/Plane.FormationCreator/Views/ConnectWindow.xaml.cs b/Plane.FormationCreator/Views/ConnectWindow.xaml.cs
index 46ed6b5..ad43ccb 100644
--- a/Plane.FormationCreator/Views/ConnectWindow.xaml.cs
+++ b/Plane.FormationCreator/Views/ConnectWindow.xaml.cs
@@ -15,6 +15,7 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
+using Plane.FormationCreator.Util;
 
 namespace Plane.FormationCreator.Views
 {
@@ -38,6 +39,13 @@ namespace Plane.FormationCreator.Views
 
             this.DataContext = ServiceLocator.Current.GetInstance<ConnectViewModel>();
 
+            if (!VersionControl.IsFullVersion)
+            {
+                panel1.Visibility = Visibility.Collapsed;
+                panel2.Visibility = Visibility.Collapsed;
+                panel3.Visibility = Visibility.Collapsed;
+            }
+
             txtIPs.Focus();
         }
     }
diff --git a/Plane.FormationCreator/Views/ControlPanelView.xaml b/Plane.FormationCreator/Views/ControlPanelView.xaml
index 44a25e6..dbeab9e 100644
--- a/Plane.FormationCreator/Views/ControlPanelView.xaml
+++ b/Plane.FormationCreator/Views/ControlPanelView.xaml
@@ -102,9 +102,11 @@
             <Button Content="写入航点"
                      Command="{Binding WriteMissionCommand}" />
             <Button Content="全部解锁"
-                     Command="{Binding UnlockAllCommand}" />
+                     Command="{Binding UnlockAllCommand}"
+                     IsEnabled="{Binding AllowMissionStart, UpdateSourceTrigger=PropertyChanged}"  />
             <Button Content="开始任务"
-                     Command="{Binding MissionStartCommand}" />
+                     Command="{Binding MissionStartCommand}"
+                    IsEnabled="{Binding AllowMissionStart, UpdateSourceTrigger=PropertyChanged}"/>
             <Button Content="暂停任务"
                      Command="{Binding MissionPauseCommand}" />
             <Button Content="继续任务"
diff --git a/Plane.FormationCreator/Views/ModifyTaskView.xaml b/Plane.FormationCreator/Views/ModifyTaskView.xaml
index c632a29..ce25ea1 100644
--- a/Plane.FormationCreator/Views/ModifyTaskView.xaml
+++ b/Plane.FormationCreator/Views/ModifyTaskView.xaml
@@ -287,7 +287,7 @@
         <TabItem Header="灯光设计">
             <StackPanel>
 
-                <StackPanel >
+                <StackPanel x:Name="lightDesign">
                     <StackPanel Orientation="Horizontal" Margin="0,5,0,5" >
                         <TextBlock Margin="5,7,0,0" Text="起始时间"/>
                         <TextBox Margin="5,5,0,3" Width="30" Text="{Binding BeginTime}"/>
diff --git a/Plane.FormationCreator/Views/ModifyTaskView.xaml.cs b/Plane.FormationCreator/Views/ModifyTaskView.xaml.cs
index b9010d9..5806b8a 100644
--- a/Plane.FormationCreator/Views/ModifyTaskView.xaml.cs
+++ b/Plane.FormationCreator/Views/ModifyTaskView.xaml.cs
@@ -16,6 +16,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using Plane.Geography;
+using Plane.FormationCreator.Util;
 
 namespace Plane.FormationCreator.Views
 {
@@ -30,6 +31,10 @@ namespace Plane.FormationCreator.Views
             InitializeComponent();
 
             this.DataContext = _modifyTaskViewModel;
+            if (!VersionControl.IsFullVersion)
+            {
+                lightDesign.Visibility = Visibility.Collapsed;
+            }
         }
 
         private void Button_Click(object sender, RoutedEventArgs e)