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

Compare commits

merge into: group:兼容4.1.2以前的版本
Branches Tags
group:Dev
group:Xu-V2.0
group:release_2.1
group:兼容4.1.2以前的版本
group:master
...
pull from: group:Dev
Branches Tags
group:Dev
group:Xu-V2.0
group:release_2.1
group:兼容4.1.2以前的版本
group:master

5 Commits
兼容4.1.2以前的 ... Dev

Author SHA1 Message Date
xu
496458f00e [feat] 加入广播端口状态消息 
详细描述

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
 2024-06-28 18:30:13 +08:00
xu
fdfe4ccb56 新换电脑安装最新vs2022后框架更新为4.8 2024-04-08 19:39:23 +08:00
pxzleo
40e6fe1b9e 更改到vs2022 2024-01-08 20:40:29 +08:00
pxzleo
a9fcf7d4b3 修改日期格式 2023-05-01 13:56:09 +08:00
xu
ae690cc341 修改名字 2020-09-20 11:42:25 +08:00
7 changed files with 110 additions and 83 deletions
Show Stats Expand all files Collapse all files

2
Plane.Logging/LocalFileLogger.cs
View File

@ -56,7 +56,7 @@ namespace Plane.Logging
{ {
lock (_logLock) lock (_logLock)
{ {
// TODO: 林俊清，20150605，应改为不使用 AppendAllText，提高性能。 // TODO: 王海，20150605，应改为不使用 AppendAllText，提高性能。
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
try try

5
Plane.Logging/Plane.Logging.csproj
View File

@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Plane.Logging</RootNamespace> <RootNamespace>Plane.Logging</RootNamespace>
<AssemblyName>Plane.Logging</AssemblyName> <AssemblyName>Plane.Logging</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -20,6 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
@ -28,6 +30,7 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />

5
Plane.Reflection/Plane.Reflection.csproj
View File

@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Plane.Reflection</RootNamespace> <RootNamespace>Plane.Reflection</RootNamespace>
<AssemblyName>Plane.Reflection</AssemblyName> <AssemblyName>Plane.Reflection</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -20,6 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
@ -28,6 +30,7 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />

17
Plane.Windows.Messages/Message.cs
View File

@ -9,6 +9,8 @@ namespace Plane.Windows.Messages
{ {
private static Action<string> ShowAction { get; set; } private static Action<string> ShowAction { get; set; }
private static Action<bool> ConnectAction { get; set; } private static Action<bool> ConnectAction { get; set; }
private static Action<bool> BoardportAction { get; set; }
private static Action<string> StatusAction { get; set; } private static Action<string> StatusAction { get; set; }
public static void Configure(Action<string> showAction) public static void Configure(Action<string> showAction)
@ -24,7 +26,7 @@ namespace Plane.Windows.Messages
public static void Show(string message) public static void Show(string message)
{ {
ShowAction?.Invoke(message); ShowAction?.Invoke(DateTime.Now.ToString("HH:mm:ss ")+message);
} }
public static void ShowStatus(string message) public static void ShowStatus(string message)
@ -41,5 +43,18 @@ namespace Plane.Windows.Messages
{ {
ConnectAction?.Invoke(isConnected); ConnectAction?.Invoke(isConnected);
} }
public static void Configureboard(Action<bool> boardportAction)
{
BoardportAction = boardportAction;
}
public static void BoardOpen(bool isOpened)
{
BoardportAction?.Invoke(isOpened);
}
} }
} }

5
Plane.Windows.Messages/Plane.Windows.Messages.csproj
View File

@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Plane.Windows.Messages</RootNamespace> <RootNamespace>Plane.Windows.Messages</RootNamespace>
<AssemblyName>Plane.Windows.Messages</AssemblyName> <AssemblyName>Plane.Windows.Messages</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -20,6 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
@ -28,6 +30,7 @@
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL"> <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">

2
Plane.Windows.Messages/packages.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="MahApps.Metro" version="1.5.0" targetFramework="net40" /> <package id="MahApps.Metro" version="1.5.0" targetFramework="net40" requireReinstallation="true" />
</packages> </packages>

157
Plane.Windows/Plane.Windows.csproj
View File

@ -1,78 +1,81 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{06848293-9B17-4068-9B35-44D0ED713CD4}</ProjectGuid> <ProjectGuid>{06848293-9B17-4068-9B35-44D0ED713CD4}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Plane.Windows</RootNamespace> <RootNamespace>Plane.Windows</RootNamespace>
<AssemblyName>Plane.Windows</AssemblyName> <AssemblyName>Plane.Windows</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> <TargetFrameworkProfile />
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> </PropertyGroup>
<DebugSymbols>true</DebugSymbols> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugType>full</DebugType> <DebugSymbols>true</DebugSymbols>
<Optimize>false</Optimize> <DebugType>full</DebugType>
<OutputPath>bin\Debug\</OutputPath> <Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants> <OutputPath>bin\Debug\</OutputPath>
<ErrorReport>prompt</ErrorReport> <DefineConstants>DEBUG;TRACE</DefineConstants>
<WarningLevel>4</WarningLevel> <ErrorReport>prompt</ErrorReport>
</PropertyGroup> <WarningLevel>4</WarningLevel>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <Prefer32Bit>false</Prefer32Bit>
<DebugType>pdbonly</DebugType> </PropertyGroup>
<Optimize>true</Optimize> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath> <DebugType>pdbonly</DebugType>
<DefineConstants>TRACE</DefineConstants> <Optimize>true</Optimize>
<ErrorReport>prompt</ErrorReport> <OutputPath>bin\Release\</OutputPath>
<WarningLevel>4</WarningLevel> <DefineConstants>TRACE</DefineConstants>
</PropertyGroup> <ErrorReport>prompt</ErrorReport>
<ItemGroup> <WarningLevel>4</WarningLevel>
<Reference Include="PresentationCore" /> <Prefer32Bit>false</Prefer32Bit>
<Reference Include="PresentationFramework" /> </PropertyGroup>
<Reference Include="System" /> <ItemGroup>
<Reference Include="System.Core" /> <Reference Include="PresentationCore" />
<Reference Include="System.Xaml" /> <Reference Include="PresentationFramework" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="System.Xaml" />
<Reference Include="System.Data" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="WindowsBase" /> <Reference Include="Microsoft.CSharp" />
</ItemGroup> <Reference Include="System.Data" />
<ItemGroup> <Reference Include="System.Xml" />
<Compile Include="Controls\ProgressButton.cs" /> <Reference Include="WindowsBase" />
<Compile Include="Converters\BooleanToResourceConverter.cs" /> </ItemGroup>
<Compile Include="Converters\BooleanToStringConverter.cs" /> <ItemGroup>
<Compile Include="Converters\BooleanToVisibilityConverter.cs" /> <Compile Include="Controls\ProgressButton.cs" />
<Compile Include="Converters\NullableBooleanConverter.cs" /> <Compile Include="Converters\BooleanToResourceConverter.cs" />
<Compile Include="Converters\BooleanConverter.cs" /> <Compile Include="Converters\BooleanToStringConverter.cs" />
<Compile Include="Converters\InverseBooleanConverter.cs" /> <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
<Compile Include="Converters\NullableBooleanToVisibilityConverter.cs" /> <Compile Include="Converters\NullableBooleanConverter.cs" />
<Compile Include="IniHelper\IniFiles.cs" /> <Compile Include="Converters\BooleanConverter.cs" />
<Compile Include="UpdateChecker.cs" /> <Compile Include="Converters\InverseBooleanConverter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Converters\NullableBooleanToVisibilityConverter.cs" />
</ItemGroup> <Compile Include="IniHelper\IniFiles.cs" />
<ItemGroup> <Compile Include="UpdateChecker.cs" />
<Page Include="Assets\ListBox.xaml"> <Compile Include="Properties\AssemblyInfo.cs" />
<Generator>MSBuild:Compile</Generator> </ItemGroup>
<SubType>Designer</SubType> <ItemGroup>
</Page> <Page Include="Assets\ListBox.xaml">
</ItemGroup> <Generator>MSBuild:Compile</Generator>
<ItemGroup> <SubType>Designer</SubType>
<ProjectReference Include="..\Plane\Plane.csproj"> </Page>
<Project>{6cce2aeb-3b38-4c00-b32d-433a990ae2ad}</Project> </ItemGroup>
<Name>Plane</Name> <ItemGroup>
</ProjectReference> <ProjectReference Include="..\Plane\Plane.csproj">
</ItemGroup> <Project>{6cce2aeb-3b38-4c00-b32d-433a990ae2ad}</Project>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Name>Plane</Name>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. </ProjectReference>
Other similar extension points exist, see Microsoft.Common.targets. </ItemGroup>
<Target Name="BeforeBuild"> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Target> <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<Target Name="AfterBuild"> Other similar extension points exist, see Microsoft.Common.targets.
</Target> <Target Name="BeforeBuild">
--> </Target>
<Target Name="AfterBuild">
</Target>
-->
</Project> </Project>