|
@@ -345,6 +345,9 @@ namespace MOKA_Factory_Tools
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
+ // 如果抄写EDID,跳过白平衡;
|
|
|
+ if (midListNow.keytype != null && midListNow.keytype.ContainsKey("edid_pid"))
|
|
|
+ midListNow.whiteType = "-1";
|
|
|
switch (midListNow.whiteType)//订单白平衡预置状态
|
|
|
{
|
|
|
case "0"://旧订单,默认值
|
|
@@ -426,9 +429,6 @@ namespace MOKA_Factory_Tools
|
|
|
}
|
|
|
case "1"://未预置或预置LR数据
|
|
|
{
|
|
|
-#if DEBUG
|
|
|
- break;
|
|
|
-#else
|
|
|
if (CommonMethod.GetWhiteBalanceInfo(TestMode.getWhiteBalanceInfoUrl, orderNow, TestMode.MAC, errorDBNow, out WhiteBalanceListNow))
|
|
|
{
|
|
|
if (WhiteBalanceListNow.whiteBalanceInfo != null)
|
|
@@ -504,7 +504,6 @@ namespace MOKA_Factory_Tools
|
|
|
}
|
|
|
}
|
|
|
break;
|
|
|
-#endif
|
|
|
}
|
|
|
case "2"://已预置PR数据
|
|
|
{
|