移除不使用的Widi，以及KeyData新增构造函数。

FactoryTool_CShare/Business/CommonMethod.cs

@@ -1016,7 +1016,7 @@ end:
             error = "";
             try
             {
-                DBKeysStringFormat DBKeysStringFormat1 = new DBKeysStringFormat { cikey = keyInfo.CI_plus == null ? "" : keyInfo.CI_plus, esn = keyInfo.ESN == null ? "" : keyInfo.ESN, hdcp = keyInfo.HDCP == null ? "" : keyInfo.HDCP, widevine = keyInfo.Widevine == null ? "" : keyInfo.Widevine, hdcp22 = keyInfo.HDCP22 == null ? "" : keyInfo.HDCP22, did = keyInfo.DID == null ? "" : keyInfo.DID, mac = keyInfo.Mac == null ? "" : keyInfo.Mac, widi = keyInfo.WiDi == null ? "" : keyInfo.WiDi, attestation = keyInfo.Attestation == null ? "" : keyInfo.Attestation, mgk = keyInfo.MGK == null ? "" : keyInfo.MGK };
+                DBKeysStringFormat DBKeysStringFormat1 = new DBKeysStringFormat { cikey = keyInfo.CI_plus == null ? "" : keyInfo.CI_plus, esn = keyInfo.ESN == null ? "" : keyInfo.ESN, hdcp = keyInfo.HDCP == null ? "" : keyInfo.HDCP, widevine = keyInfo.Widevine == null ? "" : keyInfo.Widevine, hdcp22 = keyInfo.HDCP22 == null ? "" : keyInfo.HDCP22, did = keyInfo.DID == null ? "" : keyInfo.DID, mac = keyInfo.Mac == null ? "" : keyInfo.Mac, attestation = keyInfo.Attestation == null ? "" : keyInfo.Attestation, mgk = keyInfo.MGK == null ? "" : keyInfo.MGK };
                 keydata = Newtonsoft.Json.JsonConvert.SerializeObject(DBKeysStringFormat1, Newtonsoft.Json.Formatting.Indented);
                 return true;
             }
@@ -2290,12 +2290,6 @@ end:
                     dic.Add("ESN_check", key.ESN.result ? "PASS" : "FAIL");
                 }
 
-                if (key.WiDi.enable)
-                {
-                    dic.Add("WiDi", key.WiDi);
-                    dic.Add("WiDi_check", key.WiDi.result ? "PASS" : "FAIL");
-                }
-
                 if (key.Widevine.enable)
                 {
                     dic.Add("Widevine", key.Widevine);

FactoryTool_CShare/Models/StructList.cs

@@ -115,7 +115,7 @@ namespace MOKA_Factory_Tools
         public string hdcp22 { get; set; }
         public string did { get; set; }
         public string mac { get; set; }
-        public string widi { get; set; }
+        //public string widi { get; set; }
         public string mgk { get; set; }
         public string attestation { get; set; }
     }
@@ -248,8 +248,18 @@ namespace MOKA_Factory_Tools
         public bool LeaveFactory { get; set; } = false;
     }
 
