移除widi相关code，此key从未使用。

FactoryTool_CShare/Models/StructList.cs

@@ -339,7 +339,6 @@ namespace MOKA_Factory_Tools
         public bool HDCPReadcheck { get; set; }
         public bool HDCP22Readcheck { get; set; }
         public bool ESNReadcheck { get; set; }
-        public bool WiDiReadcheck { get; set; }
         public bool WidevineReadcheck { get; set; }
         public bool CI_plusReadcheck { get; set; }
         public bool AttestationReadcheck { get; set; }
@@ -370,7 +369,6 @@ namespace MOKA_Factory_Tools
         public bool HDCPCheckcheck { get; set; }
         public bool HDCP22Checkcheck { get; set; }
         public bool ESNCheckcheck { get; set; }
-        public bool WiDiCheckcheck { get; set; }
         public bool WidevineCheckcheck { get; set; }
         public bool CI_plusCheckcheck { get; set; }
         public bool AttestationCheckcheck { get; set; }
@@ -401,12 +399,16 @@ namespace MOKA_Factory_Tools
         public bool SHOPWrite_YesNo { get; set; }
         public bool ClientTypeCheck_YesNo { get; set; }
         public bool SoftwareVersionCheck_YesNo { get; set; }
+        public bool EDIDPIDWrite_YesNo { get; set; }
+        public bool EDIDModeNameWrite_YesNo { get; set; }
+        public bool FVPWrite_YesNo { get; set; }
+	public bool DolbyWrite_YesNo { get;set; }
+        #region getmessage接口对应需要在线获取的key类型;
         public bool DIDWrite_YesNo { get; set; }
         public bool MacWrite_YesNo { get; set; }
         public bool HDCPWrite_YesNo { get; set; }
         public bool HDCP22Write_YesNo { get; set; }
-        public bool ESNWrite_YesNo { get; set; }
-        public bool WiDiWrite_YesNo { get; set; }
+        public bool ESNWrite_YesNo { get; set; }        
         public bool WidevineWrite_YesNo { get; set; }
         public bool CI_plusWrite_YesNo { get; set; }
         public bool AttestationWrite_YesNo { get; set; }
@@ -420,13 +422,10 @@ namespace MOKA_Factory_Tools
         public bool PlayreadyWrite_YesNo { get; set; }
         public bool HashWrite_YesNo { get; set; }
         public bool DSNWrite_YesNo { get; set; }
-        public bool YouTubeWrite_YesNo { get; set; }
-        public bool EDIDPIDWrite_YesNo { get; set; }
-        public bool EDIDModeNameWrite_YesNo { get; set; }
+        public bool YouTubeWrite_YesNo { get; set; }       
         public bool ACASKeyWrite_YesNo { get; set; }
-        public bool FVPWrite_YesNo { get; set; }
         public bool DAKWrite_YesNo { get; set; }
-        public bool DolbyWrite_YesNo { get;set; }
+        #endregion
     }
 
     public class ErrorInfo

FactoryTool_CShare/Views/Main.cs

@@ -897,7 +897,6 @@ namespace MOKA_Factory_Tools
                 cfg_readcheck.MacReadcheck = jObject["ReadCheck"]["MAC"].Value<bool>();
                 cfg_readcheck.HDCPReadcheck = jObject["ReadCheck"]["HDCP"].Value<bool>();
                 cfg_readcheck.HDCP22Readcheck = jObject["ReadCheck"]["HDCP22"].Value<bool>();
-                cfg_readcheck.WiDiReadcheck = jObject["ReadCheck"]["WIDI"].Value<bool>();
                 cfg_readcheck.WidevineReadcheck = jObject["ReadCheck"]["WIDEVINE"].Value<bool>();
                 cfg_readcheck.ESNReadcheck = jObject["ReadCheck"]["ESN"].Value<bool>();
                 cfg_readcheck.CI_plusReadcheck = jObject["ReadCheck"]["CI"].Value<bool>();
@@ -926,7 +925,6 @@ namespace MOKA_Factory_Tools
                 cfg_writecheck.MacCheckcheck = jObject["WriteCheck"]["MAC"].Value<bool>();
                 cfg_writecheck.HDCPCheckcheck = jObject["WriteCheck"]["HDCP"].Value<bool>();
                 cfg_writecheck.HDCP22Checkcheck = jObject["WriteCheck"]["HDCP22"].Value<bool>();
