修复函数内部逻辑问题。

FactoryTool_CShare/Business/CommonMethod.cs

@@ -281,8 +281,10 @@ namespace MOKA_Factory_Tools
                 {
                     mid.keytype.Add(ss["name"].Value<string>(), ss["type"].Value<string>());
                 }
+#if !DEBUG
                 if (url == Serverurl.Testurl)
                     mid.host = "http://test.idmanage.qhmoka.com/IDManage";
+#endif
                 if (mid.code == "1000")
                     return true;
                 else
@@ -543,110 +545,110 @@ namespace MOKA_Factory_Tools
 
                         if (data.ContainsKey("deviceid") && data.ContainsKey("deviceid_md5"))
                         {
-                            keys.WiFi_MAC.data = data["deviceid"];
-                            keys.WiFi_MAC.md5 = data["deviceid_md5"];
+                            keys.DID.data = data["deviceid"];
+                            keys.DID.md5 = data["deviceid_md5"];
                         }
 
                         if (data.ContainsKey("hdcp") && data.ContainsKey("hdcp_md5"))
                         {
-                            keys.WiFi_MAC.data = data["hdcp"];
-                            keys.WiFi_MAC.md5 = data["hdcp_md5"];
+                            keys.HDCP.data = data["hdcp"];
+                            keys.HDCP.md5 = data["hdcp_md5"];
                         }
 
                         if (data.ContainsKey("hdcp2") && data.ContainsKey("hdcp2_md5"))
                         {
-                            keys.WiFi_MAC.data = data["hdcp2"];
-                            keys.WiFi_MAC.md5 = data["hdcp2_md5"];
+                            keys.HDCP22.data = data["hdcp2"];
+                            keys.HDCP22.md5 = data["hdcp2_md5"];
                         }
 
                         if (data.ContainsKey("ci") && data.ContainsKey("ci_md5"))
                         {
-                            keys.WiFi_MAC.data = data["ci"];
-                            keys.WiFi_MAC.md5 = data["ci_md5"];
+                            keys.CI_plus.data = data["ci"];
+                            keys.CI_plus.md5 = data["ci_md5"];
                         }
 
                         if (data.ContainsKey("ecp") && data.ContainsKey("ecp_md5"))
                         {
-                            keys.WiFi_MAC.data = data["ecp"];
-                            keys.WiFi_MAC.md5 = data["ecp_md5"];
+                            keys.ECP.data = data["ecp"];
+                            keys.ECP.md5 = data["ecp_md5"];
                         }
 
                         if (data.ContainsKey("acas") && data.ContainsKey("acas_md5"))
                         {
-                            keys.WiFi_MAC.data = data["acas"];
-                            keys.WiFi_MAC.md5 = data["acas_md5"];
+                            keys.ACASKey_Data.data = data["acas"];
+                            keys.ACASKey_Data.md5 = data["acas_md5"];
                         }
 
                         if (data.ContainsKey("lek") && data.ContainsKey("lek_md5"))
                         {
-                            keys.WiFi_MAC.data = data["lek"];
-                            keys.WiFi_MAC.md5 = data["lek_md5"];
+                            keys.LEK.data = data["lek"];
+                            keys.LEK.md5 = data["lek_md5"];
                         }
 
                         if (data.ContainsKey("pek") && data.ContainsKey("pek_md5"))
                         {
-                            keys.WiFi_MAC.data = data["pek"];
-                            keys.WiFi_MAC.md5 = data["pek_md5"];
+                            keys.PEK.data = data["pek"];
+                            keys.PEK.md5 = data["pek_md5"];
                         }
 
                         if (data.ContainsKey("playready") && data.ContainsKey("playready_md5"))
                         {
-                            keys.WiFi_MAC.data = data["playready"];
-                            keys.WiFi_MAC.md5 = data["playready_md5"];
+                            keys.Playready.data = data["playready"];
+                            keys.Playready.md5 = data["playready_md5"];
                         }
 
                         if (data.ContainsKey("netfilx") && data.ContainsKey("netfilx_md5"))
                         {
-                            keys.WiFi_MAC.data = data["netfilx"];
-                            keys.WiFi_MAC.md5 = data["netfilx_md5"];
+                            keys.ESN.data = data["netfilx"];
+                            keys.ESN.md5 = data["netfilx_md5"];
                         }
 
                         if (data.ContainsKey("hash") && data.ContainsKey("hash_md5"))
                         {
-                            keys.WiFi_MAC.data = data["hash"];
-                            keys.WiFi_MAC.md5 = data["hash_md5"];
+                            keys.Hashkey.data = data["hash"];
+                            keys.Hashkey.md5 = data["hash_md5"];
                         }
 
                         if (data.ContainsKey("mgk") && data.ContainsKey("mgk_md5"))
                         {
-                            keys.WiFi_MAC.data = data["mgk"];
-                            keys.WiFi_MAC.md5 = data["mgk_md5"];
+                            keys.MGK.data = data["mgk"];
+                            keys.MGK.md5 = data["mgk_md5"];
                         }
 
                         if (data.ContainsKey("youtube") && data.ContainsKey("youtube_md5"))
                         {
-                            keys.WiFi_MAC.data = data["youtube"];
-                            keys.WiFi_MAC.md5 = data["youtube_md5"];
+                            keys.YouTube_KEY.data = data["youtube"];
+                            keys.YouTube_KEY.md5 = data["youtube_md5"];
                         }
 
                         if (data.ContainsKey("fairplay") && data.ContainsKey("fairplay_md5"))
                         {
-                            keys.WiFi_MAC.data = data["fairplay"];
-                            keys.WiFi_MAC.md5 = data["fairplay_md5"];
+                            keys.Fairplay.data = data["fairplay"];
+                            keys.Fairplay.md5 = data["fairplay_md5"];
                         }
 
                         if (data.ContainsKey("widevine") && data.ContainsKey("widevine_md5"))
                         {
-                            keys.WiFi_MAC.data = data["widevine"];
-                            keys.WiFi_MAC.md5 = data["widevine_md5"];
+                            keys.Widevine.data = data["widevine"];
+                            keys.Widevine.md5 = data["widevine_md5"];
                         }
 
                         if (data.ContainsKey("attention") && data.ContainsKey("attention_md5"))
                         {
-                            keys.WiFi_MAC.data = data["attention"];
-                            keys.WiFi_MAC.md5 = data["attention_md5"];
+                            keys.Attestation.data = data["attention"];
+                            keys.Attestation.md5 = data["attention_md5"];
                         }
 
                         if (data.ContainsKey("dsn") && data.ContainsKey("dsn_md5"))
                         {
-                            keys.WiFi_MAC.data = data["dsn"];
-                            keys.WiFi_MAC.md5 = data["dsn_md5"];
+                            keys.DSN.data = data["dsn"];
+                            keys.DSN.md5 = data["dsn_md5"];
                         }
 
                         if (data.ContainsKey("dak") && data.ContainsKey("dak_md5"))
                         {
-                            keys.WiFi_MAC.data = data["dak"];
-                            keys.WiFi_MAC.md5 = data["dak_md5"];
+                            keys.DAK.data = data["dak"];
+                            keys.DAK.md5 = data["dak_md5"];
                         }
 
                         result = true;

