|
@@ -878,7 +878,7 @@ namespace MOKA_Factory_Tools
|
|
}
|
|
}
|
|
#endregion
|
|
#endregion
|
|
|
|
|
|
-#if !SIMULATION
|
|
|
|
|
|
+#if !SIMULATION && !OD_VER
|
|
if (CommonMethod.GetLoginAccout().Equals("Sanhua", StringComparison.OrdinalIgnoreCase))
|
|
if (CommonMethod.GetLoginAccout().Equals("Sanhua", StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
{
|
|
string message = string.Empty;
|
|
string message = string.Empty;
|
|
@@ -1763,7 +1763,7 @@ namespace MOKA_Factory_Tools
|
|
string ErrMsg = "";
|
|
string ErrMsg = "";
|
|
string psn = "";
|
|
string psn = "";
|
|
string devicecode = "";
|
|
string devicecode = "";
|
|
-#if !SIMULATION
|
|
|
|
|
|
+#if !SIMULATION && !OD_VER
|
|
//进工厂
|
|
//进工厂
|
|
if (!TVPort.IsOpen)
|
|
if (!TVPort.IsOpen)
|
|
{
|
|
{
|
|
@@ -2219,7 +2219,7 @@ namespace MOKA_Factory_Tools
|
|
// 只用一个接口获取所有Key;
|
|
// 只用一个接口获取所有Key;
|
|
if (midListNow.keytype.ContainsKey("DSN"))
|
|
if (midListNow.keytype.ContainsKey("DSN"))
|
|
{
|
|
{
|
|
-#if !SIMULATION
|
|
|
|
|
|
+#if !SIMULATION && !OD_VER
|
|
// 读取dvicecode
|
|
// 读取dvicecode
|
|
if (SerialCMD.GetFireTVDevcieCode(TVPort, out result, out data, out error, SerailDelay))
|
|
if (SerialCMD.GetFireTVDevcieCode(TVPort, out result, out data, out error, SerailDelay))
|
|
{
|
|
{
|
|
@@ -2250,8 +2250,8 @@ namespace MOKA_Factory_Tools
|
|
goto end;
|
|
goto end;
|
|
}
|
|
}
|
|
#else
|
|
#else
|
|
- devicecode = "2C5";
|
|
|
|
- psn = keyInfo._PSN.data = "FZ7BBCP2A11XXNXM00008";
|
|
|
|
|
|
+ devicecode = "2C5";
|
|
|
|
+ psn = keyInfo._PSN.data = "FZ7BBCP2A11XXNXM00008";
|
|
#endif
|
|
#endif
|
|
}
|
|
}
|
|
|
|
|