更新内容：

1、版本3.0.1.9
2、新增KFPKey的config.josn配置项
3、新增KFPKey界面相关处理。
4、实现config.json处理
5、实现抄写KFP处理。

FactoryTool_CShare/Business/CommonMethod.cs

@@ -347,6 +347,7 @@ namespace MOKA_Factory_Tools
             check_key_type("YouTube_KEY", resultKeyType, cfg_write.YouTubeWrite_YesNo);
             check_key_type("ACAS_KEY", resultKeyType, cfg_write.ACASKeyWrite_YesNo);
             check_key_type("DAK", resultKeyType, cfg_write.DAKWrite_YesNo);
+            check_key_type("KFP_KEY", resultKeyType, cfg_write.KFPWrite_YesNo);
 
             return resultKeyType.Count == 0 ? false : true;
         }

FactoryTool_CShare/Business/V2Method.cs

@@ -421,6 +421,18 @@ namespace MOKA_Factory_Tools
                                 }
                             }
 
+                            if (data.ContainsKey("kfp") && data.ContainsKey("kfp_md5"))
+                            {
+                                keys.KFP.data = data["kfp"];
+                                keys.KFP.md5 = data["kfp_md5"];
+
+                                if (!CheckMD5(keys.KFP.data, keys.KFP.md5))
+                                {
+                                    msg = string.Format("KFP Key Value md5 Is Incorrect: data={0}, md5={1}", keys.KFP.data, keys.KFP.md5);
+                                    goto end;
+                                }
+                            }
+
                             result = true;
                         }
                     }
@@ -524,6 +536,7 @@ namespace MOKA_Factory_Tools
                     AddKeyJson2(keyinfo.YouTube_KEY, postJson, "youtubekey");
                     AddKeyJson2(keyinfo.ACASKey_Data, postJson, "acas_data");
                     AddKeyJson2(keyinfo.DAK, postJson, "dak");
+                    AddKeyJson2(keyinfo.DAK, postJson, "kfp");
                 }
 
                 return postJson.ToString();

FactoryTool_CShare/Models/StructList.cs

@@ -331,6 +331,7 @@ namespace MOKA_Factory_Tools
         //public KeyData ACASKey_ToolMd5 = new KeyData();
         public KeyData DAK = new KeyData("dak");
         public KeyData FVP = new KeyData();
+        public KeyData KFP = new KeyData("kfp");
         #region Kayla所需数据;
         public KeyData _PSN = new KeyData();
         #endregion
@@ -384,6 +385,7 @@ namespace MOKA_Factory_Tools
         public bool FVPReadcheck { get; set; }
         public bool DAKReadcheck { get; set; }
         public bool DolbyReadcheck { get; set; }
+        public bool KFPReadcheck { get; set; }
     }
 
     public class Config_WriteCheck
@@ -411,6 +413,7 @@ namespace MOKA_Factory_Tools
         public bool FVPCheckcheck { get; set; }
         public bool DAKCheckcheck { get; set; }
         public bool DolbyCheckcheck { get; set; }
+        public bool KFPCheckcheck { get; set; }
     }
 
     public class Config_WriteDone
@@ -449,6 +452,7 @@ namespace MOKA_Factory_Tools
         public bool YouTubeWrite_YesNo { get; set; }       
         public bool ACASKeyWrite_YesNo { get; set; }
         public bool DAKWrite_YesNo { get; set; }
+        public bool KFPWrite_YesNo { get; set; }
         #endregion
     }
 

FactoryTool_CShare/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.1.0.8")]
+[assembly: AssemblyVersion("3.1.0.9")]
 [assembly: AssemblyFileVersion("1.0.0.1")]

FactoryTool_CShare/Views/Main.cs

@@ -935,6 +935,7 @@ namespace MOKA_Factory_Tools
                 cfg_readcheck.FVPReadcheck = jObject["ReadCheck"]["FVP"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "FVP") : jObject["ReadCheck"]["FVP"].Value<bool>();
                 cfg_readcheck.DAKReadcheck = jObject["ReadCheck"]["DAK"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "DAK") : jObject["ReadCheck"]["DAK"].Value<bool>();
                 cfg_readcheck.DolbyReadcheck = jObject["ReadCheck"]["Dolby"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "Dolby") : jObject["ReadCheck"]["Dolby"].Value<bool>();
+                cfg_readcheck.KFPReadcheck = jObject["ReadCheck"]["KFP"] == null ? CommonMethod.InsertJsonConfig("ReadCheck", "KFP") : jObject["ReadCheck"]["KFP"].Value<bool>();
                 #endregion
 
                 #region WriteCheck配置读取
