浏览代码

正式GetIDMKeys接口完成。

JeffWang 3 年之前
父节点
当前提交
98593106c6
共有 3 个文件被更改,包括 779 次插入664 次删除
  1. 221 210
      FactoryTool_CShare/Business/CommonMethod.cs
  2. 14 15
      FactoryTool_CShare/Views/Main.Designer.cs
  3. 544 439
      FactoryTool_CShare/Views/Main.resx

+ 221 - 210
FactoryTool_CShare/Business/CommonMethod.cs

@@ -509,292 +509,303 @@ namespace MOKA_Factory_Tools
             watch.Start();
 
             #region 新抄写接口预处理
-            // 逆序去除"IDManage",再拼接"n-admin"
-            int nPos = url.LastIndexOf('/');
-            if (nPos > 0)
+            if (TestMode.testMode == true)
+            { // 逆序去除"IDManage",再拼接"n-admin"
+                int nPos = url.LastIndexOf('/');
+                if (nPos > 0)
+                {
+                    url = url.Substring(0, nPos) + "/n-admin";
+                }
+                item.URL = url + "/bind/order";
+            }
+            else
             {
-                url = url.Substring(0, nPos) + "/n-admin";
+                item.URL = url + "/v1/bind/order";
             }
             #endregion
-            item.URL = url + "/bind/order";
             item.Postdata = string.Format("{{\"orderNum\":\"{0}\",\"sn\":\"{1}\",\"psn\":\"{2}\",\"orderCode\":\"{3}\"}}", order, sn, psn, firetv_device_code);
             HttpResult httpResult = http.GetHtml(item);
             if (httpResult.StatusCode == System.Net.HttpStatusCode.OK)
             {
-                JObject jObject = JObject.Parse(httpResult.Html);
-                msg = JSON_SeleteNode(jObject, "msg");
-                code = JSON_SeleteNode(jObject, "code");
-                if ( code == "0" )
-                {
-                    Dictionary<string, string> data = JsonConvert.DeserializeObject<Dictionary<string, string>>(jObject["data"].ToString());
-                    if (data != null)
+                try {
+                    JObject jObject = JObject.Parse(httpResult.Html);
+                    msg = JSON_SeleteNode(jObject, "msg");
+                    code = JSON_SeleteNode(jObject, "code");
+                    if (code == "0")
                     {
-                        Func<string, string, bool> CheckMD5 = (data, md5) =>
+                        Dictionary<string, string> data = JsonConvert.DeserializeObject<Dictionary<string, string>>(jObject["data"].ToString());
+                        if (data != null)
                         {
-                            if (data == null)
-                                return true;
-                            
-                            if (!GetMD5.GetStrMd5(data).Equals(md5, StringComparison.OrdinalIgnoreCase))
-                                return false;
-                            
-                            return true;
-                        };
+                            Func<string, string, bool> CheckMD5 = (data, md5) =>
+                            {
+                                if (data == null)
+                                    return true;
 
-                        if (data.ContainsKey("mac") && data.ContainsKey("mac_md5"))
-                        {
-                            keys.Mac.data = data["mac"];
-                            keys.Mac.md5 = data["mac_md5"];
+                                if (!GetMD5.GetStrMd5(data).Equals(md5, StringComparison.OrdinalIgnoreCase))
+                                    return false;
 
-                            if ( !CheckMD5(keys.Mac.data, keys.Mac.md5) )
+                                return true;
+                            };
+
+                            if (data.ContainsKey("mac") && data.ContainsKey("mac_md5"))
                             {
-                                msg = string.Format("Mac Key Value md5 Is Incorrect: data={0}, md5={1}", keys.Mac.data, keys.Mac.md5);
-                                goto end;
-                            }
-                        }
+                                keys.Mac.data = data["mac"];
+                                keys.Mac.md5 = data["mac_md5"];
 
-                        if (data.ContainsKey("btMac") && data.ContainsKey("btMac_md5"))
-                        {
-                            keys.BT_MAC.data = data["btMac"];
-                            keys.BT_MAC.md5 = data["btMac_md5"];
+                                if (!CheckMD5(keys.Mac.data, keys.Mac.md5))
+                                {
+                                    msg = string.Format("Mac Key Value md5 Is Incorrect: data={0}, md5={1}", keys.Mac.data, keys.Mac.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.BT_MAC.data, keys.BT_MAC.md5))
+                            if (data.ContainsKey("btMac") && data.ContainsKey("btMac_md5"))
                             {
-                                msg = string.Format("BT_MAC Key Value md5 Is Incorrect: data={0}, md5={1}", keys.BT_MAC.data, keys.BT_MAC.md5);
-                                goto end;
-                            }
-                        }
+                                keys.BT_MAC.data = data["btMac"];
+                                keys.BT_MAC.md5 = data["btMac_md5"];
 
-                        if (data.ContainsKey("wifiMac") && data.ContainsKey("wifiMac_md5"))
-                        {
-                            keys.WiFi_MAC.data = data["wifiMac"];
-                            keys.WiFi_MAC.md5 = data["wifiMac_md5"];
+                                if (!CheckMD5(keys.BT_MAC.data, keys.BT_MAC.md5))
+                                {
+                                    msg = string.Format("BT_MAC Key Value md5 Is Incorrect: data={0}, md5={1}", keys.BT_MAC.data, keys.BT_MAC.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.WiFi_MAC.data, keys.WiFi_MAC.md5))
+                            if (data.ContainsKey("wifiMac") && data.ContainsKey("wifiMac_md5"))
                             {
-                                msg = string.Format("WiFi_MAC Key Value md5 Is Incorrect: data={0}, md5={1}", keys.WiFi_MAC.data, keys.WiFi_MAC.md5);
-                                goto end;
-                            }
-                        }
+                                keys.WiFi_MAC.data = data["wifiMac"];
+                                keys.WiFi_MAC.md5 = data["wifiMac_md5"];
 
-                        if (data.ContainsKey("deviceid") && data.ContainsKey("deviceid_md5"))
-                        {
-                            keys.DID.data = data["deviceid"];
-                            keys.DID.md5 = data["deviceid_md5"];
+                                if (!CheckMD5(keys.WiFi_MAC.data, keys.WiFi_MAC.md5))
+                                {
+                                    msg = string.Format("WiFi_MAC Key Value md5 Is Incorrect: data={0}, md5={1}", keys.WiFi_MAC.data, keys.WiFi_MAC.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.DID.data, keys.DID.md5))
+                            if (data.ContainsKey("deviceid") && data.ContainsKey("deviceid_md5"))
                             {
-                                msg = string.Format("DID Key Value md5 Is Incorrect: data={0}, md5={1}", keys.DID.data, keys.DID.md5);
-                                goto end;
-                            }
-                        }
+                                keys.DID.data = data["deviceid"];
+                                keys.DID.md5 = data["deviceid_md5"];
 
-                        if (data.ContainsKey("hdcp") && data.ContainsKey("hdcp_md5"))
-                        {
-                            keys.HDCP.data = data["hdcp"];
-                            keys.HDCP.md5 = data["hdcp_md5"];
+                                if (!CheckMD5(keys.DID.data, keys.DID.md5))
+                                {
+                                    msg = string.Format("DID Key Value md5 Is Incorrect: data={0}, md5={1}", keys.DID.data, keys.DID.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.HDCP.data, keys.HDCP.md5))
+                            if (data.ContainsKey("hdcp") && data.ContainsKey("hdcp_md5"))
                             {
-                                msg = string.Format("HDCP Key Value md5 Is Incorrect: data={0}, md5={1}", keys.HDCP.data, keys.HDCP.md5);
-                                goto end;
-                            }
-                        }
+                                keys.HDCP.data = data["hdcp"];
+                                keys.HDCP.md5 = data["hdcp_md5"];
 
-                        if (data.ContainsKey("hdcp2") && data.ContainsKey("hdcp2_md5"))
-                        {
-                            keys.HDCP22.data = data["hdcp2"];
-                            keys.HDCP22.md5 = data["hdcp2_md5"];
+                                if (!CheckMD5(keys.HDCP.data, keys.HDCP.md5))
+                                {
+                                    msg = string.Format("HDCP Key Value md5 Is Incorrect: data={0}, md5={1}", keys.HDCP.data, keys.HDCP.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.HDCP22.data, keys.HDCP22.md5))
+                            if (data.ContainsKey("hdcp2") && data.ContainsKey("hdcp2_md5"))
                             {
-                                msg = string.Format("HDCP22 Key Value md5 Is Incorrect: data={0}, md5={1}", keys.HDCP22.data, keys.HDCP22.md5);
-                                goto end;
-                            }
-                        }
+                                keys.HDCP22.data = data["hdcp2"];
+                                keys.HDCP22.md5 = data["hdcp2_md5"];
 
-                        if (data.ContainsKey("ci") && data.ContainsKey("ci_md5"))
-                        {
-                            keys.CI_plus.data = data["ci"];
-                            keys.CI_plus.md5 = data["ci_md5"];
+                                if (!CheckMD5(keys.HDCP22.data, keys.HDCP22.md5))
+                                {
+                                    msg = string.Format("HDCP22 Key Value md5 Is Incorrect: data={0}, md5={1}", keys.HDCP22.data, keys.HDCP22.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.CI_plus.data, keys.CI_plus.md5))
+                            if (data.ContainsKey("ci") && data.ContainsKey("ci_md5"))
                             {
-                                msg = string.Format("CI_plus Key Value md5 Is Incorrect: data={0}, md5={1}", keys.CI_plus.data, keys.CI_plus.md5);
-                                goto end;
-                            }
-                        }
+                                keys.CI_plus.data = data["ci"];
+                                keys.CI_plus.md5 = data["ci_md5"];
 
-                        if (data.ContainsKey("ecp") && data.ContainsKey("ecp_md5"))
-                        {
-                            keys.ECP.data = data["ecp"];
-                            keys.ECP.md5 = data["ecp_md5"];
+                                if (!CheckMD5(keys.CI_plus.data, keys.CI_plus.md5))
+                                {
+                                    msg = string.Format("CI_plus Key Value md5 Is Incorrect: data={0}, md5={1}", keys.CI_plus.data, keys.CI_plus.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.ECP.data, keys.ECP.md5))
+                            if (data.ContainsKey("ecp") && data.ContainsKey("ecp_md5"))
                             {
-                                msg = string.Format("ECP Key Value md5 Is Incorrect: data={0}, md5={1}", keys.ECP.data, keys.ECP.md5);
-                                goto end;
-                            }
-                        }
+                                keys.ECP.data = data["ecp"];
+                                keys.ECP.md5 = data["ecp_md5"];
 
-                        if (data.ContainsKey("acas") && data.ContainsKey("acas_md5"))
-                        {
-                            keys.ACASKey_Data.data = data["acas"];
-                            keys.ACASKey_Data.md5 = data["acas_md5"];
+                                if (!CheckMD5(keys.ECP.data, keys.ECP.md5))
+                                {
+                                    msg = string.Format("ECP Key Value md5 Is Incorrect: data={0}, md5={1}", keys.ECP.data, keys.ECP.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.ACASKey_Data.data, keys.ACASKey_Data.md5))
+                            if (data.ContainsKey("acas") && data.ContainsKey("acas_md5"))
                             {
-                                msg = string.Format("ACASKey_Data Key Value md5 Is Incorrect: data={0}, md5={1}", keys.ACASKey_Data.data, keys.ACASKey_Data.md5);
-                                goto end;
-                            }
-                        }
+                                keys.ACASKey_Data.data = data["acas"];
+                                keys.ACASKey_Data.md5 = data["acas_md5"];
 
-                        if (data.ContainsKey("lek") && data.ContainsKey("lek_md5"))
-                        {
-                            keys.LEK.data = data["lek"];
-                            keys.LEK.md5 = data["lek_md5"];
+                                if (!CheckMD5(keys.ACASKey_Data.data, keys.ACASKey_Data.md5))
+                                {
+                                    msg = string.Format("ACASKey_Data Key Value md5 Is Incorrect: data={0}, md5={1}", keys.ACASKey_Data.data, keys.ACASKey_Data.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.LEK.data, keys.LEK.md5))
+                            if (data.ContainsKey("lek") && data.ContainsKey("lek_md5"))
                             {
-                                msg = string.Format("LEK Key Value md5 Is Incorrect: data={0}, md5={1}", keys.LEK.data, keys.LEK.md5);
-                                goto end;
-                            }
-                        }
+                                keys.LEK.data = data["lek"];
+                                keys.LEK.md5 = data["lek_md5"];
 
-                        if (data.ContainsKey("pek") && data.ContainsKey("pek_md5"))
-                        {
-                            keys.PEK.data = data["pek"];
-                            keys.PEK.md5 = data["pek_md5"];
+                                if (!CheckMD5(keys.LEK.data, keys.LEK.md5))
+                                {
+                                    msg = string.Format("LEK Key Value md5 Is Incorrect: data={0}, md5={1}", keys.LEK.data, keys.LEK.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.PEK.data, keys.PEK.md5))
+                            if (data.ContainsKey("pek") && data.ContainsKey("pek_md5"))
                             {
-                                msg = string.Format("PEK Key Value md5 Is Incorrect: data={0}, md5={1}", keys.PEK.data, keys.PEK.md5);
-                                goto end;
-                            }
-                        }
+                                keys.PEK.data = data["pek"];
+                                keys.PEK.md5 = data["pek_md5"];
 
-                        if (data.ContainsKey("playready") && data.ContainsKey("playready_md5"))
-                        {
-                            keys.Playready.data = data["playready"];
-                            keys.Playready.md5 = data["playready_md5"];
+                                if (!CheckMD5(keys.PEK.data, keys.PEK.md5))
+                                {
+                                    msg = string.Format("PEK Key Value md5 Is Incorrect: data={0}, md5={1}", keys.PEK.data, keys.PEK.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.Playready.data, keys.Playready.md5))
+                            if (data.ContainsKey("playready") && data.ContainsKey("playready_md5"))
                             {
-                                msg = string.Format("Playready Key Value md5 Is Incorrect: data={0}, md5={1}", keys.Playready.data, keys.Playready.md5);
-                                goto end;
-                            }
-                        }
+                                keys.Playready.data = data["playready"];
+                                keys.Playready.md5 = data["playready_md5"];
 
-                        if (data.ContainsKey("netfilx") && data.ContainsKey("netfilx_md5"))
-                        {
-                            keys.ESN.data = data["netfilx"];
-                            keys.ESN.md5 = data["netfilx_md5"];
+                                if (!CheckMD5(keys.Playready.data, keys.Playready.md5))
+                                {
+                                    msg = string.Format("Playready Key Value md5 Is Incorrect: data={0}, md5={1}", keys.Playready.data, keys.Playready.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.ESN.data, keys.ESN.md5))
+                            if (data.ContainsKey("netfilx") && data.ContainsKey("netfilx_md5"))
                             {
-                                msg = string.Format("ESN Key Value md5 Is Incorrect: data={0}, md5={1}", keys.ESN.data, keys.ESN.md5);
-                                goto end;
-                            }
-                        }
+                                keys.ESN.data = data["netfilx"];
+                                keys.ESN.md5 = data["netfilx_md5"];
 
-                        if (data.ContainsKey("hash") && data.ContainsKey("hash_md5"))
-                        {
-                            keys.Hashkey.data = data["hash"];
-                            keys.Hashkey.md5 = data["hash_md5"];
+                                if (!CheckMD5(keys.ESN.data, keys.ESN.md5))
+                                {
+                                    msg = string.Format("ESN Key Value md5 Is Incorrect: data={0}, md5={1}", keys.ESN.data, keys.ESN.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.Hashkey.data, keys.Hashkey.md5))
+                            if (data.ContainsKey("hash") && data.ContainsKey("hash_md5"))
                             {
-                                msg = string.Format("Hashkey Key Value md5 Is Incorrect: data={0}, md5={1}", keys.Hashkey.data, keys.Hashkey.md5);
-                                goto end;
-                            }
-                        }
+                                keys.Hashkey.data = data["hash"];
+                                keys.Hashkey.md5 = data["hash_md5"];
 
-                        if (data.ContainsKey("mgk") && data.ContainsKey("mgk_md5"))
-                        {
-                            keys.MGK.data = data["mgk"];
-                            keys.MGK.md5 = data["mgk_md5"];
+                                if (!CheckMD5(keys.Hashkey.data, keys.Hashkey.md5))
+                                {
+                                    msg = string.Format("Hashkey Key Value md5 Is Incorrect: data={0}, md5={1}", keys.Hashkey.data, keys.Hashkey.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.MGK.data, keys.MGK.md5))
+                            if (data.ContainsKey("mgk") && data.ContainsKey("mgk_md5"))
                             {
-                                msg = string.Format("MGK Key Value md5 Is Incorrect: data={0}, md5={1}", keys.MGK.data, keys.MGK.md5);
-                                goto end;
-                            }
-                        }
+                                keys.MGK.data = data["mgk"];
+                                keys.MGK.md5 = data["mgk_md5"];
 
-                        if (data.ContainsKey("youtube") && data.ContainsKey("youtube_md5"))
-                        {
-                            keys.YouTube_KEY.data = data["youtube"];
-                            keys.YouTube_KEY.md5 = data["youtube_md5"];
+                                if (!CheckMD5(keys.MGK.data, keys.MGK.md5))
+                                {
+                                    msg = string.Format("MGK Key Value md5 Is Incorrect: data={0}, md5={1}", keys.MGK.data, keys.MGK.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.YouTube_KEY.data, keys.YouTube_KEY.md5))
+                            if (data.ContainsKey("youtube") && data.ContainsKey("youtube_md5"))
                             {
-                                msg = string.Format("YouTube_KEY Key Value md5 Is Incorrect: data={0}, md5={1}", keys.YouTube_KEY.data, keys.YouTube_KEY.md5);
-                                goto end;
-                            }
-                        }
+                                keys.YouTube_KEY.data = data["youtube"];
+                                keys.YouTube_KEY.md5 = data["youtube_md5"];
 
-                        if (data.ContainsKey("fairplay") && data.ContainsKey("fairplay_md5"))
-                        {
-                            keys.Fairplay.data = data["fairplay"];
-                            keys.Fairplay.md5 = data["fairplay_md5"];
+                                if (!CheckMD5(keys.YouTube_KEY.data, keys.YouTube_KEY.md5))
+                                {
+                                    msg = string.Format("YouTube_KEY Key Value md5 Is Incorrect: data={0}, md5={1}", keys.YouTube_KEY.data, keys.YouTube_KEY.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.Fairplay.data, keys.Fairplay.md5))
+                            if (data.ContainsKey("fairplay") && data.ContainsKey("fairplay_md5"))
                             {
-                                msg = string.Format("Fairplay Key Value md5 Is Incorrect: data={0}, md5={1}", keys.Fairplay.data, keys.Fairplay.md5);
-                                goto end;
-                            }
-                        }
+                                keys.Fairplay.data = data["fairplay"];
+                                keys.Fairplay.md5 = data["fairplay_md5"];
 
-                        if (data.ContainsKey("widevine") && data.ContainsKey("widevine_md5"))
-                        {
-                            keys.Widevine.data = data["widevine"];
-                            keys.Widevine.md5 = data["widevine_md5"];
+                                if (!CheckMD5(keys.Fairplay.data, keys.Fairplay.md5))
+                                {
+                                    msg = string.Format("Fairplay Key Value md5 Is Incorrect: data={0}, md5={1}", keys.Fairplay.data, keys.Fairplay.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.Widevine.data, keys.Widevine.md5))
+                            if (data.ContainsKey("widevine") && data.ContainsKey("widevine_md5"))
                             {
-                                msg = string.Format("Widevine Key Value md5 Is Incorrect: data={0}, md5={1}", keys.Widevine.data, keys.Widevine.md5);
-                                goto end;
-                            }
-                        }
+                                keys.Widevine.data = data["widevine"];
+                                keys.Widevine.md5 = data["widevine_md5"];
 
-                        if (data.ContainsKey("attention") && data.ContainsKey("attention_md5"))
-                        {
-                            keys.Attestation.data = data["attention"];
-                            keys.Attestation.md5 = data["attention_md5"];
+                                if (!CheckMD5(keys.Widevine.data, keys.Widevine.md5))
+                                {
+                                    msg = string.Format("Widevine Key Value md5 Is Incorrect: data={0}, md5={1}", keys.Widevine.data, keys.Widevine.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.Attestation.data, keys.Attestation.md5))
+                            if (data.ContainsKey("attention") && data.ContainsKey("attention_md5"))
                             {
-                                msg = string.Format("Attestation Key Value md5 Is Incorrect: data={0}, md5={1}", keys.Attestation.data, keys.Attestation.md5);
-                                goto end;
-                            }
-                        }
+                                keys.Attestation.data = data["attention"];
+                                keys.Attestation.md5 = data["attention_md5"];
 
-                        if (data.ContainsKey("dsn") && data.ContainsKey("dsn_md5"))
-                        {
-                            keys.DSN.data = data["dsn"];
-                            keys.DSN.md5 = data["dsn_md5"];
+                                if (!CheckMD5(keys.Attestation.data, keys.Attestation.md5))
+                                {
+                                    msg = string.Format("Attestation Key Value md5 Is Incorrect: data={0}, md5={1}", keys.Attestation.data, keys.Attestation.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.DSN.data, keys.DSN.md5))
+                            if (data.ContainsKey("dsn") && data.ContainsKey("dsn_md5"))
                             {
-                                msg = string.Format("DSN Key Value md5 Is Incorrect: data={0}, md5={1}", keys.DSN.data, keys.DSN.md5);
-                                goto end;
-                            }
-                        }
+                                keys.DSN.data = data["dsn"];
+                                keys.DSN.md5 = data["dsn_md5"];
 
-                        if (data.ContainsKey("dak") && data.ContainsKey("dak_md5"))
-                        {
-                            keys.DAK.data = data["dak"];
-                            keys.DAK.md5 = data["dak_md5"];
+                                if (!CheckMD5(keys.DSN.data, keys.DSN.md5))
+                                {
+                                    msg = string.Format("DSN Key Value md5 Is Incorrect: data={0}, md5={1}", keys.DSN.data, keys.DSN.md5);
+                                    goto end;
+                                }
+                            }
 
-                            if (!CheckMD5(keys.DAK.data, keys.DAK.md5))
+                            if (data.ContainsKey("dak") && data.ContainsKey("dak_md5"))
                             {
-                                msg = string.Format("DAK Key Value md5 Is Incorrect: data={0}, md5={1}", keys.DAK.data, keys.DAK.md5);
-                                goto end;
+                                keys.DAK.data = data["dak"];
+                                keys.DAK.md5 = data["dak_md5"];
+
+                                if (!CheckMD5(keys.DAK.data, keys.DAK.md5))
+                                {
+                                    msg = string.Format("DAK Key Value md5 Is Incorrect: data={0}, md5={1}", keys.DAK.data, keys.DAK.md5);
+                                    goto end;
+                                }
                             }
-                        }
 
-                        result = true;
+                            result = true;
+                        }
                     }
                 }
