|
@@ -345,8 +345,8 @@ namespace MOKA_Factory_Tools
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- // 如果抄写EDID,跳过白平衡;
|
|
|
- if (midListNow.keytype != null && midListNow.keytype.ContainsKey("edid_pid"))
|
|
|
+ // 如果是抄写EDID,则不获取白平衡数据;
|
|
|
+ if (CommonMethod.IsEDIDCopy(midListNow))
|
|
|
midListNow.whiteType = "-1";
|
|
|
switch (midListNow.whiteType)//订单白平衡预置状态
|
|
|
{
|
|
@@ -2304,6 +2304,15 @@ namespace MOKA_Factory_Tools
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ // 如果是抄写EDID,则不获取白平衡数据;
|
|
|
+ if (CommonMethod.IsEDIDCopy(midListNow))
|
|
|
+ {
|
|
|
+ SetspecificText(SoftwareVersionNote, LResource.SkipChecking, Color.Yellow);
|
|
|
+ SetspecificText(ClientTypeNote, LResource.SkipChecking, Color.Yellow);
|
|
|
+ if(midListNow.projectid.Equals("0"))
|
|
|
+ SetspecificText(ProjectIDNote, LResource.SkipCovering, Color.Yellow);
|
|
|
+ }
|
|
|
+
|
|
|
//检查Software version
|
|
|
if (SoftwareVersionNote.Text != LResource.SkipChecking)
|
|
|
{
|