@@ -961,6 +962,7 @@ namespace MOKA_Factory_Tools
                 cfg_writecheck.FVPCheckcheck = jObject["WriteCheck"]["FVP"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "FVP") : jObject["WriteCheck"]["FVP"].Value<bool>();
                 cfg_writecheck.DAKCheckcheck = jObject["WriteCheck"]["DAK"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "DAK") : jObject["WriteCheck"]["DAK"].Value<bool>();
                 cfg_writecheck.DolbyCheckcheck = jObject["WriteCheck"]["Dolby"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "Dolby") : jObject["WriteCheck"]["Dolby"].Value<bool>();
+                cfg_writecheck.KFPCheckcheck = jObject["WriteCheck"]["KFP"] == null ? CommonMethod.InsertJsonConfig("WriteCheck", "KFP") : jObject["WriteCheck"]["KFP"].Value<bool>();
                 #endregion
 
                 #region WriteDone配置读取
@@ -994,7 +996,9 @@ namespace MOKA_Factory_Tools
                 cfg_writedone.FVPWrite_YesNo = jObject["WriteDone"]["FVP"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "FVP") : jObject["WriteDone"]["FVP"].Value<bool>();
                 cfg_writedone.DAKWrite_YesNo = jObject["WriteDone"]["DAK"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "DAK") : jObject["WriteDone"]["DAK"].Value<bool>();
                 cfg_writedone.DolbyWrite_YesNo = jObject["WriteDone"]["Dolby"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "Dolby") : jObject["WriteDone"]["Dolby"].Value<bool>();
+                cfg_writedone.KFPWrite_YesNo = jObject["WriteDone"]["KFP"] == null ? CommonMethod.InsertJsonConfig("WriteDone", "KFP") : jObject["WriteDone"]["KFP"].Value<bool>();
                 #endregion
+
                 file.Close();
                 if (Custom_ProjectID != null)
                     if (Custom_ProjectID.Trim().Length > 0)

FactoryTool_CShare/Views/OperationPanel.Designer.cs

@@ -205,6 +205,11 @@
             this.SNText = new CCWin.SkinControl.SkinWaterTextBox();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+            this.m_readKFP = new CCWin.SkinControl.SkinLabel();
+            this.m_checkKFP = new CCWin.SkinControl.SkinLabel();
+            this.m_writeKFP = new CCWin.SkinControl.SkinLabel();
+            this.KFPCount = new CCWin.SkinControl.SkinLabel();
+            this.WriteKFP = new CCWin.SkinControl.SkinCheckBox();
             this.skinGroupBox1.SuspendLayout();
             this.skinGroupBox2.SuspendLayout();
             this.skinPanel1.SuspendLayout();
@@ -560,6 +565,11 @@
             // 
             resources.ApplyResources(this.skinPanel1, "skinPanel1");
             this.skinPanel1.BackColor = System.Drawing.Color.Transparent;
+            this.skinPanel1.Controls.Add(this.m_readKFP);
+            this.skinPanel1.Controls.Add(this.m_checkKFP);
+            this.skinPanel1.Controls.Add(this.m_writeKFP);
+            this.skinPanel1.Controls.Add(this.KFPCount);
+            this.skinPanel1.Controls.Add(this.WriteKFP);
             this.skinPanel1.Controls.Add(this.m_readDAK);
             this.skinPanel1.Controls.Add(this.m_checkDAK);
             this.skinPanel1.Controls.Add(this.m_writeDAK);
@@ -1837,6 +1847,48 @@
             this.timer1.Interval = 1000;
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
+            // m_readKFP
+            // 
+            resources.ApplyResources(this.m_readKFP, "m_readKFP");
+            this.m_readKFP.BackColor = System.Drawing.Color.Transparent;
+            this.m_readKFP.BorderColor = System.Drawing.Color.White;
+            this.m_readKFP.Name = "m_readKFP";
+            // 
+            // m_checkKFP
+            // 
+            resources.ApplyResources(this.m_checkKFP, "m_checkKFP");
+            this.m_checkKFP.BackColor = System.Drawing.Color.Transparent;
+            this.m_checkKFP.BorderColor = System.Drawing.Color.White;
+            this.m_checkKFP.Name = "m_checkKFP";
+            // 
+            // m_writeKFP
+            // 
+            resources.ApplyResources(this.m_writeKFP, "m_writeKFP");
+            this.m_writeKFP.BackColor = System.Drawing.Color.Transparent;
+            this.m_writeKFP.BorderColor = System.Drawing.Color.White;
+            this.m_writeKFP.Name = "m_writeKFP";
+            // 
+            // KFPCount
+            // 
+            resources.ApplyResources(this.KFPCount, "KFPCount");
+            this.KFPCount.BackColor = System.Drawing.Color.Transparent;
+            this.KFPCount.BorderColor = System.Drawing.Color.White;
+            this.KFPCount.Name = "KFPCount";
+            // 
+            // WriteKFP
+            // 
+            resources.ApplyResources(this.WriteKFP, "WriteKFP");
+            this.WriteKFP.BackColor = System.Drawing.Color.Transparent;
+            this.WriteKFP.ControlState = CCWin.SkinClass.ControlState.Normal;
+            this.WriteKFP.DownBack = null;
+            this.WriteKFP.MouseBack = null;
+            this.WriteKFP.Name = "WriteKFP";
+            this.WriteKFP.NormlBack = null;
+            this.WriteKFP.SelectedDownBack = null;
+            this.WriteKFP.SelectedMouseBack = null;
+            this.WriteKFP.SelectedNormlBack = null;
+            this.WriteKFP.UseVisualStyleBackColor = false;
+            // 
             // OperationPanel
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -2042,5 +2094,10 @@
         private CCWin.SkinControl.SkinLabel m_writeDAK;
         private CCWin.SkinControl.SkinLabel DAKCount;
         private CCWin.SkinControl.SkinCheckBox WriteDAK;
