浏览代码

修正FVP导致的问题。

JeffWang 3 年之前
父节点
当前提交
b9c00c20a3
共有 1 个文件被更改,包括 12 次插入4 次删除
  1. 12 4
      FactoryTool_CShare/Views/OperationPanel.cs

+ 12 - 4
FactoryTool_CShare/Views/OperationPanel.cs

@@ -942,9 +942,9 @@ namespace MOKA_Factory_Tools
                         WriteDAK.Checked = (keyInfo.DAK.Length > 0 && m_writeDAK.Text != LResource.Skip);
                         if (WriteDAK.Checked)
                             Log.WriteGetKeyLog("\r\nLocal DB DAK=" + keyInfo.DAK.data);
-                        WriteFVP.Checked = midListNow.keytype == null ? false : midListNow.keytype.ContainsKey("FVP") && m_writeFVP.Text != LResource.Skip;
-                        WriteDSN.Checked = midListNow.keytype == null ? false : midListNow.keytype.ContainsKey("DSN") && m_writeDSN.Text != LResource.Skip;
-                        //WriteDolby.Checked = midListNow.keytype == null ? false : midListNow.keytype.ContainsKey("Dolby") && m_writeDolby.Text != LResource.Skip;
+                        WriteFVP.Checked = m_writeFVP.Text != LResource.Skip;
+                        WriteDSN.Checked = (keyInfo.DSN.Length > 0 && m_writeDSN.Text != LResource.Skip);
+                        //WriteDolby.Checked = (keyInfo.Dolby.Length > 0 && m_writeDolby.Text != LResource.Skip);
                         WritePSN.Checked = FunctionSettingNow.BarcodeWrite;
 
                         timer1.Start();
@@ -5454,11 +5454,17 @@ namespace MOKA_Factory_Tools
             {
                 if (cfg_writedone.FVPWrite_YesNo)
                     SetCheckboxStatus(WriteFVP, true);
-                UpdateKeyCount("FVP", keys["FVP"], false);
             }
             return true;
         }
 
+        public bool UpdateKeyCountEx(string key, ref Dictionary<string, string> keys, bool autokey)
+        {
+            if (keys.ContainsKey(key))
+                return UpdateKeyCount(key, keys[key], autokey);
+
+            return false;
+        }
 
         /// <summary>
         /// 获取key数量,更新Keycount
@@ -6415,6 +6421,8 @@ namespace MOKA_Factory_Tools
             keyInfo.DAK.enable = WriteDAK.Checked = (WriteDAK.Checked && m_writeDAK.Text != LResource.Skip);
             keyInfo.FVP.enable = WriteFVP.Checked = (WriteFVP.Checked && m_writeFVP.Text != LResource.Skip);
             keyInfo.DSN.enable = WriteDSN.Checked = (WriteDSN.Checked && m_writeDSN.Text != LResource.Skip);
+            //keyInfo.Dolby.enable = WriteDolby.Checked = (WriteDolby.Checked && m_writeDolby.Text != LResource.Skip);
+
             bool preloadresult = false;
 
             preloadresult = true;