Browse Source

完成Kayla功能,待验证。

Wang Jeff 3 years ago
parent
commit
6b9eaa208a
1 changed files with 128 additions and 1 deletions
  1. 128 1
      FactoryTool_CShare/Business/CommonMethod.cs

+ 128 - 1
FactoryTool_CShare/Business/CommonMethod.cs

@@ -2438,7 +2438,12 @@ namespace MOKA_Factory_Tools
                 returnObject = returnObject.Remove(returnObject.Length - 1, 1);
                 returnObject = returnObject.Remove(returnObject.Length - 1, 1);
 
 
                 JObject jObject = JObject.Parse(returnObject);
                 JObject jObject = JObject.Parse(returnObject);
-                JSON_SeleteNode(jObject, "Hightpot");
+                string hightpot = JSON_SeleteNode(jObject, "Hightpot");
+                int pos = hightpot.LastIndexOf('/');
+                hightpot = hightpot.Substring(pos);
+                pos = hightpot.IndexOf("mA");
+                dic.Add("AC_I", hightpot.Substring(0, pos + 2));
+                dic.Add("DC_R", hightpot.Substring(pos + 2));
             }
             }
             else
             else
             {
             {
@@ -2448,7 +2453,125 @@ namespace MOKA_Factory_Tools
 
 
             if ( key != null )
             if ( key != null )
             {
             {
+                if (key.DID.enable)
+                {
+                    dic.Add("DID", key.DID.result ? "PASS":"FAIL");
+                    dic.Add("DID_check", key.DID.result ? "PASS" : "FAIL");
+                }
+
+                if (key.Mac.enable)
+                {
+                    dic.Add("Mac", key.Mac);
+                    dic.Add("Mac_check", key.Mac.result ? "PASS" : "FAIL");
+                }
+
+                if (key.HDCP.enable)
+                {
+                    dic.Add("HDCP", key.HDCP.result ? "PASS" : "FAIL");
+                    dic.Add("HDCP_check", key.HDCP.result ? "PASS" : "FAIL");
+                }
+
+                if (key.HDCP22.enable)
+                {
+                    dic.Add("HDCP22", key.HDCP22.result ? "PASS" : "FAIL");
+                    dic.Add("HDCP22_check", key.HDCP22.result ? "PASS" : "FAIL");
+                }
+
+                if (key.ESN.enable)
+                {
+                    dic.Add("ESN", key.ESN.result ? "PASS" : "FAIL");
+                    dic.Add("ESN_check", key.ESN.result ? "PASS" : "FAIL");
+                }
+
+                if (key.WiDi.enable)
+                {
+                    dic.Add("WiDi", key.WiDi.result ? "PASS" : "FAIL");
+                    dic.Add("WiDi_check", key.WiDi.result ? "PASS" : "FAIL");
+                }
+
+                if (key.Widevine.enable)
+                {
+                    dic.Add("Widevine", key.Widevine.result ? "PASS" : "FAIL");
+                    dic.Add("Widevine_check", key.Widevine.result ? "PASS" : "FAIL");
+                }
+
+                if (key.CI_plus.enable)
+                {
+                    dic.Add("CI_plus", key.CI_plus.result ? "PASS" : "FAIL");
+                    dic.Add("CI_plus_check", key.CI_plus.result ? "PASS" : "FAIL");
+                }
 
 
+                if (key.Attestation.enable)
+                {
+                    dic.Add("Attestation", key.Attestation.result ? "PASS" : "FAIL");
+                    dic.Add("Attestation_check", key.Attestation.result ? "PASS" : "FAIL");
+                }
+
+                if (key.MGK.enable)
+                {
+                    dic.Add("MGK", key.MGK.result ? "PASS" : "FAIL");
+                    dic.Add("MGK_check", key.MGK.result ? "PASS" : "FAIL");
+                }
+
+                if (key.Fairplay.enable)
+                {
+                    dic.Add("Fairplay", key.Fairplay.result ? "PASS" : "FAIL");
+                    dic.Add("Fairplay_check", key.Fairplay.result ? "PASS" : "FAIL");
+                }
+
+                if (key.DSN.enable)
+                {
+                    dic.Add("DSN", key.DSN.result ? "PASS" : "FAIL");
+                    dic.Add("DSN_check", key.DSN.result ? "PASS" : "FAIL");
+                }
+
+                if (key.WiFi_MAC.enable)
+                {
+                    dic.Add("WiFi_MAC", key.WiFi_MAC);
+                    dic.Add("WiFi_MAC_check", key.WiFi_MAC.result ? "PASS" : "FAIL");
+                }
+
+                if (key.BT_MAC.enable)
+                {
+                    dic.Add("BT_MAC", key.BT_MAC);
+                    dic.Add("BT_MAC_check", key.BT_MAC.result ? "PASS" : "FAIL");
+                }
+
+                if (key.LEK.enable)
+                {
+                    dic.Add("LEK", key.LEK.result ? "PASS" : "FAIL");
+                    dic.Add("LEK_check", key.LEK.result ? "PASS" : "FAIL");
+                }
+
+                if (key.PEK.enable)
+                {
+                    dic.Add("PEK", key.PEK.result ? "PASS" : "FAIL");
+                    dic.Add("PEK_check", key.PEK.result ? "PASS" : "FAIL");
+                }
+
+                if (key.Playready.enable)
+                {
+                    dic.Add("Playready", key.Playready.result ? "PASS" : "FAIL");
+                    dic.Add("Playready_check", key.Playready.result ? "PASS" : "FAIL");
+                }
+
+                if (key.Hashkey.enable)
+                {
+                    dic.Add("Hashkey", key.Hashkey.result ? "PASS" : "FAIL");
+                    dic.Add("Hashkey_check", key.Hashkey.result ? "PASS" : "FAIL");
+                }
+
+                if (key.ECP.enable)
+                {
+                    dic.Add("ECP", key.ECP.result ? "PASS" : "FAIL");
+                    dic.Add("ECP_check", key.ECP.result ? "PASS" : "FAIL");
+                }
+
+                if (key.YouTube_KEY.enable)
+                {
+                    dic.Add("YouTube_KEY", key.YouTube_KEY.result ? "PASS" : "FAIL");
+                    dic.Add("YouTube_KEY_check", key.YouTube_KEY.result ? "PASS" : "FAIL");
+                }          
             }
             }
 
 
             dic.Add("cycle_time_I", EndOfTime.Subtract(StartTime).Seconds.ToString());
             dic.Add("cycle_time_I", EndOfTime.Subtract(StartTime).Seconds.ToString());
@@ -2457,6 +2580,10 @@ namespace MOKA_Factory_Tools
             try
             try
             {
             {
                 // 以DSN命名文件;
                 // 以DSN命名文件;
+                if (!Directory.Exists(AppDomain.CurrentDomain.BaseDirectory+ @"\Kayla"))
+                {
+                    Directory.CreateDirectory(AppDomain.CurrentDomain.BaseDirectory + @"\Kayla");
+                }
                 string savefile = string.Format("{0}\\{1}\\{2}.csv", AppDomain.CurrentDomain.BaseDirectory, "Kayla", key.DSN);
                 string savefile = string.Format("{0}\\{1}\\{2}.csv", AppDomain.CurrentDomain.BaseDirectory, "Kayla", key.DSN);
                 using (System.IO.StreamWriter file = new System.IO.StreamWriter(savefile, false))
                 using (System.IO.StreamWriter file = new System.IO.StreamWriter(savefile, false))
                 {
                 {