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

删除了修改航点名的日志

Browse Source 
修改了发送千寻RTK的配置界面
This commit is contained in:
zxd 2019-07-18 11:33:43 +08:00
parent 3f9317a6bd
commit 9a1ec7384a
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plane.FormationCreator/Formation/FlightTask.cs
View File

@ -66,7 +66,6 @@ namespace Plane.FormationCreator.Formation
{ {
get get
{ {
Windows.Messages.Message.Show(_TaskName);
string name = ""; string name = "";
switch (TaskType) switch (TaskType)
{ {
@ -77,10 +76,7 @@ namespace Plane.FormationCreator.Formation
//name = (TaskIndex + 1).ToString() + "." + name; //name = (TaskIndex + 1).ToString() + "." + name;
return name; return name;
} }
set { set { Set(nameof(TaskCnName), ref _TaskName, value); }
Set(nameof(TaskCnName), ref _TaskName, value);
Windows.Messages.Message.Show(_TaskName);
}
} }
public int TaskTypeIndex public int TaskTypeIndex

8
Plane.FormationCreator/PlaneMessageBox.xaml
View File

@ -9,9 +9,9 @@
WindowStartupLocation="CenterScreen" WindowStartupLocation="CenterScreen"
TitleForeground="White" TitleForeground="White"
FontSize="15" FontSize="15"
Title="PlaneMessageBox" Height="200" Width="500" Title="PlaneMessageBox" Height="200" Width="600"
MinHeight="200" MinWidth="500" MinHeight="200" MinWidth="600"
MaxHeight="200" MaxWidth="500" MaxHeight="200" MaxWidth="600"
WindowStyle="ToolWindow" Visibility="Visible" ShowMinButton="False" ShowMaxRestoreButton="False" ShowCloseButton="False" IsCloseButtonEnabled="False" IsMinButtonEnabled="False" IsMaxRestoreButtonEnabled="False" IsWindowDraggable="False" WindowStyle="ToolWindow" Visibility="Visible" ShowMinButton="False" ShowMaxRestoreButton="False" ShowCloseButton="False" IsCloseButtonEnabled="False" IsMinButtonEnabled="False" IsMaxRestoreButtonEnabled="False" IsWindowDraggable="False"
> >
<Grid> <Grid>
@ -21,7 +21,7 @@
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Name="messageBoxText" Text="提示" Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Name="messageBoxText" Text="提示" Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBox Name="textbox" Width="350" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" <TextBox Name="textbox" Width="450" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center"
PreviewKeyDown="Box_OnKeyDown"/> PreviewKeyDown="Box_OnKeyDown"/>
<WrapPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center"> <WrapPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center">
<Button Width="80" Margin="25,0" Content="确认" Click="ButtonOK_Click"/> <Button Width="80" Margin="25,0" Content="确认" Click="ButtonOK_Click"/>

2
Plane.FormationCreator/PlaneMessageBox.xaml.cs
View File

@ -29,7 +29,7 @@ namespace Plane.FormationCreator
{ {
staticInstance = new PlaneMessageBox(); staticInstance = new PlaneMessageBox();
} }
Windows.Messages.Message.Show("content = " + content);
staticInstance.messageBoxText.Text = planmeMessageBox; staticInstance.messageBoxText.Text = planmeMessageBox;
staticInstance.Title = caption; staticInstance.Title = caption;
staticInstance.textbox.Text = content; staticInstance.textbox.Text = content;

13
Plane.FormationCreator/ViewModels/ControlPanelViewModel.cs
View File

@ -20,6 +20,7 @@ using Plane.Util;
using System.Windows.Media; using System.Windows.Media;
using Plane.CommunicationManagement; using Plane.CommunicationManagement;
using Plane.FormationCreator.Views; using Plane.FormationCreator.Views;
using Plane.Windows.IniHelper;
namespace Plane.FormationCreator.ViewModels namespace Plane.FormationCreator.ViewModels
{ {
@ -933,13 +934,23 @@ namespace Plane.FormationCreator.ViewModels
rtcmthreadrun = !rtcmthreadrun; rtcmthreadrun = !rtcmthreadrun;
if (rtcmthreadrun) if (rtcmthreadrun)
{ {
string messagetips = "格式：http://差分账号:差分密码@域名:端口/坐标系\r\n例如：http://account:password@rtk.ntrip.qxwz.com:8002/RTCM32_GGB";
string url = "";
IniFiles inifilse = new IniFiles();
url = inifilse.IniReadvalue("Default","RTKurl");
if (PlaneMessageBox.OnShow(messagetips, "发送RTK", ref url) == false) return;
inifilse.IniWritevalue("Default", "RTKurl", url);
RTKState = "RTK数据发送中"; RTKState = "RTK数据发送中";
NTRIPbtntxt = "停止RTCM"; NTRIPbtntxt = "停止RTCM";
Alert.Show("RTCM数据开始发送", "提示", MessageBoxButton.OK, MessageBoxImage.Information); Alert.Show("RTCM数据开始发送", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
await Task.Run(async () => await Task.Run(async () =>
{ {
string url = "http://qxarpz003:1dc880b@rtk.ntrip.qxwz.com:8002/RTCM32_GGB";
//string url = "http://qxarpz003:1dc880b@rtk.ntrip.qxwz.com:8002/RTCM32_GGB";
CommNTRIP commNTRIP = new CommNTRIP(url, _flightTaskManager.OriginLat, _flightTaskManager.OriginLng); CommNTRIP commNTRIP = new CommNTRIP(url, _flightTaskManager.OriginLat, _flightTaskManager.OriginLng);
rtcm3 rtcm3 = new rtcm3(); rtcm3 rtcm3 = new rtcm3();
commNTRIP.doConnect(); commNTRIP.doConnect();

2
Plane.FormationCreator/Views/ControlPanelView.xaml
View File

@ -136,7 +136,7 @@
<Button Content="{Binding Path=RTKbtntxt}" <Button Content="{Binding Path=RTKbtntxt}"
Command="{Binding SendRTKCommand}" /> Command="{Binding SendRTKCommand}" />
<Button Content="{Binding Path=NTRIPbtntxt}" <Button Content="{Binding Path=NTRIPbtntxt}"
Command="{Binding SendRTCMCommand}" Command="{Binding SendRTCMCommand}"
/> />