1、修复因加入输入位姿引发的BUG

2、PMA工具完善
3、其他BUG修复
This commit is contained in:
eggplantlwj
2022-03-21 14:48:26 +08:00
parent 43751c5115
commit 62477b8091
403 changed files with 753 additions and 652 deletions

View File

@@ -1,4 +1,4 @@
namespace Logger
namespace Logger
{
partial class LogDetail
{
@@ -8,7 +8,7 @@
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)

View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -27,8 +27,9 @@ namespace Logger
string time = Regex.Split(logMsg, " -> ")[0];
string msgLevel = Regex.Split(logMsg, " -> ")[1].Split(',')[0];
string msgDetal = Regex.Split(logMsg, " -> ")[1];
// msgDetal = Regex.Split(msgDetal, ",")[1];
txbLogTime.Text = time;
txbLogLevel.Text = msgLevel;
txbLogLevel.Text = msgLevel;
txbLogLevel.BackColor = (msgLevel == "Warn" || msgLevel == "Exception") ? Color.Red : Color.Lime;
richDetail.Text = msgDetal;
}

Binary file not shown.

Binary file not shown.

View File

@@ -1 +1,107 @@
<?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">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D4E052B9-E541-4B67-A1F9-273073EF1D4B}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Logger</RootNamespace>
<AssemblyName>Logger</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>F:\VSCode\LearnTest\Reflection\bin\Debug\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="LogDetail.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="LogDetail.Designer.cs">
<DependentUpon>LogDetail.cs</DependentUpon>
</Compile>
<Compile Include="LoggerClass.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="UserLogger.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UserLogger.Designer.cs">
<DependentUpon>UserLogger.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="log4net.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common.ParamsList\EnumList\EnumList.csproj">
<Project>{bec2389f-b8b4-4e8a-8c71-189cde14e962}</Project>
<Name>EnumList</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="LogDetail.resx">
<DependentUpon>LogDetail.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="UserLogger.resx">
<DependentUpon>UserLogger.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="Resources\Log.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -27,7 +27,7 @@ namespace Logger
logQueue.Enqueue(new LogInfo{ message = info, ex = null, logLevel = MsgLevel.Info});
if(ShowMsgBox)
{
MessageBox.Show(info);
MessageBox.Show(info);
}
}
public static void WriteLog(string info, MsgLevel msgLevel, bool ShowMsgBox = false)

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 719 B

After

Width:  |  Height:  |  Size: 719 B

View File

@@ -1,4 +1,4 @@
namespace Logger
namespace Logger
{
partial class UserLogger
{
@@ -16,7 +16,7 @@
if (disposing && (components != null))
{
components.Dispose();
}
}
base.Dispose(disposing);
}

View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Drawing;
using System.Windows.Forms;
using Logger;
@@ -87,7 +87,7 @@ namespace Logger
ControlListBox(msgLog, logInfo, listBoxExpection);
break;
default:
break;
break;
}
listBoxAll.Items.Add(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss-fff") + " -> " + msgLog.ToString() + "," + logInfo);
listBoxAll.SelectedIndex = listBoxAll.Items.Count - 1;
@@ -95,7 +95,7 @@ namespace Logger
{
listBoxAll.Items.Clear();
}
Application.DoEvents();
Application.DoEvents();
});
}
catch(Exception)