Skip to content

Commit b24944f

Browse files
author
Hiram
committed
modify logic
1 parent e8381a6 commit b24944f

22 files changed

+24
-24
lines changed

HiProtobuf/HiProtobuf.Lib/HiProtobuf.Lib.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<Reference Include="HiFramework.Assert, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
4141
<HintPath>..\packages\HiFramework.Assert.1.0.2\lib\net35\HiFramework.Assert.dll</HintPath>
4242
</Reference>
43-
<Reference Include="HiFramework.Log, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\HiFramework.Log.1.0.2\lib\net35\HiFramework.Log.dll</HintPath>
43+
<Reference Include="HiFramework.Log, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\HiFramework.Log.1.0.5\lib\net35\HiFramework.Log.dll</HintPath>
4545
</Reference>
4646
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
4747
<EmbedInteropTypes>True</EmbedInteropTypes>

HiProtobuf/HiProtobuf.Lib/Manager.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@ public static void Export()
3434
Log.Error("编译器路径未配置");
3535
return;
3636
}
37-
Log.Print("开始生成协议");
37+
Log.Info("开始生成协议");
3838
new ProtoHandler().Process();
39-
Log.Print("生成协议结束");
40-
Log.Print("开始生成语言");
39+
Log.Info("生成协议结束");
40+
Log.Info("开始生成语言");
4141
new LanguageGenerater().Process();
42-
Log.Print("生成语言结束");
43-
Log.Print("开始编译语言");
42+
Log.Info("生成语言结束");
43+
Log.Info("开始编译语言");
4444
new Compiler().Porcess();
45-
Log.Print("编译语言结束");
46-
Log.Print("开始生成数据");
45+
Log.Info("编译语言结束");
46+
Log.Info("开始生成数据");
4747
new DataHandler().Process();
48-
Log.Print("生成数据结束");
48+
Log.Info("生成数据结束");
4949
}
5050
}
5151
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c458a86f50cdf5cb932078752dc2ba40f08793a7
1+
6a797c4b7a7059ed20c499b4db5f05c855ab10ce
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="HiFramework.Assert" version="1.0.2" targetFramework="net45" />
4-
<package id="HiFramework.Log" version="1.0.2" targetFramework="net45" />
4+
<package id="HiFramework.Log" version="1.0.5" targetFramework="net45" />
55
</packages>

HiProtobuf/HiProtobuf.UI/HiProtobuf.UI.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<WarningLevel>4</WarningLevel>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="HiFramework.Log, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
36-
<HintPath>..\packages\HiFramework.Log.1.0.2\lib\net35\HiFramework.Log.dll</HintPath>
35+
<Reference Include="HiFramework.Log, Version=1.0.6.0, Culture=neutral, processorArchitecture=MSIL">
36+
<HintPath>..\packages\HiFramework.Log.1.0.6\lib\net35\HiFramework.Log.dll</HintPath>
3737
</Reference>
3838
<Reference Include="System" />
3939
<Reference Include="System.Core" />

HiProtobuf/HiProtobuf.UI/HiProtobuf.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ public HiProtobuf()
2424

2525
private void Form1_Load(object sender, EventArgs e)
2626
{
27-
Log.OnPrint += (x) =>
27+
Log.OnInfo += (x) =>
2828
{
2929
textBox6.Text = Logger.Log;
3030
};
31-
Log.OnWarnning += (x) =>
31+
Log.OnWarning += (x) =>
3232
{
3333
textBox6.Text = Logger.Log;
3434
};
@@ -85,9 +85,9 @@ private void textBox5_TextChanged(object sender, EventArgs e)
8585

8686
private void button6_Click(object sender, EventArgs e)
8787
{
88-
Log.Print("开始导出");
88+
Log.Info("开始导出");
8989
Manager.Export();
90-
Log.Print("导出结束");
90+
Log.Info("导出结束");
9191
Config.Save();
9292
}
9393
}

HiProtobuf/HiProtobuf.UI/Logger.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
namespace HiProtobuf.UI
99
{
10-
internal class Logger : ILogProxy
10+
internal class Logger : ILogHandler
1111
{
1212
public static string Log;
13-
public void Print(params object[] args)
13+
public void Info(params object[] args)
1414
{
1515
string str = "";
1616
for (int i = 0; i < args.Length; i++)
@@ -20,7 +20,7 @@ public void Print(params object[] args)
2020
Log += "[Print]" + str.ToString() + "\r\n";
2121
}
2222

23-
public void Warnning(params object[] args)
23+
public void Warning(params object[] args)
2424
{
2525
string str = "";
2626
for (int i = 0; i < args.Length; i++)

HiProtobuf/HiProtobuf.UI/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ static class Program
2222
[STAThread]
2323
static void Main()
2424
{
25-
Log.SetLogProxy(new Logger());
25+
Log.LogHandler = new Logger();
2626
Config.Load();
2727

2828
Application.EnableVisualStyles();
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ba6d6bc8a3c5f08242d214331e5b5ad80d777e16
1+
383484a4a7e44ecca0734a0b472c7dcc2c786ad4
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="HiFramework.Log" version="1.0.2" targetFramework="net45" />
3+
<package id="HiFramework.Log" version="1.0.6" targetFramework="net45" />
44
</packages>
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)