-                cfg_writecheck.WiDiCheckcheck = jObject["WriteCheck"]["WIDI"].Value<bool>();
                 cfg_writecheck.WidevineCheckcheck = jObject["WriteCheck"]["WIDEVINE"].Value<bool>();
                 cfg_writecheck.ESNCheckcheck = jObject["WriteCheck"]["ESN"].Value<bool>();
                 cfg_writecheck.CI_plusCheckcheck = jObject["WriteCheck"]["CI"].Value<bool>();
@@ -957,7 +955,6 @@ namespace MOKA_Factory_Tools
                 cfg_writedone.MacWrite_YesNo = jObject["WriteDone"]["MAC"].Value<bool>();
                 cfg_writedone.HDCPWrite_YesNo = jObject["WriteDone"]["HDCP"].Value<bool>();
                 cfg_writedone.HDCP22Write_YesNo = jObject["WriteDone"]["HDCP22"].Value<bool>();
-                cfg_writedone.WiDiWrite_YesNo = jObject["WriteDone"]["WIDI"].Value<bool>();
                 cfg_writedone.WidevineWrite_YesNo = jObject["WriteDone"]["WIDEVINE"].Value<bool>();
                 cfg_writedone.ESNWrite_YesNo = jObject["WriteDone"]["ESN"].Value<bool>();
                 cfg_writedone.CI_plusWrite_YesNo = jObject["WriteDone"]["CI"].Value<bool>();

FactoryTool_CShare/Views/OperationPanel.cs

@@ -206,8 +206,6 @@ namespace MOKA_Factory_Tools
                 SetspecificText(m_checkhdcp, LResource.Skip, Color.Yellow);
             if (!cfg_writecheck.HDCP22Checkcheck)
                 SetspecificText(m_checkhdcp22, LResource.Skip, Color.Yellow);
-            if (!cfg_writecheck.WiDiCheckcheck)
-                SetspecificText(m_checkwidi, LResource.Skip, Color.Yellow);
             if (!cfg_writecheck.WidevineCheckcheck)
                 SetspecificText(m_checkwidevine, LResource.Skip, Color.Yellow);
             if (!cfg_writecheck.ESNCheckcheck)
@@ -257,8 +255,6 @@ namespace MOKA_Factory_Tools
                 SetspecificText(m_readhdcp, LResource.Skip, Color.Yellow);
             if (!cfg_readcheck.HDCP22Readcheck)
                 SetspecificText(m_readhdcp22, LResource.Skip, Color.Yellow);
-            if (!cfg_readcheck.WiDiReadcheck)
-                SetspecificText(m_readwidi, LResource.Skip, Color.Yellow);
             if (!cfg_readcheck.WidevineReadcheck)
                 SetspecificText(m_readwidevine, LResource.Skip, Color.Yellow);
             if (!cfg_readcheck.ESNReadcheck)
@@ -322,8 +318,6 @@ namespace MOKA_Factory_Tools
                 SetspecificText(m_writehdcp, LResource.Skip, Color.Yellow);
             if (!cfg_writedone.HDCP22Write_YesNo)
                 SetspecificText(m_writehdcp22, LResource.Skip, Color.Yellow);
-            if (!cfg_writedone.WiDiWrite_YesNo)
-                SetspecificText(m_writewidi, LResource.Skip, Color.Yellow);
             if (!cfg_writedone.WidevineWrite_YesNo)
                 SetspecificText(m_writewidevine, LResource.Skip, Color.Yellow);
             if (!cfg_writedone.ESNWrite_YesNo)
@@ -900,9 +894,6 @@ namespace MOKA_Factory_Tools
                         WriteHDCP22.Checked = (keyInfo.HDCP22.Length > 0 && m_writehdcp22.Text != LResource.Skip);
                         if (WriteHDCP22.Checked)
                             Log.WriteGetKeyLog("\r\nLocal DB HDCP22=" + keyInfo.HDCP22.data);
-                        WriteWiDi.Checked = (keyInfo.WiDi.Length > 0 && m_writewidi.Text != LResource.Skip);
-                        if (WriteWiDi.Checked)
-                            Log.WriteGetKeyLog("\r\nLocal DB WiDi=" + keyInfo.WiDi.data);
                         WriteWidevine.Checked = (keyInfo.Widevine.Length > 0 && m_writewidevine.Text != LResource.Skip);
                         if (WriteWidevine.Checked)
                             Log.WriteGetKeyLog("\r\nLocal DB Widevine=" + keyInfo.Widevine.data);
