|
|
@@ -113,7 +113,11 @@ namespace MOKA_Factory_Tools
|
|
|
{
|
|
|
TestMode.testMode = false;
|
|
|
TestMode.SetTestMode();
|
|
|
+#if DEBUG
|
|
|
+ TestMode.MAC = "C4-00-AD-17-61-3D&C4-00-AD-17-61-3C&";
|
|
|
+#else
|
|
|
TestMode.MAC = CommonMethod.GetMacAddress();
|
|
|
+#endif
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -125,7 +129,7 @@ namespace MOKA_Factory_Tools
|
|
|
enable = 3;
|
|
|
else if (PwdText.Text.Trim().Length > 0 && AccountText.Text.Trim().Length > 0)
|
|
|
{
|
|
|
- #region G客户NTF功能开启;
|
|
|
+#region G客户NTF功能开启;
|
|
|
if ( IsNTF )
|
|
|
{
|
|
|
if ( LineText.Text.Length == 0 )
|
|
|
@@ -134,7 +138,7 @@ namespace MOKA_Factory_Tools
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
- #endregion
|
|
|
+#endregion
|
|
|
|
|
|
if (CommonMethod.UserLogin(TestMode.loginUrl, AccountText.Text, PwdText.Text, TestMode.MAC, ErrorDB,out loginOutput1))
|
|
|
{
|
|
|
@@ -245,7 +249,7 @@ namespace MOKA_Factory_Tools
|
|
|
loginOutput1.factoryname = jObject["FactoryName"] == null ? "" : jObject["FactoryName"].Value<string>();
|
|
|
loginOutput1.factorynum=jObject["FactoryNum"] == null ? "" : jObject["FactoryNum"].Value<string>();
|
|
|
HttpHelper.Tracert = jObject["Tracert"] == null ? false : jObject["Tracert"].Value<bool>();
|
|
|
- #region G客户NTF功能开启;
|
|
|
+#region G客户NTF功能开启;
|
|
|
if (jObject["NTF"] != null)
|
|
|
{
|
|
|
IsNTF = jObject["NTF"].Value<bool>();
|
|
|
@@ -265,7 +269,7 @@ namespace MOKA_Factory_Tools
|
|
|
LineText.Text = Line;
|
|
|
}
|
|
|
}
|
|
|
- #endregion
|
|
|
+#endregion
|
|
|
}
|
|
|
}
|
|
|
System.Diagnostics.Process[] myProcesses = System.Diagnostics.Process.GetProcessesByName("SCBC Factory Tools");//获取指定的进程名
|