+        private CCWin.SkinControl.SkinLabel m_readKFP;
+        private CCWin.SkinControl.SkinLabel m_checkKFP;
+        private CCWin.SkinControl.SkinLabel m_writeKFP;
+        private CCWin.SkinControl.SkinLabel KFPCount;
+        private CCWin.SkinControl.SkinCheckBox WriteKFP;
     }
 }

FactoryTool_CShare/Views/OperationPanel.cs

@@ -238,6 +238,8 @@ namespace MOKA_Factory_Tools
                 SetspecificText(m_checkFVP, LResource.Skip, Color.Yellow);
             if (!cfg_writecheck.DAKCheckcheck)
                 SetspecificText(m_checkDAK, LResource.Skip, Color.Yellow);
+            if (!cfg_writecheck.KFPCheckcheck)
+                SetspecificText(m_checkKFP, LResource.Skip, Color.Yellow);
             #endregion
             #region 设置ReadCheck复选框默认状态
             /////////////////////////////////////////////////////////////////
@@ -297,6 +299,8 @@ namespace MOKA_Factory_Tools
                 SetspecificText(m_readFVP, LResource.SkipChecking, Color.Yellow);
             if (!cfg_readcheck.DAKReadcheck)
                 SetspecificText(m_readDAK, LResource.SkipChecking, Color.Yellow);
+            if (!cfg_readcheck.KFPReadcheck)
+                SetspecificText(m_readKFP, LResource.SkipChecking, Color.Yellow);
             #endregion
             #region 设置WriteDone复选框默认状态
             /////////////////////////////////////////////////////////////////
@@ -354,6 +358,8 @@ namespace MOKA_Factory_Tools
                 SetspecificText(m_writeFVP, LResource.Skip, Color.Yellow);
             if (!cfg_writedone.DAKWrite_YesNo)
                 SetspecificText(m_writeDAK, LResource.Skip, Color.Yellow);
+            if (!cfg_writedone.KFPWrite_YesNo)
+                SetspecificText(m_writeKFP, LResource.Skip, Color.Yellow);
             if (FunctionSettingNow.WriteChannel)
                 ChannelText.Text = FunctionSettingNow.ChannelList;
             else
@@ -911,6 +917,7 @@ namespace MOKA_Factory_Tools
                         //keyInfo.ACASKey_Tool.data = GetJsonValue(jObject["acaskey_tool"]);
                         keyInfo.DAK.data = GetJsonValue(jObject["dak"]);
                         keyInfo.FVP.data = GetJsonValue(jObject["FVP"]);
+                        keyInfo.KFP.data = GetJsonValue(jObject["kfp"]);
 
                         WriteDID.Checked = (keyInfo.DID.Length > 0 && m_writedid.Text != LResource.Skip);
                         if (WriteDID.Checked)
@@ -972,9 +979,11 @@ 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);
+                        WriteKFP.Checked = (keyInfo.KFP.Length > 0 && m_writeKFP.Text != LResource.Skip);
+                        if ( WriteKFP.Checked)
+                            Log.WriteGetKeyLog("\r\nLocal DB KFP=" + keyInfo.KFP.data);
                         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();
@@ -1306,6 +1315,11 @@ namespace MOKA_Factory_Tools
                 m_writeEDIDName.Text = "Null";
                 m_writeEDIDName.BackColor = Color.Transparent;
             }
+            if (m_writeKFP.Text != LResource.Skip)
+            {
+                m_writeKFP.Text = "Null";
+                m_writeKFP.BackColor = Color.Transparent;
+            }
             #endregion
             /////////////////////////////////////////////////////////////
             #region Write Check;