+                catch {
+                    msg = "解决Json失败";
+                }
             }
 
 end:

+ 14 - 15
FactoryTool_CShare/Views/Main.Designer.cs

@@ -127,41 +127,40 @@
             // 
             // ChannelList
             // 
-            resources.ApplyResources(this.ChannelList, "ChannelList");
             this.ChannelList.BaseColor = System.Drawing.Color.Cyan;
             this.ChannelList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
             this.ChannelList.DropDownHeight = 100;
             this.ChannelList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.ChannelList.FormattingEnabled = true;
+            resources.ApplyResources(this.ChannelList, "ChannelList");
             this.ChannelList.Name = "ChannelList";
             this.ChannelList.WaterText = "";
             this.ChannelList.SelectedIndexChanged += new System.EventHandler(this.ChannelList_SelectedIndexChanged);
             // 
             // OSDList
             // 
-            resources.ApplyResources(this.OSDList, "OSDList");
             this.OSDList.BaseColor = System.Drawing.Color.Cyan;
             this.OSDList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
             this.OSDList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.OSDList.FormattingEnabled = true;
+            resources.ApplyResources(this.OSDList, "OSDList");
             this.OSDList.Name = "OSDList";
             this.OSDList.WaterText = "";
             this.OSDList.SelectedIndexChanged += new System.EventHandler(this.OSDList_SelectedIndexChanged);
             // 
             // SHOPList
             // 
