Skip to content

Commit 4920c6e

Browse files
author
Hiram
committed
finish ui logic
1 parent 3ad47b1 commit 4920c6e

26 files changed

+311
-100
lines changed

HiProtobuf/HiProtobuf.Lib/Compiler.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void Porcess()
3434
var dllPath = Settings.Export_Folder + Settings.language_folder + Settings.csharp_dll_folder + DllName;
3535
var csharpFolder = Settings.Export_Folder + Settings.language_folder + Settings.csharp_folder;
3636
commond = commond.Replace("WaitReplace1111111111111", dllPath);
37-
commond = commond.Replace("WaitReplace222222222222", Settings.Protobuf_Net_Path);
37+
commond = commond.Replace("WaitReplace222222222222", Settings.Protobuf_Dll_Path);
3838
commond = commond.Replace("WaitReplace3333333", csharpFolder);
3939
commond = Settings.Compiler_Path + " " + commond;
4040
Common.Cmd(commond);

HiProtobuf/HiProtobuf.Lib/DataHandler.cs

+1
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ object GetVariableValue(string type, string value)
293293

294294
void Serialize(object obj)
295295
{
296+
var type = obj.GetType();
296297
var path = Settings.Export_Folder + Settings.dat_folder + "/" + type.Name + ".dat";
297298
using (var output = File.Create(path))
298299
{

HiProtobuf/HiProtobuf.Lib/Settings.cs

+12-11
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
****************************************************************************/
77
namespace HiProtobuf.Lib
88
{
9-
internal static class Settings
9+
public static class Settings
1010
{
1111
/// <summary>
1212
/// protoc路径
@@ -17,6 +17,7 @@ internal static class Settings
1717
/// Excel文件夹
1818
/// </summary>
1919
public static string Excel_Folder = @"D:\MyGit\github\HiProtobuf\temp\excel";
20+
2021
/// <summary>
2122
/// 导出文件夹
2223
/// </summary>
@@ -30,29 +31,29 @@ internal static class Settings
3031
/// <summary>
3132
/// protobuf dll
3233
/// </summary>
33-
public static string Protobuf_Net_Path = @"D:\MyGit\github\HiProtobuf\HiProtobuf\lib\Google.Protobuf.dll";
34+
public static string Protobuf_Dll_Path = @"D:\MyGit\github\HiProtobuf\HiProtobuf\lib\Google.Protobuf.dll";
3435

3536
/// <summary>
3637
/// Proto文件存放目录
3738
/// </summary>
38-
public static readonly string proto_folder = "/proto";
39+
internal static readonly string proto_folder = "/proto";
3940

4041
/// <summary>
4142
/// 语言存放目录
4243
/// </summary>
43-
public static readonly string language_folder = "/language";
44+
internal static readonly string language_folder = "/language";
4445

4546
/// <summary>
4647
/// 数据存放目录
4748
/// </summary>
48-
public static readonly string dat_folder = "/dat";
49+
internal static readonly string dat_folder = "/dat";
4950

5051
//导出语言文件夹
51-
public static readonly string csharp_folder = "/csharp";
52-
public static readonly string csharp_dll_folder = "/csharp_dll";
53-
public static readonly string cpp_folder = "/cpp";
54-
public static readonly string go_folder = "/go";
55-
public static readonly string java_folder = "/java";
56-
public static readonly string python_folder = "/python";
52+
internal static readonly string csharp_folder = "/csharp";
53+
internal static readonly string csharp_dll_folder = "/csharp_dll";
54+
internal static readonly string cpp_folder = "/cpp";
55+
internal static readonly string go_folder = "/go";
56+
internal static readonly string java_folder = "/java";
57+
internal static readonly string python_folder = "/python";
5758
}
5859
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

HiProtobuf/HiProtobuf.UI/Form1.Designer.cs

-60
This file was deleted.

HiProtobuf/HiProtobuf.UI/Form1.cs

-20
This file was deleted.

HiProtobuf/HiProtobuf.UI/HiProtobuf.Designer.cs

+188
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

HiProtobuf/HiProtobuf.UI/HiProtobuf.UI.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@
4545
<Reference Include="System.Xml" />
4646
</ItemGroup>
4747
<ItemGroup>
48-
<Compile Include="Form1.cs">
48+
<Compile Include="HiProtobuf.cs">
4949
<SubType>Form</SubType>
5050
</Compile>
51-
<Compile Include="Form1.Designer.cs">
52-
<DependentUpon>Form1.cs</DependentUpon>
51+
<Compile Include="HiProtobuf.Designer.cs">
52+
<DependentUpon>HiProtobuf.cs</DependentUpon>
5353
</Compile>
5454
<Compile Include="Program.cs" />
5555
<Compile Include="Properties\AssemblyInfo.cs" />
56-
<EmbeddedResource Include="Form1.resx">
57-
<DependentUpon>Form1.cs</DependentUpon>
56+
<EmbeddedResource Include="HiProtobuf.resx">
57+
<DependentUpon>HiProtobuf.cs</DependentUpon>
5858
</EmbeddedResource>
5959
<EmbeddedResource Include="Properties\Resources.resx">
6060
<Generator>ResXFileCodeGenerator</Generator>

0 commit comments

Comments
 (0)