同步Release分支的抄写重试机制。

FactoryTool_CShare/Models/StructList.cs

@@ -238,6 +238,11 @@ namespace MOKA_Factory_Tools
         public string edid_pid { get; set; } = "";
         public string edid_model_name { get; set; } = "";
         #endregion
+
+        #region 串口重试机制
+        public bool EnableRetry { get; set; } = false;
+        public int RetryCount { get;set; } = 3;
+        #endregion
     }
 
     public class KeyData

FactoryTool_CShare/Views/Login.cs

@@ -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");//获取指定的进程名   

FactoryTool_CShare/Views/Main.cs

@@ -838,6 +838,26 @@ namespace MOKA_Factory_Tools
                 }
                 #endregion
 
+                #region 串口重试机制;
+                if (jObject["EnableRetry"] != null)
+                {
+                    functionSetting1.EnableRetry = jObject["EnableRetry"].Value<bool>();
+                }
+                else
+                {
+                    SaveJsonConfig("EnableRetry", false);
+                }
+
+                if (jObject["RetryCount"] != null)
+                {
+                    functionSetting1.RetryCount = jObject["RetryCount"].Value<int>();
+                }
+                else
+                {
+                    SaveJsonConfig("RetryCount", 3);
+                }
+                #endregion
+
                 foreach (var ss in jObject["Channel"])  //遍历Channel
                 {
                     Dictionary<string, string> ChannelValues = JsonConvert.DeserializeObject<Dictionary<string, string>>(ss.ToString());

FactoryTool_CShare/Views/OperationPanel.cs

@@ -187,6 +187,11 @@ namespace MOKA_Factory_Tools
             BaudText.BackColor = Color.FromArgb(128, 255, 128);
             WritePSN.Checked = FunctionSettingNow.BarcodeWrite;
 
+            #region 串口重试机制;
+            SerialCMD.EnableRetry = FunctionSettingNow.EnableRetry;
+            SerialCMD.RetryCount = FunctionSettingNow.RetryCount;
+            #endregion
+
             #region 设置WriteCheck复选框默认状态;
             if (!cfg_writecheck.DIDCheckcheck)
                 SetspecificText(m_checkdid, LResource.Skip, Color.Yellow);