-            resources.ApplyResources(this.SHOPList, "SHOPList");
             this.SHOPList.BaseColor = System.Drawing.Color.Cyan;
             this.SHOPList.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
             this.SHOPList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.SHOPList.FormattingEnabled = true;
+            resources.ApplyResources(this.SHOPList, "SHOPList");
             this.SHOPList.Name = "SHOPList";
             this.SHOPList.WaterText = "";
             this.SHOPList.SelectedIndexChanged += new System.EventHandler(this.SHOPList_SelectedIndexChanged);
             // 
             // skinGroupBox1
             // 
-            resources.ApplyResources(this.skinGroupBox1, "skinGroupBox1");
             this.skinGroupBox1.BackColor = System.Drawing.Color.Transparent;
             this.skinGroupBox1.BorderColor = System.Drawing.Color.White;
             this.skinGroupBox1.Controls.Add(this.BarcodeWrite);
@@ -181,6 +180,7 @@
             this.skinGroupBox1.Controls.Add(this.WriteSHOP);
             this.skinGroupBox1.Controls.Add(this.skinLabel1);
             this.skinGroupBox1.ForeColor = System.Drawing.Color.Black;
+            resources.ApplyResources(this.skinGroupBox1, "skinGroupBox1");
             this.skinGroupBox1.Name = "skinGroupBox1";
             this.skinGroupBox1.RectBackColor = System.Drawing.Color.Transparent;
             this.skinGroupBox1.RoundStyle = CCWin.SkinClass.RoundStyle.All;
