[feat] 修改图标和版本
版本改为 2.2.0 主要修改双通道同时发送rtk和所有广播命令 # 类型 包含: # feat:新功能(feature) # fix:修补bug # docs:文档(documentation) # style: 格式(不影响代码运行的变动) # refactor:重构(即不是新增功能,也不是修改bug的代码变动) # test:增加测试 # chore:构建过程或辅助工具的变动
This commit is contained in:
parent
32110aab07
commit
a9cf0fdc8a
@ -11,14 +11,23 @@
|
|||||||
ShutdownMode="OnMainWindowClose">
|
ShutdownMode="OnMainWindowClose">
|
||||||
|
|
||||||
<Application.Resources>
|
<Application.Resources>
|
||||||
<materialDesign:PackIcon x:Key="CheckIcon"
|
<materialDesign:PackIcon x:Key="ConnectIcon"
|
||||||
x:Shared="False"
|
x:Shared="False"
|
||||||
Kind="LanConnect"
|
Kind="LanConnect"
|
||||||
Foreground="#2196F3" />
|
Foreground="#2196F3" />
|
||||||
<materialDesign:PackIcon x:Key="CloseIcon"
|
<materialDesign:PackIcon x:Key="DisconnectIcon"
|
||||||
x:Shared="False"
|
x:Shared="False"
|
||||||
Kind="LanDisconnect"
|
Kind="LanDisconnect"
|
||||||
Foreground="White" />
|
Foreground="White" />
|
||||||
|
<materialDesign:PackIcon x:Key="CheckIcon"
|
||||||
|
x:Shared="False"
|
||||||
|
Kind="Check"
|
||||||
|
Foreground="#2196F3" />
|
||||||
|
<materialDesign:PackIcon x:Key="CloseIcon"
|
||||||
|
x:Shared="False"
|
||||||
|
Kind="Close"
|
||||||
|
Foreground="White" />
|
||||||
|
|
||||||
<cnv:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
|
<cnv:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
|
||||||
<cnv:BooleanToVisibilityConverter x:Key="InversiveBooleanToVisibilityConverter"
|
<cnv:BooleanToVisibilityConverter x:Key="InversiveBooleanToVisibilityConverter"
|
||||||
False="Visible"
|
False="Visible"
|
||||||
@ -64,8 +73,8 @@
|
|||||||
FalseKey="CloseIcon"
|
FalseKey="CloseIcon"
|
||||||
TrueKey="CheckIcon" />
|
TrueKey="CheckIcon" />
|
||||||
<cnv:BooleanToResourceConverter x:Key="CheckSignConverter2"
|
<cnv:BooleanToResourceConverter x:Key="CheckSignConverter2"
|
||||||
FalseKey="CloseIcon"
|
FalseKey="DisconnectIcon"
|
||||||
TrueKey="CheckIcon" />
|
TrueKey="ConnectIcon" />
|
||||||
<cnv:BooleanToStringConverter x:Key="ColorConverter"
|
<cnv:BooleanToStringConverter x:Key="ColorConverter"
|
||||||
False="Red"
|
False="Red"
|
||||||
True="Green" />
|
True="Green" />
|
||||||
|
@ -278,9 +278,9 @@
|
|||||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
|
||||||
<TextBlock Text="{Binding Loginstate}" Margin="0,4,14,0"/>
|
<TextBlock Text="{Binding Loginstate}" Margin="0,4,14,0"/>
|
||||||
<TextBlock Text="广播端口:" Margin="4"/>
|
<TextBlock Text="广播端口:" Margin="4"/>
|
||||||
<ContentPresenter Margin="0,4,4,0" Content="{Binding BoardcastPortOpened, Converter={StaticResource CheckSignConverter}, Mode=OneWay}" />
|
<ContentPresenter Margin="0,4,4,0" Content="{Binding BoardcastPortOpened, Converter={StaticResource CheckSignConverter2}, Mode=OneWay}" />
|
||||||
<TextBlock Text="通信连接:" Margin="4"/>
|
<TextBlock Text="通信连接:" Margin="4"/>
|
||||||
<ContentPresenter Margin="0,4,14,0" Content="{Binding CommunicationModuleConnected, Converter={StaticResource CheckSignConverter}, Mode=OneWay}" />
|
<ContentPresenter Margin="0,4,14,0" Content="{Binding CommunicationModuleConnected, Converter={StaticResource CheckSignConverter2}, Mode=OneWay}" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ using System.Windows;
|
|||||||
[assembly: AssemblyConfiguration("")]
|
[assembly: AssemblyConfiguration("")]
|
||||||
[assembly: AssemblyCompany("北京飞行魔方科技有限公司")]
|
[assembly: AssemblyCompany("北京飞行魔方科技有限公司")]
|
||||||
[assembly: AssemblyProduct("无人机编队地面控制系统")]
|
[assembly: AssemblyProduct("无人机编队地面控制系统")]
|
||||||
[assembly: AssemblyCopyright("Copyright © 2020")]
|
[assembly: AssemblyCopyright("Copyright © 2024")]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyTrademark("")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
@ -51,5 +51,5 @@ using System.Windows;
|
|||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("2.1.0.*")]
|
[assembly: AssemblyVersion("2.2.0.*")]
|
||||||
[assembly: AssemblyFileVersion("2.1.0.0")]
|
[assembly: AssemblyFileVersion("2.2.0.0")]
|
||||||
|
Loading…
Reference in New Issue
Block a user