Browse Source

修复:在使用多个key源时,非IDM key来源由于默认无没有配置key信息,导致抄写默认不抄写的Bug。

jianfeng1.wang 2 years ago
parent
commit
3910925c43
1 changed files with 31 additions and 0 deletions
  1. 31 0
      FactoryTool_CShare/Views/OperationPanel.cs

+ 31 - 0
FactoryTool_CShare/Views/OperationPanel.cs

@@ -388,6 +388,34 @@ namespace MOKA_Factory_Tools
             }
             }
             #endregion
             #endregion
 
 
+            #region 默认根据config启用是否抄写;
+            SetCheckboxStatus(WriteDID, cfg_writedone.DIDWrite_YesNo);
+            SetCheckboxStatus(WriteMac, cfg_writedone.MacWrite_YesNo);
+            SetCheckboxStatus(WriteHDCP, cfg_writedone.HDCPWrite_YesNo);
+            SetCheckboxStatus(WriteCiplus, cfg_writedone.CI_plusWrite_YesNo);
+            SetCheckboxStatus(WriteWidevine, cfg_writedone.WidevineWrite_YesNo);
+            SetCheckboxStatus(WriteHDCP22, cfg_writedone.HDCP22Write_YesNo);
+            SetCheckboxStatus(WriteESN, cfg_writedone.ESNWrite_YesNo);
+            SetCheckboxStatus(WriteAttestation, cfg_writedone.AttestationWrite_YesNo);
+            SetCheckboxStatus(WriteMGK, cfg_writedone.MGKWrite_YesNo);
+            SetCheckboxStatus(WriteFairplay, cfg_writedone.FairplayWrite_YesNo);
+            SetCheckboxStatus(WriteECP, cfg_writedone.ECPWrite_YesNo);
+            SetCheckboxStatus(WriteWifiMac, cfg_writedone.WifiMacWrite_YesNo);
+            SetCheckboxStatus(WriteBTMac, cfg_writedone.BTMacWrite_YesNo);
+            SetCheckboxStatus(WriteLEK, cfg_writedone.LEKWrite_YesNo);
+            SetCheckboxStatus(WritePEK, cfg_writedone.PEKWrite_YesNo);
+            SetCheckboxStatus(WritePlayready, cfg_writedone.PlayreadyWrite_YesNo);
+            SetCheckboxStatus(WriteHash, cfg_writedone.HashWrite_YesNo);
+            SetCheckboxStatus(WriteYouTube, cfg_writedone.YouTubeWrite_YesNo);
+            SetCheckboxStatus(WriteDSN, cfg_writedone.DSNWrite_YesNo);
+            SetCheckboxStatus(WriteEDIDPID, cfg_writedone.EDIDPIDWrite_YesNo);
+            SetCheckboxStatus(WriteEDIDName, cfg_writedone.EDIDModeNameWrite_YesNo);
+            SetCheckboxStatus(WriteACASKey, cfg_writedone.ACASKeyWrite_YesNo);
+            SetCheckboxStatus(WriteDAK, cfg_writedone.DAKWrite_YesNo);
+            SetCheckboxStatus(WriteFVP, cfg_writedone.FVPWrite_YesNo);
+            SetCheckboxStatus(WriteKFP, cfg_writedone.KFPWrite_YesNo);
+            #endregion
+
             if (midListNow.host != "LocalPC")
             if (midListNow.host != "LocalPC")
             {
             {
                 if ((!FunctionSettingNow.WriteWB) && (!cfg_writedone.AutoWhiteBalance))
                 if ((!FunctionSettingNow.WriteWB) && (!cfg_writedone.AutoWhiteBalance))
@@ -400,6 +428,9 @@ namespace MOKA_Factory_Tools
                     // 如果是抄写EDID,则不获取白平衡数据;
                     // 如果是抄写EDID,则不获取白平衡数据;
                     if (CommonMethod.IsEDIDCopy(midListNow))
                     if (CommonMethod.IsEDIDCopy(midListNow))
                         midListNow.whiteType = "-1";
                         midListNow.whiteType = "-1";
+#if DEBUG
+                    midListNow.whiteType = "-1";
+#endif
                     Log.WriteInfoLog("whiteType=" + midListNow.whiteType);
                     Log.WriteInfoLog("whiteType=" + midListNow.whiteType);
                     switch (midListNow.whiteType)//订单白平衡预置状态
                     switch (midListNow.whiteType)//订单白平衡预置状态
                     {
                     {