增加部分日志

.gitignore

 # .net ignoer file
 /.vs
 /GKHTRBC16P/bin
+/GKHTRBC16P/bin/Debug
 /GKHTRBC16P/obj
 /GKHTRBC16P.Bll/bin
 /GKHTRBC16P.Bll/obj

GK-HTRB-C16P.Upgradation/bin/Upgradation/Languages/ChineseSimplified.xml

@@ -786,7 +786,7 @@
 			<Control name="uiLabel16" text="对象信息："/>
 		</Controls>
 		<DataGridViewCells>
-			<DataGridViewCell name="Column1" HeaderText="暂停开始"/>
+			<DataGridViewCell name="Column1" HeaderText="暂停/停止时间"/>
 			<DataGridViewCell name="Column2" HeaderText="结束"/>
 			<DataGridViewCell name="Column3" HeaderText="分钟"/>
 			<DataGridViewCell name="Column4" HeaderText="用户"/>

GK-HTRB-C16P.Upgradation/bin/Upgradation/Languages/English.xml

@@ -774,7 +774,7 @@
 			<Control name="uiLabel16" text="Object info："/>
 		</Controls>
 		<DataGridViewCells>
-			<DataGridViewCell name="Column1" HeaderText="Pause Start"/>
+			<DataGridViewCell name="Column1" HeaderText="Pause/Stop Time"/>
 			<DataGridViewCell name="Column2" HeaderText="End"/>
 			<DataGridViewCell name="Column3" HeaderText="Minute"/>
 			<DataGridViewCell name="Column4" HeaderText="User"/>

GK-HTRB-C16P.Upgradation/obj/Debug/GK-HTRB-C16P.Upgradation.csproj.FileListAbsolute.txt

@@ -60,3 +60,4 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\obj\Debu
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\obj\Debug\GK-HTRB-.862196FD.Up2Date
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\obj\Debug\GK-HTRB-C16P.Upgradation.exe
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\obj\Debug\GK-HTRB-C16P.Upgradation.pdb
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GK-HTRB-C16P.Upgradation\bin\Upgradation\Newtonsoft.Json.xml

GKHTRBC16P.Bll/ParamterTimeBll.cs