@@ -1185,11 +1176,6 @@ namespace MOKA_Factory_Tools
                 m_writeesn.Text = "Null";
                 m_writeesn.BackColor = Color.Transparent;
             }
-            if (m_writewidi.Text != LResource.Skip)
-            {
-                m_writewidi.Text = "Null";
-                m_writewidi.BackColor = Color.Transparent;
-            }
             if (m_writewidevine.Text != LResource.Skip)
             {
                 m_writewidevine.Text = "Null";
@@ -1313,11 +1299,6 @@ namespace MOKA_Factory_Tools
                 m_checkesn.Text = "Null";
                 m_checkesn.BackColor = Color.Transparent;
             }
-            if (m_checkwidi.Text != LResource.Skip)
-            {
-                m_checkwidi.Text = "Null";
-                m_checkwidi.BackColor = Color.Transparent;
-            }
             if (m_checkwidevine.Text != LResource.Skip)
             {
                 m_checkwidevine.Text = "Null";
@@ -1426,11 +1407,6 @@ namespace MOKA_Factory_Tools
                 m_readesn.Text = "Null";
                 m_readesn.BackColor = Color.Transparent;
             }
-            if (m_readwidi.Text != LResource.Skip)
-            {
-                m_readwidi.Text = "Null";
-                m_readwidi.BackColor = Color.Transparent;
-            }
             if (m_readwidevine.Text != LResource.Skip)
             {
                 m_readwidevine.Text = "Null";
@@ -1597,9 +1573,6 @@ namespace MOKA_Factory_Tools
             if (WriteESN.Checked)
                 reportdata += "netfilxesn=" + keyInfo.ESN.data + "&";
 
-            if (WriteWiDi.Checked)
-                reportdata += "widi=" + keyInfo.WiDi.data + "&";
-
             if (WritePEK.Checked)
                 reportdata += "pek=" + keyInfo.PEK.data + "&";
 
@@ -1813,7 +1786,6 @@ namespace MOKA_Factory_Tools
                 string Hdcp22path = "";
                 string Esnpath = "";
                 string MGKpath = "";
-                string Widipath = "";
                 string Widevinepath = "";
                 string Cipath = "";
                 string Attestationpath = "";
@@ -1964,26 +1936,6 @@ namespace MOKA_Factory_Tools
                         goto end;
                     }
                 }
-                if (WriteWiDi.Checked)
-                {
-                    if (GetLocalKeyCount.GetLocalHexKeys(orderNow, "WiDi", FunctionSettingNow.LocalWidiSize, out FileStream Stream, out BinaryReader Reader, out string widi, out Widipath, out error, errorDBNow, ref localmidList, SN))
-                    {
-                        keyInfo.WiDi.data = widi;
-                        Log.WriteGetKeyLog("\r\nLocal WiDi=" + keyInfo.WiDi);
-                        if (Stream != null && Reader != null)
-                        {
-                            keypath.Add(Widipath);
-                            keyStream.Add(Stream);
-                            keyReader.Add(Reader);
-                        }
-                    }
-                    else
-                    {
-                        ErrMsg = String.Format("{0}\r\n{1}", LResource.GetWiDiError, error);
-                        Log.WriteErrorLog(ErrMsg);
-                        goto end;
-                    }
-                }
                 if (WriteWidevine.Checked)
                 {
                     if (GetLocalKeyCount.GetLocalHexKeys(orderNow, "Widevine", FunctionSettingNow.LocalWidevineSize, out FileStream Stream, out BinaryReader Reader, out string widevine, out Widevinepath, out error, errorDBNow, ref localmidList, SN))
@@ -3209,70 +3161,6 @@ namespace MOKA_Factory_Tools
                 }
             }
 
