Просмотр исходного кода

1、删除kazam相关的Config.json配置项。
2、调整小米FireTV相关的配置,当key空时,控件设置uncheck.
3、SMES获取的MAC地址与IDM的不相同,需要根据小米的来处理。

sat23 3 лет назад
Родитель
Сommit
fa1bc39fc2
2 измененных файлов с 22 добавлено и 11 удалено
  1. 0 11
      FactoryTool_CShare/Views/Main.cs
  2. 22 0
      FactoryTool_CShare/Views/OperationPanel.cs

+ 0 - 11
FactoryTool_CShare/Views/Main.cs

@@ -783,17 +783,6 @@ namespace MOKA_Factory_Tools
                 }
                 #endregion
 
-                #region G客户Kayla测试平台;
-                if (jObject["Kayla"] != null)
-                {
-                    functionSetting1.MITVEnable = jObject["Kayla"].Value<bool>();
-                }
-                else
-                {
-                    SaveJsonConfig("Kayla", false);
-                }
-                #endregion
-
                 foreach (var ss in jObject["Channel"])  //遍历Channel
                 {
                     Dictionary<string, string> ChannelValues = JsonConvert.DeserializeObject<Dictionary<string, string>>(ss.ToString());

+ 22 - 0
FactoryTool_CShare/Views/OperationPanel.cs

@@ -2458,6 +2458,10 @@ namespace MOKA_Factory_Tools
                     keyInfo.Mac.data = _MiKey.EthernetMac;
                     keyInfo.Mac.enable = true;
                 }
+                else
+                {
+                    SetCheckboxStatus(WriteMac, false);
+                }
 
                 if (_MiKey.BTMac != null)
                 {
@@ -2465,6 +2469,10 @@ namespace MOKA_Factory_Tools
                     keyInfo.BT_MAC.data = _MiKey.BTMac;
                     keyInfo.BT_MAC.enable = true;
                 }
+                else
+                {
+                    SetCheckboxStatus(WriteBTMac, false);
+                }
 
                 if (_MiKey.DSN != null)
                 {
@@ -2472,6 +2480,10 @@ namespace MOKA_Factory_Tools
                     keyInfo.DSN.data = _MiKey.DSN;
                     keyInfo.DSN.enable = true;
                 }
+                else
+                {
+                    SetCheckboxStatus(WriteDSN, false);
+                }
 
                 if (_MiKey.WIFIMAC != null)
                 {
@@ -2479,6 +2491,10 @@ namespace MOKA_Factory_Tools
                     keyInfo.WiFi_MAC.data = _MiKey.WIFIMAC;
                     keyInfo.WiFi_MAC.enable = true;
                 }
+                else
+                {
+                    SetCheckboxStatus(WriteWifiMac, false);
+                }
             }
             #endregion
 
@@ -2594,6 +2610,8 @@ namespace MOKA_Factory_Tools
             if (WriteMac.Checked)
             {
                 string mac = keyInfo.Mac.data.Replace("-", "");
+                if (FunctionSettingNow.MITVEnable == true)
+                    mac = keyInfo.Mac.data.Replace(":","");
                 if (!CommonMethod.IsNumberAndWord(mac))
                 {
                     ErrMsg = string.Format("Mac format error!\r\n{0}", mac);
@@ -2658,6 +2676,8 @@ namespace MOKA_Factory_Tools
             if (WriteWifiMac.Checked)
             {
                 string wifimac = keyInfo.WiFi_MAC.data.Replace("-", "");
+                if (FunctionSettingNow.MITVEnable == true)
+                    wifimac = keyInfo.WiFi_MAC.data.Replace(":", "");
                 if (!CommonMethod.IsNumberAndWord(wifimac))
                 {
                     ErrMsg = string.Format("Wifi Mac format error!\r\n{0}", wifimac);
@@ -2722,6 +2742,8 @@ namespace MOKA_Factory_Tools
             if (WriteBTMac.Checked)
             {
                 string btmac = keyInfo.BT_MAC.data.Replace("-", "");
+                if (FunctionSettingNow.MITVEnable == true)
+                    btmac = keyInfo.BT_MAC.data.Replace(":", "");
                 if (!CommonMethod.IsNumberAndWord(btmac))
                 {
                     ErrMsg = string.Format("BTMac format error!\r\n{0}", btmac);