浏览代码

如果订单包含edid_pid 抄写,则跳过白平衡;

sat23 3 年之前
父节点
当前提交
00decff878
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. 2 1
      SCBC Factory Tools/MOKA Factory Tools.csproj
  2. 3 4
      SCBC Factory Tools/Views/OperationPanel.cs

+ 2 - 1
SCBC Factory Tools/MOKA Factory Tools.csproj

@@ -44,7 +44,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
@@ -52,6 +52,7 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>true</Prefer32Bit>
     <LangVersion>8.0</LangVersion>
+    <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Icons\SCBC Factory Tools.ico</ApplicationIcon>

+ 3 - 4
SCBC Factory Tools/Views/OperationPanel.cs

@@ -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数据
                             {