@@ -246,8 +246,8 @@
             // 
             // BarCodeKeyCodeText
             // 
-            resources.ApplyResources(this.BarCodeKeyCodeText, "BarCodeKeyCodeText");
             this.BarCodeKeyCodeText.BackColor = System.Drawing.SystemColors.Control;
+            resources.ApplyResources(this.BarCodeKeyCodeText, "BarCodeKeyCodeText");
             this.BarCodeKeyCodeText.Name = "BarCodeKeyCodeText";
             this.BarCodeKeyCodeText.WaterColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127)))));
             this.BarCodeKeyCodeText.WaterText = "";
@@ -288,13 +288,13 @@
             // 
             // skinGroupBox2
             // 
-            resources.ApplyResources(this.skinGroupBox2, "skinGroupBox2");
             this.skinGroupBox2.BackColor = System.Drawing.Color.Transparent;
             this.skinGroupBox2.BorderColor = System.Drawing.Color.White;
             this.skinGroupBox2.Controls.Add(this.skinLabel3);
             this.skinGroupBox2.Controls.Add(this.TVBaud);
             this.skinGroupBox2.Controls.Add(this.TVCOM);
             this.skinGroupBox2.Controls.Add(this.skinLabel2);
+            resources.ApplyResources(this.skinGroupBox2, "skinGroupBox2");
             this.skinGroupBox2.ForeColor = System.Drawing.Color.Black;
             this.skinGroupBox2.Name = "skinGroupBox2";
             this.skinGroupBox2.RectBackColor = System.Drawing.Color.Transparent;
