|
@@ -7,6 +7,7 @@ using CrcTest;
|
|
using System.Collections;
|
|
using System.Collections;
|
|
using System.Threading;
|
|
using System.Threading;
|
|
using SXLibrary;
|
|
using SXLibrary;
|
|
|
|
+using System.Diagnostics;
|
|
|
|
|
|
namespace MOKA_Factory_Tools
|
|
namespace MOKA_Factory_Tools
|
|
{
|
|
{
|
|
@@ -1822,14 +1823,15 @@ namespace MOKA_Factory_Tools
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
public static bool GetFireTVDevcieCode(SerialPort Comport, out byte[] result, out byte[] data, out string error, int waitTime)
|
|
public static bool GetFireTVDevcieCode(SerialPort Comport, out byte[] result, out byte[] data, out string error, int waitTime)
|
|
{
|
|
{
|
|
|
|
+ // 计算函数耗时;
|
|
|
|
+ Stopwatch watch = new Stopwatch();
|
|
|
|
+ watch.Start();
|
|
if (Sendcmd(Comport, new byte[] { 0xAA }, new byte[] { 0xEC }, new byte[] { 0x11,0x06 }, true, false, out result, out data, out error, waitTime))
|
|
if (Sendcmd(Comport, new byte[] { 0xAA }, new byte[] { 0xEC }, new byte[] { 0x11,0x06 }, true, false, out result, out data, out error, waitTime))
|
|
{
|
|
{
|
|
if (data[0] == 0x11 & data[1] == 0x06)
|
|
if (data[0] == 0x11 & data[1] == 0x06)
|
|
{
|
|
{
|
|
data = data.Skip(2).Take(data.Length - 2).ToArray();
|
|
data = data.Skip(2).Take(data.Length - 2).ToArray();
|
|
- if (data.Length == 3)
|
|
|
|
- return true;
|
|
|
|
- else
|
|
|
|
|
|
+ if (data.Length != 3)
|
|
{
|
|
{
|
|
error = "返回DevcieCode长度错误,应为3 bytes";
|
|
error = "返回DevcieCode长度错误,应为3 bytes";
|
|
return false;
|
|
return false;
|
|
@@ -1840,11 +1842,11 @@ namespace MOKA_Factory_Tools
|
|
error = "返回DevcieCode类型错误,应为0x11 0x06";
|
|
error = "返回DevcieCode类型错误,应为0x11 0x06";
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
- else
|
|
|
|
- return false;
|
|
|
|
|
|
|
|
|
|
+ Log.WriteInfoLog(string.Format("GetDeviceCode Elapsed = {0}", watch.Elapsed.TotalMilliseconds));
|
|
|
|
+
|
|
|
|
+ return true;
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -2272,22 +2274,24 @@ namespace MOKA_Factory_Tools
|
|
/// <returns></returns>
|
|
/// <returns></returns>
|
|
public static bool ReadFireTVPSN(SerialPort Comport, out byte[] result, out byte[] data, out string error, int waitTime)
|
|
public static bool ReadFireTVPSN(SerialPort Comport, out byte[] result, out byte[] data, out string error, int waitTime)
|
|
{
|
|
{
|
|
|
|
+ // 计算函数耗时;
|
|
|
|
+ Stopwatch watch = new Stopwatch();
|
|
|
|
+ watch.Start();
|
|
if (Sendcmd(Comport, new byte[] { 0xAA }, new byte[] { 0xFC }, new byte[] { 0x03, 0x05 }, true, false, out result, out data, out error, waitTime))
|
|
if (Sendcmd(Comport, new byte[] { 0xAA }, new byte[] { 0xFC }, new byte[] { 0x03, 0x05 }, true, false, out result, out data, out error, waitTime))
|
|
{
|
|
{
|
|
if (data[0] == 0x04 && data[1] == 0x05)
|
|
if (data[0] == 0x04 && data[1] == 0x05)
|
|
{
|
|
{
|
|
data = data.Skip(2).Take(data.Length - 2).ToArray();
|
|
data = data.Skip(2).Take(data.Length - 2).ToArray();
|
|
|
|
+ Log.WriteInfoLog(string.Format("Read PSN Elapsed={0}", watch.Elapsed.TotalMilliseconds));
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
error = "返回PSN类型错误,应为0x04 0x05";
|
|
error = "返回PSN类型错误,应为0x04 0x05";
|
|
- return false;
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
- else
|
|
|
|
- return false;
|
|
|
|
|
|
+
|
|
|
|
+ return false;
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|