浏览代码

小米FirtTV抄写变更:根据Config文件启动抄写4个key:eth mac\wifi mac\bt mac\dsn。

jianfeng1.wang 2 年之前
父节点
当前提交
63cd4dd9d6
共有 1 个文件被更改,包括 35 次插入27 次删除
  1. 35 27
      FactoryTool_CShare/Views/OperationPanel.cs

+ 35 - 27
FactoryTool_CShare/Views/OperationPanel.cs

@@ -2402,33 +2402,40 @@ namespace MOKA_Factory_Tools
                 }
 
                 // 配置要抄写的选项;
-                if (_MiKey.EthernetMac != null)
+                if (WriteMac.Checked)
                 {
-                    SetCheckboxStatus(WriteMac, true);
+                    if ( _MiKey.EthernetMac == null || _MiKey.EthernetMac.Length == 0 )
+                    {
+                        ErrMsg = "EthernetMac is null!\r\n";
+                        Log.WriteErrorLog(ErrMsg);
+                        goto end;
+                    }
+
                     keyInfo.Mac.data = _MiKey.EthernetMac;
                     keyInfo.Mac.enable = true;
                 }
-                else if ( !midListNow.keytype.ContainsKey("MAC") )
-                {
-                    SetCheckboxStatus(WriteMac, false);
-                }
 
-                if (_MiKey.BTMac != null)
+                if (WriteBTMac.Checked )
                 {
-                    SetCheckboxStatus(WriteBTMac, true);
+                    if (_MiKey.BTMac == null || _MiKey.BTMac.Length == 0)
+                    {
+                        ErrMsg = "BTMac is null!\r\n";
+                        Log.WriteErrorLog(ErrMsg);
+                        goto end;
+                    }
+
                     keyInfo.BT_MAC.data = _MiKey.BTMac;
                     keyInfo.BT_MAC.enable = true;
                 }
-                else if (!midListNow.keytype.ContainsKey("BT_MAC"))
-                {
-                    SetCheckboxStatus(WriteBTMac, false);
-                }
 
-                if (_MiKey.DSN != null)
+                if (WriteDSN.Checked)
                 {
-                    SetCheckboxStatus(WriteDSN, true);
-                    keyInfo.DSN.data = _MiKey.DSN;
-                    keyInfo.DSN.enable = true;
+                    if (_MiKey.DSN == null || _MiKey.DSN.Length == 0)
+                    {
+                        ErrMsg = "DSN is null!\r\n";
+                        Log.WriteErrorLog(ErrMsg);
+                        goto end;
+                    }
 
                     // 预防切了pid后,deviceCode变化了;
                     if (keyInfo.DSN.data != null && keyInfo.DSN.data.IndexOf(devicecode) == -1)
@@ -2437,22 +2444,23 @@ namespace MOKA_Factory_Tools
                         Log.WriteErrorLog(ErrMsg);
                         goto end;
                     }
-                }
-                else if (!midListNow.keytype.ContainsKey("DSN"))
-                {
-                    SetCheckboxStatus(WriteDSN, false);
+
+                    keyInfo.DSN.data = _MiKey.DSN;
+                    keyInfo.DSN.enable = true;
                 }
 
-                if (_MiKey.WIFIMAC != null)
+                if (WriteWifiMac.Checked)
                 {
-                    SetCheckboxStatus(WriteWifiMac, true);
+                    if (_MiKey.WIFIMAC == null || _MiKey.WIFIMAC.Length == 0)
+                    {
+                        ErrMsg = "WIFIMAC is null!\r\n";
+                        Log.WriteErrorLog(ErrMsg);
+                        goto end;
+                    }
+
                     keyInfo.WiFi_MAC.data = _MiKey.WIFIMAC;
                     keyInfo.WiFi_MAC.enable = true;
-                }
-                else if (!midListNow.keytype.ContainsKey("WiFi_MAC"))
-                {
-                    SetCheckboxStatus(WriteWifiMac, false);
-                }
+                }               
             }
 #endregion