Skip to content

Commit

Permalink
modify logic
Browse files Browse the repository at this point in the history
  • Loading branch information
Hiram committed Jul 16, 2019
1 parent e8381a6 commit b24944f
Show file tree
Hide file tree
Showing 22 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions HiProtobuf/HiProtobuf.Lib/HiProtobuf.Lib.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
<Reference Include="HiFramework.Assert, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HiFramework.Assert.1.0.2\lib\net35\HiFramework.Assert.dll</HintPath>
</Reference>
<Reference Include="HiFramework.Log, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HiFramework.Log.1.0.2\lib\net35\HiFramework.Log.dll</HintPath>
<Reference Include="HiFramework.Log, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HiFramework.Log.1.0.5\lib\net35\HiFramework.Log.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<EmbedInteropTypes>True</EmbedInteropTypes>
Expand Down
16 changes: 8 additions & 8 deletions HiProtobuf/HiProtobuf.Lib/Manager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ public static void Export()
Log.Error("编译器路径未配置");
return;
}
Log.Print("开始生成协议");
Log.Info("开始生成协议");
new ProtoHandler().Process();
Log.Print("生成协议结束");
Log.Print("开始生成语言");
Log.Info("生成协议结束");
Log.Info("开始生成语言");
new LanguageGenerater().Process();
Log.Print("生成语言结束");
Log.Print("开始编译语言");
Log.Info("生成语言结束");
Log.Info("开始编译语言");
new Compiler().Porcess();
Log.Print("编译语言结束");
Log.Print("开始生成数据");
Log.Info("编译语言结束");
Log.Info("开始生成数据");
new DataHandler().Process();
Log.Print("生成数据结束");
Log.Info("生成数据结束");
}
}
}
Binary file modified HiProtobuf/HiProtobuf.Lib/bin/Debug/HiFramework.Log.dll
Binary file not shown.
Binary file modified HiProtobuf/HiProtobuf.Lib/bin/Debug/HiProtobuf.Lib.dll
Binary file not shown.
Binary file modified HiProtobuf/HiProtobuf.Lib/bin/Debug/HiProtobuf.Lib.pdb
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c458a86f50cdf5cb932078752dc2ba40f08793a7
6a797c4b7a7059ed20c499b4db5f05c855ab10ce
Binary file not shown.
Binary file modified HiProtobuf/HiProtobuf.Lib/obj/Debug/HiProtobuf.Lib.dll
Binary file not shown.
Binary file modified HiProtobuf/HiProtobuf.Lib/obj/Debug/HiProtobuf.Lib.pdb
Binary file not shown.
2 changes: 1 addition & 1 deletion HiProtobuf/HiProtobuf.Lib/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="HiFramework.Assert" version="1.0.2" targetFramework="net45" />
<package id="HiFramework.Log" version="1.0.2" targetFramework="net45" />
<package id="HiFramework.Log" version="1.0.5" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions HiProtobuf/HiProtobuf.UI/HiProtobuf.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="HiFramework.Log, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HiFramework.Log.1.0.2\lib\net35\HiFramework.Log.dll</HintPath>
<Reference Include="HiFramework.Log, Version=1.0.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HiFramework.Log.1.0.6\lib\net35\HiFramework.Log.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
8 changes: 4 additions & 4 deletions HiProtobuf/HiProtobuf.UI/HiProtobuf.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ public HiProtobuf()

private void Form1_Load(object sender, EventArgs e)
{
Log.OnPrint += (x) =>
Log.OnInfo += (x) =>
{
textBox6.Text = Logger.Log;
};
Log.OnWarnning += (x) =>
Log.OnWarning += (x) =>
{
textBox6.Text = Logger.Log;
};
Expand Down Expand Up @@ -85,9 +85,9 @@ private void textBox5_TextChanged(object sender, EventArgs e)

private void button6_Click(object sender, EventArgs e)
{
Log.Print("开始导出");
Log.Info("开始导出");
Manager.Export();
Log.Print("导出结束");
Log.Info("导出结束");
Config.Save();
}
}
Expand Down
6 changes: 3 additions & 3 deletions HiProtobuf/HiProtobuf.UI/Logger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

namespace HiProtobuf.UI
{
internal class Logger : ILogProxy
internal class Logger : ILogHandler
{
public static string Log;
public void Print(params object[] args)
public void Info(params object[] args)
{
string str = "";
for (int i = 0; i < args.Length; i++)
Expand All @@ -20,7 +20,7 @@ public void Print(params object[] args)
Log += "[Print]" + str.ToString() + "\r\n";
}

public void Warnning(params object[] args)
public void Warning(params object[] args)
{
string str = "";
for (int i = 0; i < args.Length; i++)
Expand Down
2 changes: 1 addition & 1 deletion HiProtobuf/HiProtobuf.UI/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ static class Program
[STAThread]
static void Main()
{
Log.SetLogProxy(new Logger());
Log.LogHandler = new Logger();
Config.Load();

Application.EnableVisualStyles();
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ba6d6bc8a3c5f08242d214331e5b5ad80d777e16
383484a4a7e44ecca0734a0b472c7dcc2c786ad4
Binary file not shown.
2 changes: 1 addition & 1 deletion HiProtobuf/HiProtobuf.UI/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="HiFramework.Log" version="1.0.2" targetFramework="net45" />
<package id="HiFramework.Log" version="1.0.6" targetFramework="net45" />
</packages>
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit b24944f

Please sign in to comment.