group/Plane.FormationCreator
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

开始加入登录，功能还没实现，加入工具类

Browse Source 
日志窗口可拖动宽度
This commit is contained in:
xu 2020-02-23 16:05:27 +08:00
parent 7fb0bcf60e
commit 6cb44d5401
7 changed files with 111 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Plane.FormationCreator/MainWindow.xaml
View File

@ -43,6 +43,9 @@
<c:MetroWindow.RightWindowCommands>
<c:WindowCommands>
<Button Content="登陆"
Command="{Binding LoginCommand}" />
<Button Content="{Binding AppEx.ShowModifyTaskView, Converter={StaticResource ShowModifyTaskViewButtonContentConverter}}"
Command="{Binding ShowOrHideModifyTaskViewCommand}" />
<Button Content="{Binding b2DMapMode, Converter={StaticResource Show2d3dButtonContentConverter}}"
@ -131,7 +134,7 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid Margin="1">
<Grid Margin="1" d:IsHidden="True">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="73*" />
<ColumnDefinition Width="27*" MinWidth="360" />
@ -240,16 +243,37 @@
</Grid>
</Border>
<TextBox Name="logTextBox" Height="700" Width="600" Background="#FF2D2D2D"
<Grid x:Name="logGrid" Height="900" VerticalAlignment="Top" HorizontalAlignment="Left" Visibility="Hidden" >
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition MinWidth="20" MaxWidth="800" Width="500"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<DockPanel Grid.Row="0" Grid.Column="0">
<TextBox x:Name="logTextBox" Height="900" Width="800" Background="#FF2D2D2D"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Visibility="Hidden"
VerticalAlignment="Top"
Text="{Binding Logs}"
ScrollViewer.VerticalScrollBarVisibility="Auto"
TextChanged="LogTextChange"
IsReadOnly="True"
TextWrapping="Wrap"
ContextMenu="{StaticResource LogMenu}"/>
</DockPanel>
<GridSplitter Grid.Row="0" Grid.Column="1" Width="3" Margin="0,0,0,0" Background="MidnightBlue"
VerticalAlignment="Stretch" HorizontalAlignment="Center" />
</Grid>
</Grid>
</c:MetroWindow>

10
Plane.FormationCreator/MainWindow.xaml.cs
View File

@ -490,12 +490,14 @@ namespace Plane.FormationCreator
private void LogShowHide(object sender, MouseButtonEventArgs e)
{
if (logTextBox.Visibility == Visibility.Visible)
logTextBox.Visibility = Visibility.Hidden;
if (logGrid.Visibility == Visibility.Visible)
logGrid.Visibility = Visibility.Hidden;
else
{
logTextBox.Height= Math.Max( map.ActualHeight, map3D.ActualHeight) - ((TaskBarView) TaskbarControl).TasksControl.ActualHeight;
logTextBox.Visibility = Visibility.Visible;
logGrid.Height = Math.Max(map.ActualHeight, map3D.ActualHeight) - ((TaskBarView)TaskbarControl).TasksControl.ActualHeight;
logTextBox.Height = logGrid.Height;
logGrid.Visibility = Visibility.Visible;
}
}

1
Plane.FormationCreator/Plane.FormationCreator.csproj
View File

@ -187,6 +187,7 @@
<Compile Include="ServiceLocatorConfigurer.cs" />
<Compile Include="Test.cs" />
<Compile Include="CalculationLogLatDistance.cs" />
<Compile Include="Util\AsynDataUtils.cs" />
<Compile Include="Util\CommNTRIP.cs" />
<Compile Include="Util\CommsSerialPort.cs">
<SubType>Component</SubType>

4
Plane.FormationCreator/Properties/AssemblyInfo.cs
View File

@ -10,8 +10,8 @@ using System.Windows;
[assembly: AssemblyTitle("GroupGCSMain")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("GroupGCS")]
[assembly: AssemblyCompany("北京飞行魔方科技有限公司")]
[assembly: AssemblyProduct("无人机编队地面控制系统")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

5
Plane.FormationCreator/Properties/DesignTimeResources.xaml
View File

@ -1,5 +1,8 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Plane.FormationCreator.Properties">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/FGCS;component/Styles/Window.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>

58
Plane.FormationCreator/Util/AsynDataUtils.cs Normal file
View File

@ -0,0 +1,58 @@
using System;
using System.IO;
using System.Net;
using System.Text;
namespace Plane.Util
{
public class AsynDataUtils
{
public delegate void DataResultCallBack(string data);
DataResultCallBack _callback;
public void AsynGetData(string tagUrl, DataResultCallBack callback)
{
try
{
_callback = callback;
AsyncGetWithWebRequest(tagUrl, new AsyncCallback(ReadCallback));
}
catch (Exception ex)
{
Console.WriteLine(ex.Message);
}
}
private void ReadCallback(IAsyncResult asynchronousResult)
{
try
{
string DefaultUserAgent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; SV1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)";
var request = (HttpWebRequest)asynchronousResult.AsyncState;
request.Timeout = 5000;
request.Method = "GET";
request.UserAgent = DefaultUserAgent;
var response = (HttpWebResponse)request.EndGetResponse(asynchronousResult);
using (var streamReader = new StreamReader(response.GetResponseStream(), System.Text.Encoding.Default ))
{
var resultString = streamReader.ReadToEnd();
Console.WriteLine(resultString);
if (_callback != null)
{
_callback(resultString);
}
}
}
catch (Exception ex)
{
}
}
private void AsyncGetWithWebRequest(string url, AsyncCallback callback)
{
var request = (HttpWebRequest)System.Net.WebRequest.Create(new Uri(url));
request.BeginGetResponse(callback, request);
}
}
}

12
Plane.FormationCreator/ViewModels/MainViewModel.cs
View File

@ -160,6 +160,18 @@ namespace Plane.FormationCreator.ViewModels
}
}
private ICommand _LoginCommand;
public ICommand LoginCommand
{
get
{
return _LoginCommand ?? (_LoginCommand = new RelayCommand(() =>
{
// AppEx.Current.ShowModifyTaskView = !AppEx.Current.ShowModifyTaskView;
}));
}
}
private ICommand _ShowOrHideModifyTaskViewCommand;
public ICommand ShowOrHideModifyTaskViewCommand
{