+    public enum KEY_FROM
+    {
+        FROM_IDM = 0,
+        FROM_MES = 1,
+    }
+
     public class KeyData
     {
+        public KeyData(string n="") {
+            name = n;
+        }
+
         // 要抄写的Key的名称;
         public string name { get; set; }
         // 是否要抄写该Key;
@@ -262,6 +272,8 @@ namespace MOKA_Factory_Tools
         public bool result { get; set; } = false; 
         // 抄写结果描述;
         public string msg { get; set; }
+        // key的来源;
+        public KEY_FROM keyfrom { get; set; } = KEY_FROM.FROM_IDM;
         // 要抄写的Key数据长度;
         public int Length
         {
@@ -280,34 +292,34 @@ namespace MOKA_Factory_Tools
 
     public class KeyInfo
     {
-        public KeyData DID = new KeyData();
-        public KeyData Mac = new KeyData();
-        public KeyData HDCP = new KeyData();
-        public KeyData HDCP22 = new KeyData();
-        public KeyData ESN = new KeyData();
-        public KeyData WiDi = new KeyData();
-        public KeyData Widevine = new KeyData();
-        public KeyData CI_plus = new KeyData();
-        public KeyData Attestation = new KeyData();
-        public KeyData AttestationMD5 = new KeyData();
-        public KeyData MGK = new KeyData();
-        public KeyData Fairplay = new KeyData();
-        public KeyData DSN = new KeyData();
-        public KeyData WiFi_MAC = new KeyData();
-        public KeyData BT_MAC = new KeyData();
-        public KeyData LEK = new KeyData();
-        public KeyData PEK = new KeyData();
-        public KeyData Playready = new KeyData();
-        public KeyData Hashkey = new KeyData();
-        public KeyData ECP = new KeyData();
-        public KeyData YouTube_KEY = new KeyData();
+        public KeyData DID = new KeyData("deviceid");
+        public KeyData Mac = new KeyData("mac");
+        public KeyData HDCP = new KeyData("hdcp");
+        public KeyData HDCP22 = new KeyData("hdcp2");
+        public KeyData ESN = new KeyData("netfilx");
+        //public KeyData WiDi = new KeyData();
+        public KeyData Widevine = new KeyData("widevine");
+        public KeyData CI_plus = new KeyData("ci");
+        public KeyData Attestation = new KeyData("attention");
+       // public KeyData AttestationMD5 = new KeyData();
+        public KeyData MGK = new KeyData("mgk");
+        public KeyData Fairplay = new KeyData("fairplay");
+        public KeyData DSN = new KeyData("dsn");
+        public KeyData WiFi_MAC = new KeyData("wifiMac");
+        public KeyData BT_MAC = new KeyData("btMac");
+        public KeyData LEK = new KeyData("lek");
+        public KeyData PEK = new KeyData("pek");
+        public KeyData Playready = new KeyData("playready");
+        public KeyData Hashkey = new KeyData("hash");
+        public KeyData ECP = new KeyData("ecp");
+        public KeyData YouTube_KEY = new KeyData("youtube");
         public KeyData EDIDPid = new KeyData();
         public KeyData EDIDModelName = new KeyData();
-        public KeyData ACASKey_Data = new KeyData();
-        public KeyData ACASKey_Tool = new KeyData();
-        public KeyData ACASKey_DataMd5 = new KeyData();
-        public KeyData ACASKey_ToolMd5 = new KeyData();
-        public KeyData DAK = new KeyData();
+        public KeyData ACASKey_Data = new KeyData("acas");
+        //public KeyData ACASKey_Tool = new KeyData();
+        //public KeyData ACASKey_DataMd5 = new KeyData();
+        //public KeyData ACASKey_ToolMd5 = new KeyData();
+        public KeyData DAK = new KeyData("dak");
         public KeyData FVP = new KeyData();
         #region Kayla所需数据;
         public KeyData _PSN = new KeyData();

FactoryTool_CShare/Views/OperationPanel.cs

@@ -871,7 +871,7 @@ namespace MOKA_Factory_Tools
                         keyInfo.Mac.data = GetJsonValue(jObject["mac"]);
                         keyInfo.HDCP.data = GetJsonValue(jObject["hdcp"]);
                         keyInfo.HDCP22.data = GetJsonValue(jObject["hdcp22"]);
-                        keyInfo.WiDi.data = GetJsonValue(jObject["widi"]);
+                        //keyInfo.WiDi.data = GetJsonValue(jObject["widi"]);
                         keyInfo.Widevine.data = GetJsonValue(jObject["widevine"]);
                         keyInfo.ESN.data = GetJsonValue(jObject["esn"]);
                         keyInfo.CI_plus.data = GetJsonValue(jObject["cikey"]);
@@ -887,7 +887,7 @@ namespace MOKA_Factory_Tools
                         keyInfo.Hashkey.data = GetJsonValue(jObject["hash"]);
                         keyInfo.YouTube_KEY.data = GetJsonValue(jObject["youtubekey"]);
                         keyInfo.ACASKey_Data.data = GetJsonValue(jObject["acaskey_data"]);
-                        keyInfo.ACASKey_Tool.data = GetJsonValue(jObject["acaskey_tool"]);
+                        //keyInfo.ACASKey_Tool.data = GetJsonValue(jObject["acaskey_tool"]);
                         keyInfo.DAK.data = GetJsonValue(jObject["dak"]);
                         keyInfo.FVP.data = GetJsonValue(jObject["FVP"]);