netease
/
code-layout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

整理代码风格，修正编译警告。

This commit is contained in:
hzhuangxin01 2019-02-12 12:05:54 +08:00
parent 94e98d2dbb
commit c82e8df3db
13 changed files with 52 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.vs/

103
GeneratorCode/Program.cs
View File

@ -1,13 +1,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json;
using TmatrixLibrary;
using OIDModule.Generator;
namespace GeneratorCode
{
@ -15,12 +10,12 @@ namespace GeneratorCode
{
public GeneratorParams()
{
dpi = new int[] { 0, 0, 0, 0};
point_type = new int[] { 0, 0, 0, 0 };
image_type = new bool[] { true, true, true, true};
dpi = new[] { 0, 0, 0, 0 };
point_type = new[] { 0, 0, 0, 0 };
image_type = new[] { true, true, true, true };
StartPageID = 0;
key = "S0,O000,B0000,P000-255,D2018/12/31;CCAFBQMXYPOAOCIRK52S8QC8SO4A0AGA8Y";
filePath = "E:\\NetEase\\轨迹笔\\Sample\\123.pdf";//"C:\\Works\\pdf\\123.pdf";
filePath = "E:\\NetEase\\轨迹笔\\Sample\\123.pdf"; //"C:\\Works\\pdf\\123.pdf";
sessionId = "4BD5D923-47EA-4DEF-A1CD-9B85B515B191";
}
@ -54,18 +49,13 @@ namespace GeneratorCode
public class RspMessage
{
public int err { get; set; }
public string msg { get; set; }
public GenerCodeRet data { get; set; }
public RspMessage(string sId)
{
err = 0;
msg = "";
data = new GenerCodeRet(sId, 0);
}
public RspMessage(string sId, int prg)
{
err = 0;
@ -73,9 +63,15 @@ namespace GeneratorCode
data = new GenerCodeRet(sId, prg);
}
public int err { get; set; }
public string msg { get; set; }
public GenerCodeRet data { get; set; }
public string FormatRspMessage(int errCode, string readme, int prg)
{
RspMessage rsp = new RspMessage(data.sessionId, prg);
var rsp = new RspMessage(data.sessionId, prg);
rsp.err = errCode;
rsp.msg = readme;
@ -90,31 +86,24 @@ namespace GeneratorCode
public void ProgressMessage(int step)
{
RspMessage rsp = new RspMessage(data.sessionId, step);
var rsp = new RspMessage(data.sessionId, step);
rsp.err = 0;
rsp.msg = "Progress";
msg = JsonConvert.SerializeObject(rsp);
RspMessage.SendRspMessage(msg);
SendRspMessage(msg);
}
}
class Program
internal class Program
{
enum ErrCode
{
ERR_INPUT_PARAMS = 1,
ERR_FILE_NOTEXISTS,
ERR_EXCEPT_THROW,
ERR_JSON_DECODE
};
static int Main(string[] args)
private static int Main(string[] args)
{
GeneratorParams inParams;
RspMessage rspMsg;
var tmObj = new TmatrixClass();
//string inputArg =
// "eyJkcGkiOlswLDAsMCwwXSwicG9pbnRfdHlwZSI6WzAsMCwwLDBdLCJpbWFnZV90eXBlI" +
// "jpbZmFsc2UsZmFsc2UsZmFsc2UsdHJ1ZV0sImtleSI6IlMwLE8wMDAsQjAwMDAsUDAwMC0" +
@ -129,21 +118,18 @@ namespace GeneratorCode
// "XFdvcmtzXFxwZGZcXDEyMy5wZGYiLCJTdGFydFBhZ2VJRCI6MCwic2Vzc" +
// "2lvbklkIjoiNEJENUQ5MjMtNDdFQS00REVGLUExQ0QtOUI4NUI1MTVCMTkxIn0=";
TmatrixClass tmObj = new TmatrixClass();
try
{
if (args.Length == 1)
{
byte[] deCode = Convert.FromBase64String(args[1]);
string strParams = System.Text.Encoding.Default.GetString(deCode);
var deCode = Convert.FromBase64String(args[1]);
var strParams = Encoding.Default.GetString(deCode);
inParams = JsonConvert.DeserializeObject<GeneratorParams>(strParams);
}
else if (args.Length == 2)
{
byte[] deCode = Convert.FromBase64String(args[1]);
string strParams = System.Text.Encoding.Default.GetString(deCode);
var deCode = Convert.FromBase64String(args[1]);
var strParams = Encoding.Default.GetString(deCode);
inParams = JsonConvert.DeserializeObject<GeneratorParams>(strParams);
inParams.sessionId = args[0];
}
@ -155,24 +141,21 @@ namespace GeneratorCode
catch (Exception e)
{
rspMsg = new RspMessage("");
string msg = rspMsg.FormatRspMessage(10, e.Message, 0);
var msg = rspMsg.FormatRspMessage(10, e.Message, 0);
RspMessage.SendRspMessage(msg);
return -(int)ErrCode.ERR_JSON_DECODE;
return -(int) ErrCode.ERR_JSON_DECODE;
}
rspMsg = new RspMessage(inParams.sessionId);
tmObj.ProgressChange += new TmatrixClass.ProgressChangedEvent(rspMsg.ProgressMessage);
tmObj.ProgressChange += rspMsg.ProgressMessage;
string jsInput = JsonConvert.SerializeObject(inParams);
var jsInput = JsonConvert.SerializeObject(inParams);
Console.WriteLine("Input:\n" + jsInput);
//Console.WriteLine("Input:\n" + Convert.ToBase64String(Encoding.Default.GetBytes(jsInput)));
if (!File.Exists(inParams.filePath))
{
return -(int) ErrCode.ERR_FILE_NOTEXISTS;
}
if (!File.Exists(inParams.filePath)) return -(int) ErrCode.ERR_FILE_NOTEXISTS;
try
{
@ -180,27 +163,27 @@ namespace GeneratorCode
}
catch (Exception e)
{
string msg = rspMsg.FormatRspMessage(7, e.Message, 0);
var msg = rspMsg.FormatRspMessage(7, e.Message, 0);
RspMessage.SendRspMessage(msg);
return -(int)ErrCode.ERR_EXCEPT_THROW;
return -(int) ErrCode.ERR_EXCEPT_THROW;
}
try
{
string ret = tmObj.GenerateTmatrixCode_OID4(inParams.key,
var ret = tmObj.GenerateTmatrixCode_OID4(inParams.key,
inParams.filePath, inParams.StartPageID, inParams.point_type,
inParams.image_type, inParams.dpi);
if (ret.Substring(0, 1) != "0")
{
string msg = rspMsg.FormatRspMessage(Int32.Parse(ret.Substring(0, 1)),
var msg = rspMsg.FormatRspMessage(int.Parse(ret.Substring(0, 1)),
ret.Substring(1, ret.Length - 1), tmObj.GetProgerss());
RspMessage.SendRspMessage(msg);
}
else
{
string msg = rspMsg.FormatRspMessage(Int32.Parse(ret.Substring(0, 1)),
var msg = rspMsg.FormatRspMessage(int.Parse(ret.Substring(0, 1)),
ret.Substring(1, ret.Length - 1), 100);
RspMessage.SendRspMessage(msg);
@ -208,9 +191,9 @@ namespace GeneratorCode
}
catch (Exception e)
{
string msg = rspMsg.FormatRspMessage(8, e.Message, tmObj.GetProgerss());
var msg = rspMsg.FormatRspMessage(8, e.Message, tmObj.GetProgerss());
RspMessage.SendRspMessage(msg);
return -(int)ErrCode.ERR_EXCEPT_THROW;
return -(int) ErrCode.ERR_EXCEPT_THROW;
}
try
@ -219,12 +202,20 @@ namespace GeneratorCode
}
catch (Exception e)
{
string msg = rspMsg.FormatRspMessage(9, e.Message, 0);
var msg = rspMsg.FormatRspMessage(9, e.Message, 0);
RspMessage.SendRspMessage(msg);
return -(int)ErrCode.ERR_EXCEPT_THROW;
return -(int) ErrCode.ERR_EXCEPT_THROW;
}
return 0;
}
private enum ErrCode
{
ERR_INPUT_PARAMS = 1,
ERR_FILE_NOTEXISTS,
ERR_EXCEPT_THROW,
ERR_JSON_DECODE
}
}
}
}

1
GeneratorCode/obj/Debug/GeneratorCode.csproj.CoreCompileInputs.cache Normal file
View File

@ -0,0 +1 @@
1bb23c2956fa27bc554cfece2f3c6d60890236c8

BIN
GeneratorCode/obj/Debug/GeneratorCode.csprojAssemblyReference.cache Normal file
View File

Binary file not shown.

1
GeneratorCode/obj/Release/GeneratorCode.csproj.CoreCompileInputs.cache Normal file
View File

@ -0,0 +1 @@
1bb23c2956fa27bc554cfece2f3c6d60890236c8

2
TmatrixCodeGenerator/obj/Debug/TmatrixSDK_OID4.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
9d421bd4a3606649be5c7794adea76d51c28db57
243a5a999667fb6be6f4d4f6ec0d3bd8d40a08ba

BIN
TmatrixCodeGenerator/obj/Debug/TmatrixSDK_OID4.csprojAssemblyReference.cache
View File

Binary file not shown.

BIN
TmatrixCodeGenerator/obj/Release/Interop.AFORMAUTLib.dll Normal file
View File

Binary file not shown.

BIN
TmatrixCodeGenerator/obj/Release/Interop.AcroPDFLib.dll Normal file
View File

Binary file not shown.

BIN
TmatrixCodeGenerator/obj/Release/Interop.Acrobat.dll Normal file
View File

Binary file not shown.

1
TmatrixCodeGenerator/obj/Release/TmatrixSDK_OID4.csproj.CoreCompileInputs.cache Normal file
View File

@ -0,0 +1 @@
68adb061c66cfce90785f52415f33ee52f6918dd

BIN
TmatrixCodeGenerator/obj/Release/TmatrixSDK_OID4.csproj.ResolveComReference.cache Normal file
View File

Binary file not shown.

BIN
TmatrixCodeGenerator/obj/Release/TmatrixSDK_OID4.csprojAssemblyReference.cache Normal file
View File

Binary file not shown.