diff --git a/.vs/ExcelTool/v15/.suo b/.vs/ExcelTool/v15/.suo
index a99c5bf..4c344ce 100644
Binary files a/.vs/ExcelTool/v15/.suo and b/.vs/ExcelTool/v15/.suo differ
diff --git a/.vs/ExcelTool/v15/Server/sqlite3/storage.ide-wal b/.vs/ExcelTool/v15/Server/sqlite3/storage.ide-wal
index d6f9a02..6456804 100644
Binary files a/.vs/ExcelTool/v15/Server/sqlite3/storage.ide-wal and b/.vs/ExcelTool/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/ExcelTool/ExcelTool.csproj b/ExcelTool/ExcelTool.csproj
index c0f0255..cc0d5da 100644
--- a/ExcelTool/ExcelTool.csproj
+++ b/ExcelTool/ExcelTool.csproj
@@ -64,6 +64,7 @@
+
diff --git a/ExcelTool/Parser/TableExcelData.cs b/ExcelTool/Parser/TableExcelData.cs
index 6ba4968..d98da89 100644
--- a/ExcelTool/Parser/TableExcelData.cs
+++ b/ExcelTool/Parser/TableExcelData.cs
@@ -11,12 +11,14 @@ namespace ExcelTool
private List headers = new List();
private List rows = new List();
public int CollonCount = 0;
+ public int RowCounts = 0;
public TableExcelData(IEnumerable headers, IEnumerable rows)
{
this.headers = headers.ToList();
this.rows = rows.ToList();
this.CollonCount = this.headers.Count;
+ this.RowCounts = this.rows.Count;
}
public List Headers
@@ -32,7 +34,7 @@ namespace ExcelTool
//TODO:待检查数据类型的合法性
//public bool CheckUnique(out string errorMsg)
//{
-
+
//}
}
}
diff --git a/ExcelTool/Parser/TableExcelExportBytes.cs b/ExcelTool/Parser/TableExcelExportBytes.cs
index 54b85af..7164629 100644
--- a/ExcelTool/Parser/TableExcelExportBytes.cs
+++ b/ExcelTool/Parser/TableExcelExportBytes.cs
@@ -19,7 +19,7 @@ namespace ExcelTool
//先写入行数,然后每一行的数据一次写入 小写类型、字符串
List> datas = new List>();
var tableData = ExcelHelper.ExcelDatas(fileName);
- Tuple rowCount = new Tuple("int", tableData.CollonCount.ToString());
+ Tuple rowCount = new Tuple("int", tableData.RowCounts.ToString());
datas.Add(rowCount);
foreach (var row in tableData.Rows)
{
diff --git a/ExcelTool/Program.cs b/ExcelTool/Program.cs
index 4508bb3..8b865c2 100644
--- a/ExcelTool/Program.cs
+++ b/ExcelTool/Program.cs
@@ -80,8 +80,21 @@ namespace ExcelTool
{
File.Delete(genExcels[i]);
}
+
+ //读取测试
+ //IBinarySerializable newavList = new avatarguideTestConfig();
+ //var readOK = FileManager.ReadBinaryDataFromFile(Path.Combine(path, "avatarguideTest.bytes"), ref newavList);
+ //if (readOK)
+ //{
+ // ConsoleHelper.WriteInfoLine(newavList.ToString());
+ //}
+ //else
+ //{
+ // ConsoleHelper.WriteErrorLine("读取失败");
+ //}
Console.Read();
}
}
}
}
+
diff --git a/ExcelTool/bin/Debug/ExcelTool.exe b/ExcelTool/bin/Debug/ExcelTool.exe
index 9f8d76a..b4da4d0 100644
Binary files a/ExcelTool/bin/Debug/ExcelTool.exe and b/ExcelTool/bin/Debug/ExcelTool.exe differ
diff --git a/ExcelTool/bin/Debug/ExcelTool.pdb b/ExcelTool/bin/Debug/ExcelTool.pdb
index 7b8dff9..5980e77 100644
Binary files a/ExcelTool/bin/Debug/ExcelTool.pdb and b/ExcelTool/bin/Debug/ExcelTool.pdb differ
diff --git a/ExcelTool/bin/Debug/avatarguideTest.bytes b/ExcelTool/bin/Debug/avatarguideTest.bytes
index ad46acc..6117da0 100644
Binary files a/ExcelTool/bin/Debug/avatarguideTest.bytes and b/ExcelTool/bin/Debug/avatarguideTest.bytes differ
diff --git a/ExcelTool/bin/Debug/official_room.bytes b/ExcelTool/bin/Debug/official_room.bytes
index 3fc6a57..e238f47 100644
Binary files a/ExcelTool/bin/Debug/official_room.bytes and b/ExcelTool/bin/Debug/official_room.bytes differ
diff --git a/ExcelTool/obj/Debug/ExcelTool.exe b/ExcelTool/obj/Debug/ExcelTool.exe
index 9f8d76a..b4da4d0 100644
Binary files a/ExcelTool/obj/Debug/ExcelTool.exe and b/ExcelTool/obj/Debug/ExcelTool.exe differ
diff --git a/ExcelTool/obj/Debug/ExcelTool.pdb b/ExcelTool/obj/Debug/ExcelTool.pdb
index 7b8dff9..5980e77 100644
Binary files a/ExcelTool/obj/Debug/ExcelTool.pdb and b/ExcelTool/obj/Debug/ExcelTool.pdb differ