@@ -32,7 +32,7 @@ namespace GKHTRBC16P.Bll
             using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.Conectionvoidstring()))
             {
                 cnn.Open();
-                paramter_Times = cnn.Query<Paramter_Time>("select * from Paramter_Time where ParmId = @ParmId;", new
+                paramter_Times = cnn.Query<Paramter_Time>("select * from Paramter_Time where status = 0 and ParmId = @ParmId;", new
                 {
                     ParmId = ParmId
                 }).ToList();

GKHTRBC16P.Bll/obj/Debug/GKHTRBC16P.Bll.csproj.FileListAbsolute.txt

@@ -42,3 +42,4 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\obj\Debug\GKHTRBC1
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\obj\Debug\GKHTRBC1.DFBB4EF2.Up2Date
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\obj\Debug\GKHTRBC16P.Bll.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\obj\Debug\GKHTRBC16P.Bll.pdb
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Bll\bin\Debug\Newtonsoft.Json.xml

GKHTRBC16P.Calibrationfm/FrmCalib.cs

@@ -23,8 +23,13 @@ namespace GKHTRBC16P.Calibrationfm
 
         private void FrmCalib_Load(object sender, EventArgs e)
         {
+            uPublic.WriteLog("进入:" + this.Text);
             LoadListBind();
         }
+        public override void Final()
+        {
+            uPublic.WriteLog("Exit:" + this.Text);
+        }
         private void LoadListBind()
         {
             uiListBox1.Items.Clear();

GKHTRBC16P.Calibrationfm/FrmCalibH3trb.cs

@@ -24,6 +24,7 @@ namespace GKHTRBC16P.Calibrationfm
         public double[] Kbread = new double[16];
         private void FrmCalibH3trb_Load(object sender, EventArgs e)
         {
+            uPublic.WriteLog("进入:" + this.Text);
             uiListBox1.Items.Clear();
             for (int i = 1; i <= CalculationAo.ThisDevConfig.Passageway; i++)
             {
@@ -32,6 +33,10 @@ namespace GKHTRBC16P.Calibrationfm
             uiListBox1.SelectedIndex = 0;
             LoadListBind();
         }
+        public override void Final()
+        {
+            uPublic.WriteLog("Exit:" + this.Text);
+        }
         private void LoadListBind()
         {
             if (uiListBox1.SelectedIndex < 0)

GKHTRBC16P.Calibrationfm/FrmCalibHighc.cs

@@ -34,6 +34,7 @@ namespace GKHTRBC16P.Calibrationfm
         byte Goby = 0;
         private void FrmCalibH3trb_Load(object sender, EventArgs e)
         {
+            uPublic.WriteLog("进入:" + this.Text);
             uiListBox1.Items.Clear();
             uiListBox2.Items.Clear();
             for (int i = 1; i <= CalculationAo.ThisDevConfig.Passageway; i++)
@@ -47,6 +48,7 @@ namespace GKHTRBC16P.Calibrationfm
         }
         public override void Final()
         {
+            uPublic.WriteLog("Exit:" + this.Text);
             workerThread.Abort();
         }
         private void LoadListBind()

GKHTRBC16P.Calibrationfm/FrmCalibHtgb.cs

@@ -23,6 +23,7 @@ namespace GKHTRBC16P.Calibrationfm
         }
         private void FrmCalibHtgb_Load(object sender, EventArgs e)
         {
+            uPublic.WriteLog("进入:" + this.Text);
             uiListBox1.Items.Clear();
             for (int i = 1; i <= CalculationAo.ThisDevConfig.Passageway; i++)
             {
@@ -30,6 +31,10 @@ namespace GKHTRBC16P.Calibrationfm
             }
             LoadListBind();
         }
+        public override void Final()
+        {
+            uPublic.WriteLog("Exit:" + this.Text);
+        }
         private void LoadListBind()
         {
 

GKHTRBC16P.Calibrationfm/FrmCalibText.cs

@@ -24,12 +24,16 @@ namespace GKHTRBC16P.Calibrationfm
         }
         private void FrmCalibText_Load(object sender, EventArgs e)
         {
+            uPublic.WriteLog("进入:" + this.Text);
             uiRadioButtonGroup1.SelectedIndex = 0;
             uiRadioButtonGroup2.SelectedIndex = 0;
             uiRadioButtonGroup3.SelectedIndex = 0;
             this.Text = "单工位系数--通道:" + Comaddr;
         }
-
+        public override void Final()
+        {
+            uPublic.WriteLog("Exit:" + this.Text);
+        }
         private void uiSymbolButton1_Click(object sender, EventArgs e)
         {
             try

GKHTRBC16P.Calibrationfm/FrmCalibgb80.cs

@@ -24,6 +24,7 @@ namespace GKHTRBC16P.Calibrationfm
         public double[] Kbread = new double[16];
         private void FrmCalibH3trb_Load(object sender, EventArgs e)
         {
+            uPublic.WriteLog("进入:" + this.Text);
             uiListBox1.Items.Clear();
             for (int i = 1; i <= CalculationAo.ThisDevConfig.Passageway; i++)
             {
@@ -32,6 +33,10 @@ namespace GKHTRBC16P.Calibrationfm
             uiListBox1.SelectedIndex = 0;
             LoadListBind();
         }
+        public override void Final()
+        {
+            uPublic.WriteLog("Exit:" + this.Text);
+        }
         private void LoadListBind()
         {
             if (uiListBox1.SelectedIndex < 0)

GKHTRBC16P.Calibrationfm/FrmRb40D.cs

@@ -23,6 +23,7 @@ namespace GKHTRBC16P.Calibrationfm
         }
         private void FrmCalibHtgb_Load(object sender, EventArgs e)
         {
+            uPublic.WriteLog("进入:" + this.Text);
             uiListBox1.Items.Clear();
             for (int i = 1; i <= CalculationAo.ThisDevConfig.Passageway; i++)
             {
@@ -30,6 +31,10 @@ namespace GKHTRBC16P.Calibrationfm
             }
             LoadListBind();
         }
+        public override void Final()
+        {
+            uPublic.WriteLog("Exit:" + this.Text);
+        }
         private void LoadListBind()
         {
 

GKHTRBC16P.Calibrationfm/FrmcailR80v6.cs

@@ -25,6 +25,7 @@ namespace GKHTRBC16P.Calibrationfm
         public double[] Kbread = new double[16];
         private void FrmcailR80v6_Load(object sender, EventArgs e)
         {
+            uPublic.WriteLog("进入:" + this.Text);
             uiListBox1.Items.Clear();
             for (int i = 1; i <= CalculationAo.ThisDevConfig.Passageway; i++)
             {
@@ -35,6 +36,10 @@ namespace GKHTRBC16P.Calibrationfm
             uiComboBox1.SelectedIndex = 0;
             LoadListBind();
         }
+        public override void Final()
+        {
+            uPublic.WriteLog("Exit:" + this.Text);
+        }
         private void LoadListBind()
         {
             if (uiListBox1.SelectedIndex < 0)

GKHTRBC16P.Calibrationfm/obj/Debug/GKHTRBC16P.Calibrationfm.csproj.FileListAbsolute.txt

@@ -80,3 +80,4 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\obj\Debu
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\obj\Debug\GKHTRBC1.82067B27.Up2Date
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\obj\Debug\GKHTRBC16P.Calibrationfm.exe
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\obj\Debug\GKHTRBC16P.Calibrationfm.pdb
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Calibrationfm\bin\Debug\Newtonsoft.Json.xml

GKHTRBC16P.Model/Com_Info.cs

-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -10,7 +11,7 @@ namespace GKHTRBC16P.Model
     {
         public int Id { get; set; }
 
-
+        [JsonIgnore]
         public byte[] BrImage { get; set; }
         public string Company { get; set; }
         public string Runame { get; set; }
@@ -19,17 +20,29 @@ namespace GKHTRBC16P.Model
         public string Website { get; set; }
         public string SoftIco { get; set; }
         public string Reserve1 { get; set; }
+        [JsonIgnore]
         public byte[] Black { get; set; }
+        [JsonIgnore]
         public byte[] Blue { get; set; }
+        [JsonIgnore]
         public byte[] Custom { get; set; }
+        [JsonIgnore]
         public byte[] DarkBlue { get; set; }
+        [JsonIgnore]
         public byte[] Gray { get; set; }
+        [JsonIgnore]
         public byte[] Green { get; set; }
+        [JsonIgnore]
         public byte[] LayuiGreen { get; set; }
+        [JsonIgnore]
         public byte[] LayuiOrange { get; set; }
+        [JsonIgnore]
         public byte[] LayuiRed { get; set; }
+        [JsonIgnore]
         public byte[] Orange { get; set; }
+        [JsonIgnore]
         public byte[] Purple { get; set; }
+        [JsonIgnore]
         public byte[] Red { get; set; }
         public string CreateTime { get; set; }
     }

GKHTRBC16P.Model/Dev_Config.cs

-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -54,6 +55,7 @@ namespace GKHTRBC16P.Model
         public int DeviceCode { get; set; }
         public int Editions { get; set; }
         public string EditionsDateTime { get; set; }
+        [JsonIgnore]
         public byte[] BrImage { get; set; }
         public string Language { get; set; }
         /// <summary>

GKHTRBC16P.Model/Dev_Device.cs

-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -19,7 +20,9 @@ namespace GKHTRBC16P.Model
         public decimal BackVol { get; set; }
         public decimal TjUpper { get; set; }
         public decimal Rqaw { get; set; }
+        [JsonIgnore]
         public byte[] AgeingImage { get; set; }
+        [JsonIgnore]
         public byte[] Devimage { get; set; }
         public decimal VgsP { get; set; }
         public decimal VgsN { get; set; }

GKHTRBC16P.Model/GKHTRBC16P.Model.csproj

@@ -32,6 +32,9 @@
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -91,5 +94,8 @@
     <Compile Include="CalibrationParameter.cs" />
     <Compile Include="Vgs_Data.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

GKHTRBC16P.Model/Paramter_Time.cs

@@ -13,6 +13,7 @@ namespace GKHTRBC16P.Model
         public string BeginTime { get; set; }
         public string EndTime { get; set; }
         public int TolTime { get; set; }
+        public string TolStatus { get; set; }
         public int Status { get; set; }
         public string UserId { get; set; }
         public string CreateTime { get; set; }

GKHTRBC16P.Model/obj/Debug/GKHTRBC16P.Model.csproj.CoreCompileInputs.cache

-6811b7547ffba2874c34bd1ac33047245e50f415b0cb10673568c36023b6fc8a
+97d95c62f66c20d76b0d568ceb1c5c7c3f58bd61841017829190d36937a86f89

GKHTRBC16P.Model/obj/Debug/GKHTRBC16P.Model.csproj.FileListAbsolute.txt

@@ -10,3 +10,6 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\bin\Debug\GKHTRB
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.csproj.AssemblyReference.cache
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.csproj.CoreCompileInputs.cache
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.pdb
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\bin\Debug\Newtonsoft.Json.dll
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\bin\Debug\Newtonsoft.Json.xml
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC1.4C7FFEC7.Up2Date

GKHTRBC16P.Model/packages.config

+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net46" />
+</packages>
\ No newline at end of file

GKHTRBC16P.Protocol/Driboard/H3trb.cs

@@ -136,6 +136,21 @@ namespace GKHTRBC16P.Protocol.Driboard
         /// <param name="Dev"></param>
         /// <returns></returns>
         public ushort FboarddataTestStatus(Form from, int Com, int Adr1, int cmd, int sernum, int status, int Dev)
+        {
+            ushort result = 3;
+            ushort cnum = 2;
+            while (result > 0 && cnum > 0)
+            {
+                result = FboarddataTestStatusTo(from, Com, Adr1, cmd, sernum, status, Dev);
+                if (result == 0)
+                {
+                    return result;
+                }
+                cnum--;
+            }
+            return result;
+        }
+        public ushort FboarddataTestStatusTo(Form from, int Com, int Adr1, int cmd, int sernum, int status, int Dev)
         {
             Monitor.Enter(SerialCom.ComWriteLock1[Com]);
             try

GKHTRBC16P.Protocol/Driboard/HighVol.cs

@@ -135,7 +135,22 @@ namespace GKHTRBC16P.Protocol.Driboard
         /// <param name="status"></param>
         /// <param name="Dev"></param>
         /// <returns></returns>
-        public ushort FboarddataTestStatus(Form from, int Com, int Adr1, int cmd, int sernum,double data, int status, int Dev)
+        public ushort FboarddataTestStatus(Form from, int Com, int Adr1, int cmd, int sernum, double data, int status, int Dev)
+        {
+            ushort result = 3;
+            ushort cnum = 2;
+            while (result > 0 && cnum > 0)
+            {
+                result = FboarddataTestStatusTo(from, Com, Adr1, cmd, sernum, data, status, Dev);
+                if (result == 0)
+                {
+                    return result;
+                }
+                cnum--;
+            }
+            return result;
+        }
+        public ushort FboarddataTestStatusTo(Form from, int Com, int Adr1, int cmd, int sernum,double data, int status, int Dev)
         {
             Monitor.Enter(SerialCom.ComWriteLock1[Com]);
             try

GKHTRBC16P.Protocol/Driboard/Htgb.cs

@@ -125,6 +125,21 @@ namespace GKHTRBC16P.Protocol.Driboard
         /// <param name="Dev"></param>
         /// <returns></returns>
         public ushort FboarddataTestStatus(Form from, int Com, int Adr1, int cmd, int sernum, int status, int Dev)
+        {
+            ushort result = 3;
+            ushort cnum = 2;
+            while (result > 0 && cnum > 0)
+            {
+                result = FboarddataTestStatusTo(from, Com, Adr1, cmd, sernum, status, Dev);
+                if (result == 0)
+                {
+                    return result;
+                }
+                cnum--;
+            }
+            return result;
+        }
+        public ushort FboarddataTestStatusTo(Form from, int Com, int Adr1, int cmd, int sernum, int status, int Dev)
         {
             Monitor.Enter(SerialCom.ComWriteLock1[Com]);
             try
@@ -211,6 +226,21 @@ namespace GKHTRBC16P.Protocol.Driboard
         /// <param name="Dev"></param>
         /// <returns></returns>
         public ushort FboarddataTestParm(Form from, int Com, int Adr1, int cmd, int sernum, int IsTop, int tds, int td, int ir1, decimal vol1, int swatchtime, int SupplyRGPW, int Dev)
+        {
+            ushort result = 3;
+            ushort cnum = 1;
+            while (result > 0 && cnum > 0)
+            {
+                result = FboarddataTestParmTo(from, Com, Adr1, cmd, sernum, IsTop, tds, td, ir1, vol1, swatchtime, SupplyRGPW, Dev);
+                if (result == 0)
+                {
+                    return result;
+                }
+                cnum--;
+            }
+            return result;
+        }
+        public ushort FboarddataTestParmTo(Form from, int Com, int Adr1, int cmd, int sernum, int IsTop, int tds, int td, int ir1, decimal vol1, int swatchtime, int SupplyRGPW, int Dev)
         {
             Monitor.Enter(SerialCom.ComWriteLock1[Com]);
             try

GKHTRBC16P.Protocol/Driboard/Htgb80.cs

@@ -140,6 +140,21 @@ namespace GKHTRBC16P.Protocol.Driboard
         /// <param name="Dev"></param>
         /// <returns></returns>
         public ushort FboarddataTestStatus(Form from, int Com, int Adr1, int cmd, int sernum, int status, int Dev)
+        {
+            ushort result = 3;
+            ushort cnum = 2;
+            while (result > 0 && cnum > 0)
+            {
+                result = FboarddataTestStatusTo(from, Com, Adr1, cmd, sernum, status, Dev);
+                if (result == 0)
+                {
+                    return result;
+                }
+                cnum--;
+            }
+            return result;
+        }
+        public ushort FboarddataTestStatusTo(Form from, int Com, int Adr1, int cmd, int sernum, int status, int Dev)
         {
             Monitor.Enter(SerialCom.ComWriteLock1[Com]);
             try
@@ -227,6 +242,21 @@ namespace GKHTRBC16P.Protocol.Driboard
         /// <param name="Dev"></param>
         /// <returns></returns>
         public ushort FboarddataTestParm(Form from, int Com, int Adr1, int cmd, int sernum, int tds, int Zf, int Dev)
+        {
+            ushort result = 3;
+            ushort cnum = 1;
+            while (result > 0 && cnum > 0)
+            {
+                result = FboarddataTestParmTo(from, Com, Adr1, cmd, sernum, tds, Zf, Dev);
+                if (result == 0)
+                {
+                    return result;
+                }
+                cnum--;
+            }
+            return result;
+        }
+        public ushort FboarddataTestParmTo(Form from, int Com, int Adr1, int cmd, int sernum, int tds, int Zf, int Dev)
         {
             Monitor.Enter(SerialCom.ComWriteLock1[Com]);
             try

GKHTRBC16P.Protocol/Driboard/R80v6.cs

@@ -144,6 +144,21 @@ namespace GKHTRBC16P.Protocol.Driboard
         /// <param name="Dev"></param>
         /// <returns></returns>
         public ushort FboarddataTestStatus(Form from, int Com, int Adr1, int cmd, int sernum, int status, int Dev)
+        {
+            ushort result = 3;
+            ushort cnum = 2;
+            while (result > 0 && cnum > 0)
+            {
+                result = FboarddataTestStatusTo(from, Com, Adr1, cmd, sernum, status, Dev);
+                if (result == 0)
+                {
+                    return result;
+                }
+                cnum--;
+            }
+            return result;
+        }
+        public ushort FboarddataTestStatusTo(Form from, int Com, int Adr1, int cmd, int sernum, int status, int Dev)
         {
             Monitor.Enter(SerialCom.ComWriteLock1[Com]);
             try
@@ -226,6 +241,21 @@ namespace GKHTRBC16P.Protocol.Driboard
             }
         }
         public ushort FboarddataTestDownVg(Form from, int Com, int Adr1, int cmd, int sernum, int status, int Dev)
+        {
+            ushort result = 3;
+            ushort cnum = 2;
+            while (result > 0 && cnum > 0)
+            {
+                result = FboarddataTestDownVgTo(from, Com, Adr1, cmd, sernum, status, Dev);
+                if (result == 0)
+                {
+                    return result;
+                }
+                cnum--;
+            }
+            return result;
+        }
+        public ushort FboarddataTestDownVgTo(Form from, int Com, int Adr1, int cmd, int sernum, int status, int Dev)
         {
             Monitor.Enter(SerialCom.ComWriteLock1[Com]);
             try
@@ -413,6 +443,21 @@ namespace GKHTRBC16P.Protocol.Driboard
         /// <param name="Dev"></param>
         /// <returns></returns>
         public ushort FboarddataTestCalibrationIni(Form from, int Com, int Adr1, int cmd, int sernum, string lint, int Dev)
+        {
+            ushort result = 3;
+            ushort cnum = 1;
+            while (result > 0 && cnum > 0)
+            {
+                result = FboarddataTestCalibrationIniTo(from, Com, Adr1, cmd, sernum, lint, Dev);
+                if (result == 0)
+                {
+                    return result;
+                }
+                cnum--;
+            }
+            return result;
+        }
+        public ushort FboarddataTestCalibrationIniTo(Form from, int Com, int Adr1, int cmd, int sernum, string lint, int Dev)
         {
             Monitor.Enter(SerialCom.ComWriteLock1[Com]);
             try
@@ -499,6 +544,21 @@ namespace GKHTRBC16P.Protocol.Driboard
         /// <param name="Dev"></param>
         /// <returns></returns>
         public ushort FboarddataTestCalibration2(Form from, int Com, int Adr1, int cmd, int sernum, string lint, int odata, int Dev)
+        {
+            ushort result = 3;
+            ushort cnum = 1;
+            while (result > 0 && cnum > 0)
+            {
+                result = FboarddataTestCalibration2To(from, Com, Adr1, cmd, sernum, lint, odata, Dev);
+                if (result == 0)
+                {
+                    return result;
+                }
+                cnum--;
+            }
+            return result;
+        }
+        public ushort FboarddataTestCalibration2To(Form from, int Com, int Adr1, int cmd, int sernum, string lint, int odata, int Dev)
         {
             Monitor.Enter(SerialCom.ComWriteLock1[Com]);
             try

GKHTRBC16P.Protocol/Driboard/Rb40D.cs

@@ -146,6 +146,21 @@ namespace GKHTRBC16P.Protocol.Driboard
         /// <param name="Dev"></param>
         /// <returns></returns>
         public ushort FboarddataTestStatus(Form from, int Com, int Adr1, int cmd, int sernum, int status, int Dev)
+        {
+            ushort result = 3;
+            ushort cnum = 2;
+            while (result > 0 && cnum > 0)
+            {
+                result = FboarddataTestStatusTo(from, Com, Adr1, cmd, sernum, status, Dev);
+                if (result == 0)
+                {
+                    return result;
+                }
+                cnum--;
+            }
+            return result;
+        }
+        public ushort FboarddataTestStatusTo(Form from, int Com, int Adr1, int cmd, int sernum, int status, int Dev)
         {
             Monitor.Enter(SerialCom.ComWriteLock1[Com]);
             try
@@ -216,7 +231,21 @@ namespace GKHTRBC16P.Protocol.Driboard
                 Monitor.Exit(SerialCom.ComWriteLock1[Com]);
             }
         }
-
+        public ushort FboarddataTestParm(Form from, int Com, int Adr1, int cmd, int sernum, int tds, int Zf, int Dev)
+        {
+            ushort result = 3;
+            ushort cnum = 1;
+            while (result > 0 && cnum > 0)
+            {
+                result = FboarddataTestParmTo(from, Com, Adr1, cmd, sernum, tds, Zf, Dev);
+                if (result == 0)
+                {
+                    return result;
+                }
+                cnum--;
+            }
+            return result;
+        }
         /// <summary>
         /// 1~12号板  充电命令  CMD=#12  设置
         /// </summary>
@@ -227,7 +256,7 @@ namespace GKHTRBC16P.Protocol.Driboard
         /// <param name="TjTime"></param>
         /// <param name="Dev"></param>
         /// <returns></returns>
-        public ushort FboarddataTestParm(Form from, int Com, int Adr1, int cmd, int sernum, int tds, int Zf, int Dev)
+        public ushort FboarddataTestParmTo(Form from, int Com, int Adr1, int cmd, int sernum, int tds, int Zf, int Dev)
         {
             Monitor.Enter(SerialCom.ComWriteLock1[Com]);
             try

GKHTRBC16P.Protocol/Driboard/Vgs.cs

@@ -144,7 +144,7 @@ namespace GKHTRBC16P.Protocol.Driboard
                 num[Dev - 1] = calcrc[0];
                 num[Dev] = calcrc[1];
                 string cmdStr = ConvertDataOpear.GetBytesString(num, 1, Dev, " ");
-                uPublic.WriteLog("通道" + Adr1+ ",Send data:" + cmdStr, "VGS");
+                uPublic.WritelogVgs("通道" + Adr1+ ",Send data:" + cmdStr);
                 SerialCom.SerialPort_Drive[Com].Write(num, 1, Dev);
                 //Thread.Sleep(300);
                 DateTime dt = DateTime.Now;
@@ -161,7 +161,7 @@ namespace GKHTRBC16P.Protocol.Driboard
                 senchr = new byte[513];
                 SerialCom.SerialPort_Drive[Com].Read(senchr, 0, 220);
                 string Str = ConvertDataOpear.GetBytesString(senchr, 0, 220, " ");
-                uPublic.WriteLog("通道" + Adr1 + ",receive data:" + Str, "VGS");
+                uPublic.WritelogVgs("通道" + Adr1 + ",receive data:" + Str);
                 for (int m = 0; m <= 299; m++)
                 {
                     comdata[m] = Convert.ToInt32(senchr[m]);
@@ -178,7 +178,7 @@ namespace GKHTRBC16P.Protocol.Driboard
             }
             catch (Exception ex)
             {
-                uPublic.WriteLog("VgsBoarddata error with message" + ex.StackTrace, "Error");
+                uPublic.WritelogVgs("VgsBoarddata error with message" + ex.StackTrace);
                 SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
                 comdata[10] = 1;
                 LogisTrac.WriteLog(t, ex);
@@ -224,7 +224,7 @@ namespace GKHTRBC16P.Protocol.Driboard
                 num[Dev - 1] = calcrc[0];
                 num[Dev] = calcrc[1];
                 string cmdStr = ConvertDataOpear.GetBytesString(num, 1, Dev, " ");
-                uPublic.WriteLog("通道" + Adr1 + ",Send data:" + cmdStr, "VgsCal");
+                uPublic.WritelogVgs("通道" + Adr1 + ",Send data:" + cmdStr);
                 SerialCom.SerialPort_Drive[Com].Write(num, 1, Dev);
                 DateTime dt = DateTime.Now;
                 while (SerialCom.SerialPort_Drive[Com].BytesToRead < 10)
@@ -240,7 +240,7 @@ namespace GKHTRBC16P.Protocol.Driboard
                 senchr = new byte[513];
                 SerialCom.SerialPort_Drive[Com].Read(senchr, 0, 300);
                 string Str = ConvertDataOpear.GetBytesString(senchr, 0, 220, " ");
-                uPublic.WriteLog("通道" + Adr1 + ",receive data:" + Str, "VGSCal");
+                uPublic.WritelogVgs("通道" + Adr1 + ",receive data:" + Str);
                 int[] comdata = new int[511];
                 for (int t = 0; t <= 299; t++)
                 {

GKHTRBC16P.Protocol/Driboard/VgsH2.cs

@@ -138,7 +138,7 @@ namespace GKHTRBC16P.Protocol.Driboard
                 num[Dev - 1] = calcrc[0];
                 num[Dev] = calcrc[1];
                 string cmdStr = ConvertDataOpear.GetBytesString(num, 1, Dev, " ");
-                uPublic.WriteLog("通道" + Adr1 + ",Send data:" + cmdStr, "VGS2");
+                uPublic.WritelogVgs("通道" + Adr1 + ",Send data:" + cmdStr);
                 SerialCom.SerialPort_Drive[Com].Write(num, 1, Dev);
                 //Thread.Sleep(300);
                 DateTime dt = DateTime.Now;
@@ -155,7 +155,7 @@ namespace GKHTRBC16P.Protocol.Driboard
                 senchr = new byte[80];
                 SerialCom.SerialPort_Drive[Com].Read(senchr, 0, 75);
                 string Str = ConvertDataOpear.GetBytesString(senchr, 0, 75, " ");
-                uPublic.WriteLog("通道" + Adr1 + ",receive data:" + Str, "VGS2");
+                uPublic.WritelogVgs("通道" + Adr1 + ",receive data:" + Str);
                 if (senchr[0] != senchr[1] || senchr[0] != 166 || senchr[68] != 11 || senchr[67] != 19)
                 {
                     LogisTrac.WriteLog(t, "接收数据异常" + SerialCom.SerialPort_Drive[Com].PortName);
@@ -172,7 +172,7 @@ namespace GKHTRBC16P.Protocol.Driboard
             }
             catch (Exception ex)
             {
-                uPublic.WriteLog("VgsBoarddata error with message" + ex.StackTrace, "Error");
+                uPublic.WritelogVgs("VgsBoarddata error with message" + ex.StackTrace);
                 SerialCom.OpenSerial_Drive_Close(Com, false);//关闭
                 comdata[10] = 1;
                 LogisTrac.WriteLog(t, ex);

GKHTRBC16P.Protocol/Driboard/Ynw.cs

@@ -7,6 +7,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace GKHTRBC16P.Protocol.Driboard
 {
@@ -166,6 +167,24 @@ namespace GKHTRBC16P.Protocol.Driboard
         public ushort FboarddataTestHrtbStatus(Form from, int Com, int Adr1, int Adr2, int Adr3, int Adr4, int Adr5, int Adr6, int Adr7, int Adr8, int Adr9, int Adr10, int Adr11, int Adr12,
             int Adr13, int Adr14, int Adr15, int Adr16, int Adr17, int Adr18, int Adr19, int Adr20, int Adr21, int Adr22, int Adr23, int Adr24, int Adr25, int Adr26, int Adr27,
             int Adr28, int Adr29, int Adr30, int Adr31, int Adr32, int Adr33, int Adr34, int Adr35, int Adr36, int Adr37, int Adr38, int Adr39, int Adr40, int chk, int Len)
+        {
+            ushort result = 3;
+            ushort cnum = 2;
+            while (result > 0 && cnum > 0)
+            {
+                result = FboarddataTestHrtbStatusto(from, Com, Adr1, Adr2,  Adr3, Adr4, Adr5, Adr6, Adr7, Adr8, Adr9, Adr10, Adr11, Adr12,Adr13, Adr14, Adr15, Adr16, Adr17, Adr18, Adr19, Adr20, Adr21, 
+                    Adr22, Adr23, Adr24, Adr25, Adr26, Adr27,Adr28, Adr29, Adr30, Adr31, Adr32, Adr33, Adr34, Adr35, Adr36, Adr37, Adr38, Adr39, Adr40, chk, Len);
+                if (result == 0)
+                {
+                    return result;
+                }
+                cnum--;
+            }
+            return result;
+        }
+        public ushort FboarddataTestHrtbStatusto(Form from, int Com, int Adr1, int Adr2, int Adr3, int Adr4, int Adr5, int Adr6, int Adr7, int Adr8, int Adr9, int Adr10, int Adr11, int Adr12,
+            int Adr13, int Adr14, int Adr15, int Adr16, int Adr17, int Adr18, int Adr19, int Adr20, int Adr21, int Adr22, int Adr23, int Adr24, int Adr25, int Adr26, int Adr27,
+            int Adr28, int Adr29, int Adr30, int Adr31, int Adr32, int Adr33, int Adr34, int Adr35, int Adr36, int Adr37, int Adr38, int Adr39, int Adr40, int chk, int Len)
         {
             Monitor.Enter(SerialCom.ComWriteLock1[Com]);
             try

GKHTRBC16P.Protocol/obj/Debug/GKHTRBC16P.Protocol.csproj.FileListAbsolute.txt

@@ -44,3 +44,4 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\obj\Debug\GKH
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\obj\Debug\GKHTRBC1.CA66D6C3.Up2Date
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\obj\Debug\GKHTRBC16P.Protocol.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\obj\Debug\GKHTRBC16P.Protocol.pdb
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Protocol\bin\Debug\Newtonsoft.Json.xml

GKHTRBC16P.Toolbox/ConvertDataOpear.cs

@@ -681,9 +681,12 @@ namespace GKHTRBC16P.Toolbox
         public static string StringRunState(string LangSign,int runflag,Test_Parameter tes)
         {
             string Result ="";
-            //Paramter_Time mtine = tes.ParamterTimeList.FirstOrDefault(x => x.TolTime < 0 && tes.Id !=0);
-            //if (mtine != null)
-            //    runflag = mtine.TolTime + 2;
+            if (tes.ParamterTimeList != null)
+            {
+                Paramter_Time mtine = tes.ParamterTimeList.FirstOrDefault(x => x.TolTime < 0 && tes.Id != 0);
+                if (mtine != null)
+                    runflag = mtine.TolTime + 2;
+            }
             if (LangSign == "ChineseSimplified")
             {
                 switch (runflag)

GKHTRBC16P.Toolbox/LogisTrac.cs

@@ -14,13 +14,11 @@ namespace GKHTRBC16P.Toolbox
         /// <param name="t"></param>
         /// <param name="ex"></param>
         #region static void WriteLog(Type t, Exception ex)
-
         public static void WriteLog(Type t, Exception ex)
         {
             log4net.ILog log = log4net.LogManager.GetLogger(t);
             log.Error("Error", ex);
         }
-
         #endregion
 
         /// <summary>
@@ -29,13 +27,11 @@ namespace GKHTRBC16P.Toolbox
         /// <param name="t"></param>
         /// <param name="msg"></param>
         #region static void WriteLog(Type t, string msg)
-
         public static void WriteLog(Type t, string msg)
         {
             log4net.ILog log = log4net.LogManager.GetLogger(t);
             log.Info(msg);
         }
-
         #endregion
 
     }

GKHTRBC16P.Toolbox/obj/Debug/GKHTRBC16P.Toolbox.csproj.FileListAbsolute.txt

@@ -40,3 +40,4 @@ E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\obj\Debug\GKHT
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\obj\Debug\GKHTRBC1.0B3BAC72.Up2Date
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\obj\Debug\GKHTRBC16P.Toolbox.dll
 E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\obj\Debug\GKHTRBC16P.Toolbox.pdb
+E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Toolbox\bin\Debug\Newtonsoft.Json.xml

GKHTRBC16P.Toolbox/uPublic.cs

@@ -19,22 +19,22 @@ namespace GKHTRBC16P.Toolbox
         /// <param name="key"></param>
         /// <returns></returns>
         /// <exception cref="Exception"></exception>
-        public static string  Prompt(string key ,string sType)
+        public static string Prompt(string key, string sType)
         {
             try
             {
                 XmlReader reader = null;
                 //判断是否存在该语言的配置文件
-                if (!(new System.IO.FileInfo("Languages/" + CalculationAo.ThisDevConfig.Language + ".xml")).Exists) 
-                    return "";               
-                else 
+                if (!(new System.IO.FileInfo("Languages/" + CalculationAo.ThisDevConfig.Language + ".xml")).Exists)
+                    return "";
+                else
                     reader = new XmlTextReader("Languages/" + CalculationAo.ThisDevConfig.Language + ".xml");
                 XmlDocument doc = new XmlDocument();
                 doc.Load(reader);
                 XmlNode root = doc.DocumentElement;
-                XmlNodeList nodeList = root.SelectNodes(sType+"/" + key + "");
+                XmlNodeList nodeList = root.SelectNodes(sType + "/" + key + "");
                 string aa = "";
-                if (nodeList.Count > 0) {  aa = nodeList[0].InnerText; }
+                if (nodeList.Count > 0) { aa = nodeList[0].InnerText; }
                 reader.Close();
                 reader.Dispose();
                 return aa;
@@ -58,11 +58,11 @@ namespace GKHTRBC16P.Toolbox
             }
         }
 
-        public static void WriteLog(string msg, string Filename)
+        public static void WritelogVgs(string msg)
         {
             lock (typeof(uGeneric))
             {
-                string filePath = AppDomain.CurrentDomain.BaseDirectory + "Log\\" + Filename + "\\";
+                string filePath = AppDomain.CurrentDomain.BaseDirectory + "Log\\Vgs\\";
                 if (!System.IO.Directory.Exists(filePath)) Directory.CreateDirectory(filePath);
                 string logPath = filePath + "\\" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt";
                 using (StreamWriter sw = File.AppendText(logPath))
@@ -102,7 +102,7 @@ namespace GKHTRBC16P.Toolbox
                 }
             }
         }
-        public static void WriteLiLog(Type type,string msg)
+        public static void WriteLiLog(Type type, string msg)
         {
             lock (type)
             {
@@ -128,9 +128,9 @@ namespace GKHTRBC16P.Toolbox
         /// <summary>
         /// 写记事本日志
         /// </summary>
-        /// <param name="msg">写记事本的内容</param>
+        /// <param name="msg">操作日志</param>
         /// <param name="ph"></param>
-        public static void WriteLog(string msg)
+        public static void WriteLog(string msg)//操作日志
         {
             lock (typeof(uPublic))
             {
@@ -147,12 +147,12 @@ namespace GKHTRBC16P.Toolbox
                         sw.Dispose();
                     }
                 }
-                catch 
-                {                 
+                catch
+                {
                 }
             }
         }
-    
 
-}
+
+    }
 }

GKHTRBC16P/FrmLogin.cs

@@ -15,6 +15,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using GKHTRBC16P.Protocol;
 using GKHTRBC16P.Drowing;
+using Newtonsoft.Json;
 
 namespace GKHTRBC16P
 {
@@ -90,7 +91,7 @@ namespace GKHTRBC16P
             }
             catch (Exception ex)
             {
-                LogisTrac.WriteLog(this.GetType(), ex);
+                uPublic.WriteLog("FrmLogin" + ex.StackTrace);
                 ShowErrorTip(ex.Message);
             }
         }
@@ -109,6 +110,7 @@ namespace GKHTRBC16P
         }
         public override void Final()
         {
+            uPublic.WriteLog("Exit:" + this.Text);
             Toolbox.HotKey.UnregisterHotKey(Handle, 100);
         }
         protected override void WndProc(ref Message m)
@@ -132,7 +134,7 @@ namespace GKHTRBC16P
             }
             catch (Exception ex)
             {
-                LogisTrac.WriteLog(this.GetType(), ex);
+                uPublic.WriteLog("WndProc"+ex.StackTrace);
                 ShowErrorTip(ex.Message);
             }
         }
@@ -170,7 +172,7 @@ namespace GKHTRBC16P
                 CalculationAo.ThisUser = userBll.Logines(Txt_Username.Text.Trim(), Password);
                 if (CalculationAo.ThisUser != null)
                 {
-                    LogisTrac.WriteLog(this.GetType(), "登录成功！");
+                    uPublic.WriteLog((sender as UISymbolButton).Text + ":登录成功"+ CalculationAo.ThisUser.UserName);
                     ComSetBll comSetBll = new ComSetBll();
                     SerialCom.Communication_Drive = comSetBll.Get(1);
                     SerialCom.Communication_Power = comSetBll.Get(2);
@@ -213,19 +215,21 @@ namespace GKHTRBC16P
                 else
                 {
                     Txt_Password.Text = "";
+                    uPublic.WriteLog((sender as UISymbolButton).Text + ":用户名或者密码错误");
                     this.Prompt("passerror");
                     //ShowErrorTip("用户名或者密码错误！");
                 }
             }
             catch (Exception ex)
             {
-                LogisTrac.WriteLog(this.GetType(), ex);
+                uPublic.WriteLog((sender as UISymbolButton).Text + ":" + ex.StackTrace);
                 ShowErrorTip(ex.Message);
             }
         }
 
         private void FrmLogin_Load(object sender, EventArgs e)
         {
+            uPublic.WriteLog("进入:" + this.Text);
             Toolbox.HotKey.RegisterHotKey(Handle, 100, Toolbox.HotKey.KeyModifiers.Alt, Keys.P);
         }