浏览代码

变更函数参数名称,更规则易读。

sat23 3 年之前
父节点
当前提交
e72f8fda8c

+ 7 - 7
SCBC Factory Tools/Business/CommonMethod.cs

@@ -873,15 +873,15 @@ namespace MOKA_Factory_Tools
             return true;
         }
 
-        public static bool GetAcasKey(string url, string keymessage, string sn, string keytype, SQLiteConnection sqliteConn, string order, out string key, out string md5, out string key2, out string md52, out string error)
+        public static bool GetAcasKey(string url, string keymessage, string sn, string keytype, SQLiteConnection sqliteConn, string order, out string acaskey_data, out string acaskey_datamd5, out string acaskey_tool, out string acaskey_toolmd5, out string error)
         {
             string code;
             string desc;
             error = "";
-            key = "";
-            md5 = "";
-            key2 = "";
-            md52 = "";
+            acaskey_data = "";
+            acaskey_datamd5 = "";
+            acaskey_tool = "";
+            acaskey_toolmd5 = "";
             HttpHelper http = new HttpHelper();
             HttpItem item = new HttpItem()
             {
@@ -899,7 +899,7 @@ namespace MOKA_Factory_Tools
             if (result.StatusCode == System.Net.HttpStatusCode.OK)
             {
                 Log.WriteGetKeyLog("\r\nGet ACAS key:\r\n" + item.URL + "\r\n" + item.Postdata + "\r\n" + result.Html);
-                if (Xmlconfig.Get2KeyInfoFromXml(result.Html, "acasKey_data", "acasKey_tool", out code, out desc, out key, out md5, out key2, out md52))
+                if (Xmlconfig.Get2KeyInfoFromXml(result.Html, "acasKey_data", "acasKey_tool", out code, out desc, out acaskey_data, out acaskey_datamd5, out acaskey_tool, out acaskey_toolmd5))
                 {
 
                 }
@@ -917,7 +917,7 @@ namespace MOKA_Factory_Tools
                 return false;
             }
 
-            return false;
+            return true;
         }
 
         /// <summary>

+ 17 - 17
SCBC Factory Tools/Http/Xmlconfig.cs

@@ -168,13 +168,13 @@ public class Xmlconfig
     /// 解析并获取返回2个key的xml.
     /// </summary>
     /// <returns></returns>
-    public static bool Get2KeyInfoFromXml(string str, string key1, string key2, out string code, out string desc, out string value1, out string md51, out string value2, out string md52)
+    public static bool Get2KeyInfoFromXml(string str, string dataKey, string toolKey, out string code, out string desc, out string acaskey_data, out string acaskey_datamd5, out string acaskey_tool, out string acaskey_toolmd5)
     {
-        md51 = "";
-        md52 = "";
+        acaskey_data = "";
+        acaskey_tool = "";
         code = "";
-        value1 = "";
-        value2 = "";
+        acaskey_datamd5 = "";
+        acaskey_toolmd5 = "";
         try
         {
             XmlDocument xml = new XmlDocument();
@@ -183,33 +183,33 @@ public class Xmlconfig
             desc = xml.SelectSingleNode("response").Attributes.GetNamedItem("desc").InnerText;
             if (code == "200")
             {
-                value1 = xml.SelectSingleNode("response//" + key1).Attributes.GetNamedItem("value").InnerText;
-                if (xml.SelectSingleNode("response//" + key1).Attributes.GetNamedItem("md5value") != null)
-                    md51 = xml.SelectSingleNode("response//" + key1).Attributes.GetNamedItem("md5value").InnerText;
+                acaskey_data = xml.SelectSingleNode("response//" + dataKey).Attributes.GetNamedItem("value").InnerText;
+                if (xml.SelectSingleNode("response//" + dataKey).Attributes.GetNamedItem("md5value") != null)
+                    acaskey_datamd5 = xml.SelectSingleNode("response//" + dataKey).Attributes.GetNamedItem("md5value").InnerText;
 
                 bool bCRC321 = false;
                 string CRC321 = "";
-                if (xml.SelectSingleNode("response//" + key1).Attributes.GetNamedItem("crc32") != null)
+                if (xml.SelectSingleNode("response//" + dataKey).Attributes.GetNamedItem("crc32") != null)
                 {
                     bCRC321 = true;
-                    CRC321 = xml.SelectSingleNode("response//" + key1).Attributes.GetNamedItem("crc32").InnerText;
+                    CRC321 = xml.SelectSingleNode("response//" + dataKey).Attributes.GetNamedItem("crc32").InnerText;
                 }
 
-                value2 = xml.SelectSingleNode("response//" + key2).Attributes.GetNamedItem("value").InnerText;
-                if (xml.SelectSingleNode("response//" + key2).Attributes.GetNamedItem("md5value") != null)
-                    md52 = xml.SelectSingleNode("response//" + key2).Attributes.GetNamedItem("md5value").InnerText;
+                acaskey_tool = xml.SelectSingleNode("response//" + toolKey).Attributes.GetNamedItem("value").InnerText;
+                if (xml.SelectSingleNode("response//" + toolKey).Attributes.GetNamedItem("md5value") != null)
+                    acaskey_toolmd5 = xml.SelectSingleNode("response//" + toolKey).Attributes.GetNamedItem("md5value").InnerText;
 
                 bool bCRC322 = false;
                 string CRC322 = "";
-                if (xml.SelectSingleNode("response//" + key2).Attributes.GetNamedItem("crc32") != null)
+                if (xml.SelectSingleNode("response//" + toolKey).Attributes.GetNamedItem("crc32") != null)
                 {
                     bCRC322 = true;
-                    CRC322 = xml.SelectSingleNode("response//" + key2).Attributes.GetNamedItem("crc32").InnerText;
+                    CRC322 = xml.SelectSingleNode("response//" + toolKey).Attributes.GetNamedItem("crc32").InnerText;
                 }
 
                 if (bCRC321)
                 { 
-                    if (CrcUtils.CRC32(value1) != Convert.ToUInt32(CRC321, 16))
+                    if (CrcUtils.CRC32(acaskey_data) != Convert.ToUInt32(CRC321, 16))
                     {
                         desc = "CRC32 error";
                         return false;
@@ -218,7 +218,7 @@ public class Xmlconfig
 
                 if (bCRC322)
                 {
-                    if (CrcUtils.CRC32(value2) != Convert.ToUInt32(CRC322, 16))
+                    if (CrcUtils.CRC32(acaskey_tool) != Convert.ToUInt32(CRC322, 16))
                     {
                         desc = "CRC32 error";
                         return false;

+ 2 - 2
SCBC Factory Tools/IO/SerialCMD.cs

@@ -2421,7 +2421,7 @@ namespace MOKA_Factory_Tools
         {
             if (Sendcmd(Comport, new byte[] { 0xAA }, new byte[] { 0xFC }, new byte[] { 0x01, 0x08 }, true, false, out result, out data, out error, waitTime))
             {
-                if (data.Length == 3 && data[0] == 0x02 && data[1] == 0x08 && data[1] == 0x01)
+                if (data.Length == 3 && data[0] == 0x02 && data[1] == 0x08 && data[2] == 0x01)
                 {
                     return true;
                 }
@@ -2480,7 +2480,7 @@ namespace MOKA_Factory_Tools
         {
             if (Sendcmd(Comport, new byte[] { 0xAA }, new byte[] { 0xFC }, new byte[] { 0x01, 0x0A }, true, false, out result, out data, out error, waitTime))
             {
-                if (data.Length == 3 && data[0] == 0x02 && data[1] == 0x0A && data[1] == 0x01)
+                if (data.Length == 3 && data[0] == 0x02 && data[1] == 0x0A && data[2] == 0x01)
                 {
                     return true;
                 }

+ 3 - 3
SCBC Factory Tools/Views/OperationPanel.cs

@@ -3824,12 +3824,12 @@ namespace MOKA_Factory_Tools
                 byte[] ACASKeyTool = SerialInit.HexToByte(keyInfo.ACASKey_Tool);
                 if (SerialCMD.SetACASKeyTool(TVPort, ACASKeyTool, out result, out data, out error, SerailDelay))
                 {
-                    SetsuccessStatus(m_writeACASKey);
+                    //SetsuccessStatus(m_writeACASKey);
                     keycontent += "acas_tool=" + keyInfo.ACASKey_Tool+ "&";
                     Log.WriteInfoLog("Check ACAS Key Tool...");
                     if (writeCheckNow.ACASKeyCheckcheck ? SerialCMD.CheckACASKeyTool(TVPort, out result, out data, out error, SerailDelay) : true)
                     {
-                        SetsuccessStatus(m_checkACASKey);
+                        //SetsuccessStatus(m_checkACASKey);
                         Log.WriteInfoLog("Read ACAS Key Tool...");
                         if (readCheckNow.ACASIDReadcheck ? SerialCMD.ReadACASKeyTool(TVPort, out result, out data, out error, SerailDelay) : true)
                         {
@@ -3837,7 +3837,7 @@ namespace MOKA_Factory_Tools
                             {
                                 if (CommonMethod.CompareMD5(ACASKeyTool, data))
                                 {
-                                    SetsuccessStatus(m_readACASKey);
+                                    //SetsuccessStatus(m_readACASKey);
                                 }
                                 else
                                 {