@@ -313,10 +313,10 @@
             // 
             // TVBaud
             // 
-            resources.ApplyResources(this.TVBaud, "TVBaud");
             this.TVBaud.BaseColor = System.Drawing.Color.Cyan;
             this.TVBaud.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
             this.TVBaud.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            resources.ApplyResources(this.TVBaud, "TVBaud");
             this.TVBaud.FormattingEnabled = true;
             this.TVBaud.Items.AddRange(new object[] {
             resources.GetString("TVBaud.Items"),
@@ -327,11 +327,11 @@
             // 
             // TVCOM
             // 
-            resources.ApplyResources(this.TVCOM, "TVCOM");
             this.TVCOM.BaseColor = System.Drawing.Color.Cyan;
             this.TVCOM.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed;
             this.TVCOM.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.TVCOM.FormattingEnabled = true;
+            resources.ApplyResources(this.TVCOM, "TVCOM");
             this.TVCOM.Name = "TVCOM";
             this.TVCOM.WaterText = "";
             this.TVCOM.SelectedIndexChanged += new System.EventHandler(this.TVCOM_SelectedIndexChanged);
@@ -346,7 +346,6 @@
             // 
             // skinGroupBox3
             // 
-            resources.ApplyResources(this.skinGroupBox3, "skinGroupBox3");
             this.skinGroupBox3.BackColor = System.Drawing.Color.Transparent;
             this.skinGroupBox3.BorderColor = System.Drawing.Color.White;
             this.skinGroupBox3.Controls.Add(this.WBPath);
@@ -355,6 +354,7 @@
             this.skinGroupBox3.Controls.Add(this.WBInit);
             this.skinGroupBox3.Controls.Add(this.skinLabel5);
             this.skinGroupBox3.ForeColor = System.Drawing.Color.Black;
+            resources.ApplyResources(this.skinGroupBox3, "skinGroupBox3");
             this.skinGroupBox3.Name = "skinGroupBox3";
             this.skinGroupBox3.RectBackColor = System.Drawing.Color.Transparent;
             this.skinGroupBox3.RoundStyle = CCWin.SkinClass.RoundStyle.All;
@@ -365,8 +365,8 @@
             // 
             // WBPath
             // 
-            resources.ApplyResources(this.WBPath, "WBPath");
             this.WBPath.BackColor = System.Drawing.SystemColors.Control;
+            resources.ApplyResources(this.WBPath, "WBPath");
             this.WBPath.Name = "WBPath";
             this.WBPath.ReadOnly = true;
             this.WBPath.WaterColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127)))));