FactoryTool_CShare/Views/OperationPanel.cs

@@ -686,7 +686,7 @@ namespace MOKA_Factory_Tools
                 ClientTypeText.Text = midListNow.clienttype;
                 SVText.Text = midListNow.version;
                 ProjectIDText.Text = midListNow.projectid;
-                UpdateKeysOnline(midListNow.keytype, false);
+                UpdateKeys(midListNow.keytype, false);
             }
             else
             {
@@ -869,7 +869,7 @@ namespace MOKA_Factory_Tools
                         keyInfo.Hashkey.data = jObject["hash"].Value<string>();
                         keyInfo.YouTube_KEY.data = jObject["youtubekey"].Value<string>();
                         keyInfo.ACASKey_Data.data = jObject["acaskey_data"].Value<string>();
-                        keyInfo.ACASKey_Tool.data = jObject["acaskey_tool"].Value<string>();
+                        //keyInfo.ACASKey_Tool.data = jObject["acaskey_tool"].Value<string>();
                         keyInfo.DAK.data = jObject["dak"].Value<string>();
 
                         WriteDID.Checked = (keyInfo.DID.Length > 0 && m_writedid.Text != LResource.Skip);
@@ -1595,7 +1595,7 @@ namespace MOKA_Factory_Tools
                 reportdata += "cikey=" + keyInfo.CI_plus.data + "&";
 
             if (WriteAttestation.Checked)
-                reportdata += "attestationmd5=" + keyInfo.AttestationMD5.data + "&";
+                reportdata += "attestationmd5=" + keyInfo.Attestation.md5+ "&";
 
             if (WriteMGK.Checked)
                 reportdata += "mgk=" + keyInfo.MGK.data + "&";
@@ -1621,8 +1621,8 @@ namespace MOKA_Factory_Tools
             if (WriteEDIDName.Checked)
                 reportdata += "EDIDModeName=" + keyInfo.EDIDModelName.data + "&";
 
-            if (WriteACASKey.Checked)
-                reportdata += "acas_tool=" + keyInfo.ACASKey_Tool.data + "&";
+            //if (WriteACASKey.Checked)
+            //    reportdata += "acas_tool=" + keyInfo.ACASKey_Tool.data + "&";
 
             if (WriteACASKey.Checked)
                 reportdata += "acas_data=" + keyInfo.ACASKey_Data.data + "&";
@@ -4707,7 +4707,7 @@ namespace MOKA_Factory_Tools
                 Log.WriteGetKeyLog("Order:" + orderNow + " host is null,scanning sn:" + SN);
                 TestResult = 1;
                 UploadCopyCount();
-                UpdateKeysOnline(midListNow.keytype, false);
+                UpdateKeys(midListNow.keytype, false);
             }
             else
             {// 在线抄写;
@@ -4721,7 +4721,7 @@ namespace MOKA_Factory_Tools
                         UploadCopyCount();
                         ErrMsg = "上报结果到MID系统失败";
                         Log.WriteErrorLog(ErrMsg);
-                        UpdateKeysOnline(midListNow.keytype, false);
+                        UpdateKeys(midListNow.keytype, false);
                         goto end;
                     }
                 }