@@ -1414,6 +1428,11 @@ namespace MOKA_Factory_Tools
                 m_checkACASKey.Text = "Null";
                 m_checkACASKey.BackColor = Color.Transparent;
             }
+            if (m_checkKFP.Text != LResource.Skip)
+            {
+                m_checkKFP.Text = "Null";
+                m_checkKFP.BackColor = Color.Transparent;
+            }
             #endregion
             /////////////////////////////////////////////////////////////
             #region  Read Check;
@@ -1542,6 +1561,11 @@ namespace MOKA_Factory_Tools
                 m_readACASKey.Text = "Null";
                 m_readACASKey.BackColor = Color.Transparent;
             }
+            if (m_readKFP.Text != LResource.Skip)
+            {
+                m_readKFP.Text = "Null";
+                m_readKFP.BackColor = Color.Transparent;
+            }
             #endregion
 
             ResultStatus.Text = "Wait";
@@ -1642,8 +1666,8 @@ namespace MOKA_Factory_Tools
             if (WriteEDIDName.Checked)
                 reportdata += "EDIDModeName=" + keyInfo.EDIDModelName.data + "&";
 
-            //if (WriteACASKey.Checked)
-            //    reportdata += "acas_tool=" + keyInfo.ACASKey_Tool.data + "&";
+            if (WriteKFP.Checked)
+                reportdata += "KFP_KEY=" + keyInfo.KFP.data + "&";
 
             if (WriteACASKey.Checked)
                 reportdata += "acas_data=" + keyInfo.ACASKey_Data.data + "&";
@@ -3514,6 +3538,75 @@ namespace MOKA_Factory_Tools
                 keyInfo.Playready.result = true;
             }
 
+            // KFP抄写;
+            if (WriteKFP.Checked)
+            {
+                if (!CommonMethod.IsNumberAndWord(keyInfo.KFP.data))
+                {
+                    ErrMsg = string.Format("KFP format error!\r\n{0}", keyInfo.KFP.data);
+                    Log.WriteErrorLog(ErrMsg);
+                    goto end;
+                }
+                byte[] KFPData = SerialInit.HexToByte(keyInfo.KFP.data);
+                Log.WriteInfoLog("Write KFP...");
+                if (SerialCMD.SetKFPKey(TVPort, KFPData, out result, out data, out error, SerailDelay))
+                {
+                    SetsuccessStatus(m_writeKFP);
+                    Log.WriteInfoLog("Check KFP...");
+                    if (cfg_writecheck.KFPCheckcheck ? SerialCMD.CheckKFPKey(TVPort, out result, out data, out error, SerailDelay) : true)
+                    {
+                        SetsuccessStatus(m_checkKFP);
+                        Log.WriteInfoLog("Read KFP...");
+                        if (cfg_readcheck.KFPReadcheck ? SerialCMD.ReadKFPKey(TVPort, out result, out data, out error, SerailDelay) : true)
+                        {
+                            if (cfg_readcheck.KFPReadcheck)
+                            {
+                                if (CommonMethod.CompareMD5(KFPData, data))
+                                {
+                                    SetsuccessStatus(m_readKFP);
+                                }
+                                else
+                                {
+                                    if (SerialInit.BytesCompare_Base64(data, KFPData))
+                                    {
+                                        SetsuccessStatus(m_readKFP);
+                                    }
+                                    else
+                                    {
+                                        SetfailStatus(m_readKFP);
+                                        ErrMsg = string.Format("{0}  contrast KFP fail!", SN);
+                                        Log.WriteErrorLog(ErrMsg);
+                                        goto end;
+                                    }
+                                }
+                            }
+                        }
+                        else
+                        {
+                            SetfailStatus(m_readKFP);
+                            ErrMsg = string.Format("{0}  read KFP fail!", SN);
+                            Log.WriteErrorLog(ErrMsg);
+                            goto end;
+                        }
+                    }
+                    else
+                    {
+                        SetfailStatus(m_checkKFP);
+                        ErrMsg = string.Format("{0}  check KFP fail!", SN);
+                        Log.WriteErrorLog(ErrMsg);
+                        goto end;
+                    }
+                }
+                else
+                {
+                    SetfailStatus(m_writeKFP);
+                    ErrMsg = string.Format("{0}  Write KFP fail!", SN);
+                    Log.WriteErrorLog(ErrMsg);
+                    goto end;
+                }
+
+                keyInfo.KFP.result = true;
+            }
 
 #region FVP激活-放在Hash key抄写之后，应用于所有FireTV项目-已通过郁沛确认;
             if (WriteFVP.Checked)