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

Compare commits

base: group:Dev
Branches Tags
group:Dev
group:Xu-V2.0
group:release_2.1
group:兼容4.1.2以前的版本
group:master
..
compare: group:master
Branches Tags
group:Dev
group:Xu-V2.0
group:release_2.1
group:兼容4.1.2以前的版本
group:master

No commits in common. "Dev" and "master" have entirely different histories.
Dev ... master

7 changed files with 83 additions and 122 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,9 +9,8 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Plane.Logging</RootNamespace> <RootNamespace>Plane.Logging</RootNamespace>
<AssemblyName>Plane.Logging</AssemblyName> <AssemblyName>Plane.Logging</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</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>
@ -21,7 +20,6 @@
<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>
@ -30,7 +28,6 @@
<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,9 +9,8 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Plane.Reflection</RootNamespace> <RootNamespace>Plane.Reflection</RootNamespace>
<AssemblyName>Plane.Reflection</AssemblyName> <AssemblyName>Plane.Reflection</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</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>
@ -21,7 +20,6 @@
<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>
@ -30,7 +28,6 @@
<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" />

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

@ -9,29 +9,15 @@ 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; }
public static void Configure(Action<string> showAction) public static void Configure(Action<string> showAction)
{ {
ShowAction = showAction; ShowAction = showAction;
} }
public static void ConfigureStatus(Action<string> showAction)
{
StatusAction = showAction;
}
public static void Show(string message) public static void Show(string message)
{ {
ShowAction?.Invoke(DateTime.Now.ToString("HH:mm:ss ")+message); ShowAction?.Invoke(message);
}
public static void ShowStatus(string message)
{
StatusAction?.Invoke(message);
} }
public static void Configure(Action<bool> connectAction) public static void Configure(Action<bool> connectAction)
@ -43,18 +29,5 @@ 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,9 +9,8 @@
<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.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</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>
@ -21,7 +20,6 @@
<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>
@ -30,7 +28,6 @@
<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" requireReinstallation="true" /> <package id="MahApps.Metro" version="1.5.0" targetFramework="net40" />
</packages> </packages>

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

@ -1,81 +1,78 @@
<?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.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</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> <DebugType>full</DebugType>
<DebugType>full</DebugType> <Optimize>false</Optimize>
<Optimize>false</Optimize> <OutputPath>bin\Debug\</OutputPath>
<OutputPath>bin\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport>
<ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel>
<WarningLevel>4</WarningLevel> </PropertyGroup>
<Prefer32Bit>false</Prefer32Bit> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup> <DebugType>pdbonly</DebugType>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <Optimize>true</Optimize>
<DebugType>pdbonly</DebugType> <OutputPath>bin\Release\</OutputPath>
<Optimize>true</Optimize> <DefineConstants>TRACE</DefineConstants>
<OutputPath>bin\Release\</OutputPath> <ErrorReport>prompt</ErrorReport>
<DefineConstants>TRACE</DefineConstants> <WarningLevel>4</WarningLevel>
<ErrorReport>prompt</ErrorReport> </PropertyGroup>
<WarningLevel>4</WarningLevel> <ItemGroup>
<Prefer32Bit>false</Prefer32Bit> <Reference Include="PresentationCore" />
</PropertyGroup> <Reference Include="PresentationFramework" />
<ItemGroup> <Reference Include="System" />
<Reference Include="PresentationCore" /> <Reference Include="System.Core" />
<Reference Include="PresentationFramework" /> <Reference Include="System.Xaml" />
<Reference Include="System" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Core" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Xaml" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="WindowsBase" />
<Reference Include="System.Data" /> </ItemGroup>
<Reference Include="System.Xml" /> <ItemGroup>
<Reference Include="WindowsBase" /> <Compile Include="Controls\ProgressButton.cs" />
</ItemGroup> <Compile Include="Converters\BooleanToResourceConverter.cs" />
<ItemGroup> <Compile Include="Converters\BooleanToStringConverter.cs" />
<Compile Include="Controls\ProgressButton.cs" /> <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
<Compile Include="Converters\BooleanToResourceConverter.cs" /> <Compile Include="Converters\NullableBooleanConverter.cs" />
<Compile Include="Converters\BooleanToStringConverter.cs" /> <Compile Include="Converters\BooleanConverter.cs" />
<Compile Include="Converters\BooleanToVisibilityConverter.cs" /> <Compile Include="Converters\InverseBooleanConverter.cs" />
<Compile Include="Converters\NullableBooleanConverter.cs" /> <Compile Include="Converters\NullableBooleanToVisibilityConverter.cs" />
<Compile Include="Converters\BooleanConverter.cs" /> <Compile Include="IniHelper\IniFiles.cs" />
<Compile Include="Converters\InverseBooleanConverter.cs" /> <Compile Include="UpdateChecker.cs" />
<Compile Include="Converters\NullableBooleanToVisibilityConverter.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="IniHelper\IniFiles.cs" /> </ItemGroup>
<Compile Include="UpdateChecker.cs" /> <ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" /> <Page Include="Assets\ListBox.xaml">
</ItemGroup> <Generator>MSBuild:Compile</Generator>
<ItemGroup> <SubType>Designer</SubType>
<Page Include="Assets\ListBox.xaml"> </Page>
<Generator>MSBuild:Compile</Generator> </ItemGroup>
<SubType>Designer</SubType> <ItemGroup>
</Page> <ProjectReference Include="..\Plane\Plane.csproj">
</ItemGroup> <Project>{6cce2aeb-3b38-4c00-b32d-433a990ae2ad}</Project>
<ItemGroup> <Name>Plane</Name>
<ProjectReference Include="..\Plane\Plane.csproj"> </ProjectReference>
<Project>{6cce2aeb-3b38-4c00-b32d-433a990ae2ad}</Project> </ItemGroup>
<Name>Plane</Name> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</ProjectReference> <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
</ItemGroup> Other similar extension points exist, see Microsoft.Common.targets.
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Target Name="BeforeBuild">
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. </Target>
Other similar extension points exist, see Microsoft.Common.targets. <Target Name="AfterBuild">
<Target Name="BeforeBuild"> </Target>
</Target> -->
<Target Name="AfterBuild">
</Target>
-->
</Project> </Project>