-            //WiDi KEY抄写
-            if (WriteWiDi.Checked)
-            {
-                if (!CommonMethod.IsNumberAndWord(keyInfo.WiDi.data))
-                {
-                    ErrMsg = string.Format("WiDi format error!\r\n{0}", keyInfo.WiDi.data);
-                    Log.WriteErrorLog(ErrMsg);
-                    goto end;
-                }
-
-                byte[] WiDiData = SerialInit.HexToByte(keyInfo.WiDi.data);
-                Log.WriteInfoLog("Write WiDi...");
-                if (SerialCMD.SetWidi(TVPort, WiDiData, out result, out data, out error, SerailDelay))
-                {
-                    SetsuccessStatus(m_writewidi);
-                    Log.WriteInfoLog("Check WiDi...");
-                    if (cfg_writecheck.WiDiCheckcheck ? SerialCMD.CheckWidi(TVPort, out result, out data, out error, SerailDelay) : true)
-                    {
-                        SetsuccessStatus(m_checkwidi);
-                        Log.WriteInfoLog("Read WiDi...");
-                        if (cfg_readcheck.WiDiReadcheck ? SerialCMD.GetWidi(TVPort, out result, out data, out error, SerailDelay) : true)
-                        {
-                            if (cfg_readcheck.WiDiReadcheck)
-                            {
-                                if (SerialInit.BytesCompare_Base64(data, WiDiData))
-                                {
-                                    SetsuccessStatus(m_readwidi);
-                                }
-                                else
-                                {
-                                    SetfailStatus(m_readwidi);
-                                    ErrMsg = string.Format("{0}  contrast WiDi fail!", SN);
-                                    Log.WriteErrorLog(ErrMsg);
-                                    goto end;
-                                }
-                            }
-                        }
-                        else
-                        {
-                            SetfailStatus(m_readwidi);
-                            ErrMsg = string.Format("{0}  read WiDi fail!", SN);
-                            Log.WriteErrorLog(ErrMsg);
-                            goto end;
-                        }
-                    }
-                    else
-                    {
-                        SetfailStatus(m_checkwidi);
-                        ErrMsg = string.Format("{0}  check WiDi fail!", SN);
-                        Log.WriteErrorLog(ErrMsg);
-                        goto end;
-                    }
-                }
-                else
-                {
-                    SetfailStatus(m_writewidi);
-                    ErrMsg = string.Format("{0}  Write WiDi fail!", SN);
-                    Log.WriteErrorLog(ErrMsg);
-                    goto end;
-                }
-
-                keyInfo.WiDi.result = true;
-            }
-
             //Youtube key抄写
             if (WriteYouTube.Checked)
             {
@@ -5349,12 +5237,6 @@ namespace MOKA_Factory_Tools
                     SetCheckboxStatus(WriteCiplus, true);
                 UpdateKeyCount("CI_PLUS_KEY", keys["CI_PLUS_KEY"], autokey);
             }
-            if (keys.ContainsKey("WiDi"))
-            {
-                if (cfg_writedone.WiDiWrite_YesNo)
-                    SetCheckboxStatus(WriteWiDi, true);
-                UpdateKeyCount("WiDi", keys["WiDi"], autokey);
-            }
             if (keys.ContainsKey("Widevine_KEY"))
             {
                 if (cfg_writedone.WidevineWrite_YesNo)
@@ -6417,7 +6299,6 @@ namespace MOKA_Factory_Tools
             keyInfo.Mac.enable = WriteMac.Checked = (WriteMac.Checked && m_writemac.Text != LResource.Skip);
             keyInfo.HDCP.enable = WriteHDCP.Checked = (WriteHDCP.Checked && m_writehdcp.Text != LResource.Skip);
             keyInfo.HDCP22.enable = WriteHDCP22.Checked = (WriteHDCP22.Checked && m_writehdcp22.Text != LResource.Skip);
-            keyInfo.WiDi.enable = WriteWiDi.Checked = (WriteWiDi.Checked && m_writewidi.Text != LResource.Skip);
             keyInfo.Widevine.enable = WriteWidevine.Checked = (WriteWidevine.Checked && m_writewidevine.Text != LResource.Skip);
             keyInfo.ESN.enable = WriteESN.Checked = (WriteESN.Checked && m_writeesn.Text != LResource.Skip);
             keyInfo.CI_plus.enable = WriteCiplus.Checked = (WriteCiplus.Checked && m_writeci.Text != LResource.Skip);
@@ -6506,15 +6387,6 @@ namespace MOKA_Factory_Tools
                 else
                     SetKeyCountStatus(HDCPCount, "Read error", 1);
             }
-            int widinum;
-            if (GetLocalKeyCount.GetLocalWiDiCount(orderNow, out widinum))
-            {
-                SetCheckboxStatus(WriteWiDi, true);
-                if (widinum != -1)
-                    SetKeyCountStatus(WidiCount, widinum.ToString(), 0);
-                else
-                    SetKeyCountStatus(WidiCount, "Read error", 1);
-            }
             int hdcp22num;
             if (GetLocalKeyCount.GetLocalHDCPKEY22Count(orderNow, out hdcp22num))
             {