@@ -374,11 +374,11 @@
             // 
             // skinButton1
             // 
-            resources.ApplyResources(this.skinButton1, "skinButton1");
             this.skinButton1.BackColor = System.Drawing.Color.Transparent;
             this.skinButton1.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.skinButton1.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.skinButton1.DownBack = null;
+            resources.ApplyResources(this.skinButton1, "skinButton1");
             this.skinButton1.MouseBack = null;
             this.skinButton1.Name = "skinButton1";
             this.skinButton1.NormlBack = null;
@@ -438,11 +438,11 @@
             // 
             // OrderSubmit
             // 
-            resources.ApplyResources(this.OrderSubmit, "OrderSubmit");
             this.OrderSubmit.BackColor = System.Drawing.Color.Transparent;
             this.OrderSubmit.BaseColor = System.Drawing.Color.Cyan;
             this.OrderSubmit.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.OrderSubmit.DownBack = null;
+            resources.ApplyResources(this.OrderSubmit, "OrderSubmit");
             this.OrderSubmit.MouseBack = null;
             this.OrderSubmit.Name = "OrderSubmit";
             this.OrderSubmit.NormlBack = null;
@@ -452,15 +452,14 @@
             // openFileDialog1
             // 
             this.openFileDialog1.FileName = "openFileDialog1";