@@ -4738,7 +4738,7 @@ namespace MOKA_Factory_Tools
                             UploadCopyCount();
                             ErrMsg = "上报结果到MID系统失败";
                             Log.WriteErrorLog(ErrMsg);
-                            UpdateKeysOnline(midListNow.keytype, false);
+                            UpdateKeys(midListNow.keytype, false);
                             goto end;
                         }
                     }
@@ -4761,7 +4761,7 @@ namespace MOKA_Factory_Tools
                 // 上报完成后,更新本地数据库Key的数量;
                 UploadCopyCount();
                 // 同时,在线更新Key数量;
-                UpdateKeysOnline(midListNow.keytype, false);
+                UpdateKeys(midListNow.keytype, false);
             }
 
             if (FunctionSettingNow.ExportSNACASID)
@@ -4923,10 +4923,8 @@ namespace MOKA_Factory_Tools
         /// </summary>
         /// <param name="keys">GetMIDInfo的keytype字典</param>
         /// <returns></returns>
-        public bool UpdateKeysOnline(Dictionary<string, string> keys, bool autokey)
+        public bool UpdateKeys(Dictionary<string, string> keys, bool autokey)
         {
-            return true;
-            GetOrderRemainKeyCount(orderNow);
             if (keys.ContainsKey("DeviceID"))
             {
                 if (cfg_writedone.DIDWrite_YesNo)
@@ -5185,7 +5183,7 @@ namespace MOKA_Factory_Tools
 
             preloadresult = true;
             timer1.Start();
-            UpdateKeysOnline(midListNow.keytype, true);
+            UpdateKeys(midListNow.keytype, true);
             WritekeyThread = new Thread(Writekey);
             WritekeyThread.Start();
             if (!preloadresult)