|
@@ -693,7 +693,8 @@ namespace MOKA_Factory_Tools
|
|
}
|
|
}
|
|
SNText.Text = "";
|
|
SNText.Text = "";
|
|
#if SIMULATION
|
|
#if SIMULATION
|
|
- SNText.Text = "test0205002yi";
|
|
|
|
|
|
+ SN = "40243/C06100001003";
|
|
|
|
+ SNText.Text = "40243/C06100001003";
|
|
#endif
|
|
#endif
|
|
SNTextFocus = new Thread(TextBoxFocus);
|
|
SNTextFocus = new Thread(TextBoxFocus);
|
|
SNTextFocus.Start();
|
|
SNTextFocus.Start();
|
|
@@ -2199,15 +2200,14 @@ namespace MOKA_Factory_Tools
|
|
goto end;
|
|
goto end;
|
|
}
|
|
}
|
|
#else
|
|
#else
|
|
- devicecode = "G9V2GV0123260000";
|
|
|
|
- psn = keyInfo._PSN.data = "B22013921-0B00018";
|
|
|
|
|
|
+ devicecode = "277";
|
|
|
|
+ psn = keyInfo._PSN.data = "FZ1BBCP2706XXNXB00037";
|
|
#endif
|
|
#endif
|
|
}
|
|
}
|
|
|
|
|
|
// 部分订单无key,只有Roku信息;
|
|
// 部分订单无key,只有Roku信息;
|
|
if (midListNow.keytype.Count() != 0)
|
|
if (midListNow.keytype.Count() != 0)
|
|
{
|
|
{
|
|
- //if (!CommonMethod.GetIDMKeys(midListNow.host, SN, orderNow, psn, devicecode, key2Write, errorDBNow, ref keyInfo, out error))
|
|
|
|
if (!V2Method.GetMidKey(midListNow.host, SN, orderNow, psn, devicecode, key2Write, errorDBNow, ref keyInfo, out error))
|
|
if (!V2Method.GetMidKey(midListNow.host, SN, orderNow, psn, devicecode, key2Write, errorDBNow, ref keyInfo, out error))
|
|
{
|
|
{
|
|
ErrMsg = string.Format("{0} GetIDMKeys Failed!\r\n{1}", SN, error);
|
|
ErrMsg = string.Format("{0} GetIDMKeys Failed!\r\n{1}", SN, error);
|
|
@@ -4954,9 +4954,12 @@ namespace MOKA_Factory_Tools
|
|
stop:
|
|
stop:
|
|
timer1.Stop();
|
|
timer1.Stop();
|
|
usingTime = 0;
|
|
usingTime = 0;
|
|
- EnableText(SNText);
|
|
|
|
- EnableButton(BtnClickstart);
|
|
|
|
|
|
+
|
|
|
|
+#if !SIMULATION
|
|
SN = "";
|
|
SN = "";
|
|
|
|
+ EnableText(SNText);
|
|
|
|
+#endif
|
|
|
|
+ EnableButton(BtnClickstart);
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|