-            resources.ApplyResources(this.openFileDialog1, "openFileDialog1");
             // 
             // CreateKeyManually
             // 
-            resources.ApplyResources(this.CreateKeyManually, "CreateKeyManually");
             this.CreateKeyManually.BackColor = System.Drawing.Color.Transparent;
             this.CreateKeyManually.BaseColor = System.Drawing.Color.Cyan;
             this.CreateKeyManually.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.CreateKeyManually.DownBack = null;
+            resources.ApplyResources(this.CreateKeyManually, "CreateKeyManually");
             this.CreateKeyManually.MouseBack = null;
             this.CreateKeyManually.Name = "CreateKeyManually";
             this.CreateKeyManually.NormlBack = null;
@@ -496,12 +495,12 @@
             // 
             // Main
             // 
-            resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
             this.CaptionBackColorBottom = System.Drawing.Color.Cyan;
             this.CaptionBackColorTop = System.Drawing.Color.RoyalBlue;
             this.CaptionFont = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            resources.ApplyResources(this, "$this");
             this.Controls.Add(this.ProductionNum_Text);
             this.Controls.Add(this.Preload);
             this.Controls.Add(this.CreateKeyManually);

文件差异内容过多而无法显示
+ 544 - 439
FactoryTool_CShare/Views/Main.resx


部分文件因为文件数量过多而无法显示