diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/bcd7ef97-8763-41fd-bf88-a8dd00701e73.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/28b10280-67a3-46f2-beca-82af14371307.vsidx
similarity index 94%
rename from ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/bcd7ef97-8763-41fd-bf88-a8dd00701e73.vsidx
rename to ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/28b10280-67a3-46f2-beca-82af14371307.vsidx
index 1d1291b..36691fc 100644
Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/bcd7ef97-8763-41fd-bf88-a8dd00701e73.vsidx and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/28b10280-67a3-46f2-beca-82af14371307.vsidx differ
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/8ff7fabd-e9bf-4374-814b-ddf3329203d7.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/8ff7fabd-e9bf-4374-814b-ddf3329203d7.vsidx
deleted file mode 100644
index 3eb66d7..0000000
Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/8ff7fabd-e9bf-4374-814b-ddf3329203d7.vsidx and /dev/null differ
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/bd843aae-b695-4b89-828a-e850504c1742.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/bd843aae-b695-4b89-828a-e850504c1742.vsidx
new file mode 100644
index 0000000..8f14490
Binary files /dev/null and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/bd843aae-b695-4b89-828a-e850504c1742.vsidx differ
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/7d6a8e15-dc9b-4de0-992e-beb4449825ba.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/e55c956b-7174-49d3-a2ec-11311d7e5e8e.vsidx
similarity index 50%
rename from ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/7d6a8e15-dc9b-4de0-992e-beb4449825ba.vsidx
rename to ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/e55c956b-7174-49d3-a2ec-11311d7e5e8e.vsidx
index 7d2375a..92e1b70 100644
Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/7d6a8e15-dc9b-4de0-992e-beb4449825ba.vsidx and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/e55c956b-7174-49d3-a2ec-11311d7e5e8e.vsidx differ
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo
index 32874e7..de6df3f 100644
Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo differ
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.Designer.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.Designer.cs
index a5e15de..5db2118 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.Designer.cs
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.Designer.cs
@@ -125,10 +125,8 @@
this.timerCycleGet = new System.Windows.Forms.Timer(this.components);
this.timerADCPSendTimes = new System.Windows.Forms.Timer(this.components);
this.timerUpgradeTime = new System.Windows.Forms.Timer(this.components);
- this.timerOpenCloseState = new System.Windows.Forms.Timer(this.components);
+ this.timerWaitOpen = new System.Windows.Forms.Timer(this.components);
this.timerStateCheck = new System.Windows.Forms.Timer(this.components);
- this.timerChangeLink = new System.Windows.Forms.Timer(this.components);
- this.timerChangeDisLink = new System.Windows.Forms.Timer(this.components);
this.serialPort = new System.IO.Ports.SerialPort(this.components);
this.pnlTitle.SuspendLayout();
this.pnlSearch.SuspendLayout();
@@ -1087,22 +1085,14 @@
//
this.timerUpgradeTime.Tick += new System.EventHandler(this.timerUpgradeTime_Tick);
//
- // timerOpenCloseState
+ // timerWaitOpen
//
- this.timerOpenCloseState.Tick += new System.EventHandler(this.timerOpenCloseState_Tick);
+ this.timerWaitOpen.Tick += new System.EventHandler(this.timerWaitOpen_Tick);
//
// timerStateCheck
//
this.timerStateCheck.Tick += new System.EventHandler(this.timerStateCheck_Tick);
//
- // timerChangeLink
- //
- this.timerChangeLink.Tick += new System.EventHandler(this.timerChangeLink_Tick);
- //
- // timerChangeDisLink
- //
- this.timerChangeDisLink.Tick += new System.EventHandler(this.timerChangeDisLink_Tick);
- //
// serialPort
//
this.serialPort.DataReceived += new System.IO.Ports.SerialDataReceivedEventHandler(this.serialPort_DataReceived);
@@ -1211,9 +1201,8 @@
private System.Windows.Forms.Label lblConnectState;
private System.Windows.Forms.Panel pnlData;
private System.Windows.Forms.Timer timerUpgradeTime;
- private System.Windows.Forms.Timer timerOpenCloseState;
+ private System.Windows.Forms.Timer timerWaitOpen;
private System.Windows.Forms.Timer timerStateCheck;
- private System.Windows.Forms.Timer timerChangeLink;
private System.Windows.Forms.DataGridViewTextBoxColumn columnId;
private System.Windows.Forms.DataGridViewTextBoxColumn columnTime;
private System.Windows.Forms.DataGridViewTextBoxColumn columnSpeed1;
@@ -1230,7 +1219,6 @@
private System.Windows.Forms.DataGridViewTextBoxColumn columnPeriod;
private System.Windows.Forms.DataGridViewTextBoxColumn columnWaveDirection;
private System.Windows.Forms.DataGridViewTextBoxColumn columnDepth;
- private System.Windows.Forms.Timer timerChangeDisLink;
private System.IO.Ports.SerialPort serialPort;
}
}
\ No newline at end of file
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.cs
index f9a3e4d..d62de5c 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.cs
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.cs
@@ -43,29 +43,27 @@ namespace ZTTMS_Manage_yibayiyi_20230320
Others.g_adcpReceive = false;
- //if (IfOpen() == "打开")
- //{
- // try
- // {
- // thConnect = new Thread(ListenConnect);
- // thConnect.IsBackground = true;
- // thConnect.Start();
+ if (IfOpen() == "打开")
+ {
+ try
+ {
+ thConnect = new Thread(ListenConnect);
+ thConnect.IsBackground = true;
+ thConnect.Start();
- // timerStateCheck.Enabled = true;
- // timerStateCheck.Interval = 30 * 1000;
- // timerStateCheck.Start();
- // }
- // catch (Exception ee)
- // {
- // Console.WriteLine("ADCPLinkError：" + ee.Message);
- // }
- //}
- //else
- //{
- // timerOpenCloseState.Interval = 1 * 60 * 1000;
- // timerOpenCloseState.Enabled = true;
- // timerOpenCloseState.Start();
- //}
+
+ }
+ catch (Exception ee)
+ {
+ Console.WriteLine("ADCPLinkError：" + ee.Message);
+ }
+ }
+ else
+ {
+ timerWaitOpen.Interval = 1 * 60 * 1000;
+ timerWaitOpen.Enabled = true;
+ timerWaitOpen.Start();
+ }
}
string openCloseState = "";
@@ -1098,10 +1096,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320
chkPeriod.Checked = true;
chkWaveLocation.Checked = true;
chkDepth.Checked = true;
-
- //timerChangeLink.Enabled = true;
- //timerChangeLink.Interval = 5 * 1000;
- //timerChangeLink.Start();
}
private void ADCPDataForm_Shown(object sender, EventArgs e)
@@ -1366,6 +1360,10 @@ namespace ZTTMS_Manage_yibayiyi_20230320
timerADCPSendTimes.Interval = 1 * 60 * 100;
timerADCPSendTimes.Start();
+ timerStateCheck.Enabled = true;
+ timerStateCheck.Interval = 10 * 1000;
+ timerStateCheck.Start();
+
EveryDayLog.WriteADCP("ADCP传感器已连接！");
}
else
@@ -1456,27 +1454,57 @@ namespace ZTTMS_Manage_yibayiyi_20230320
EveryDayLog.WriteADCP("ADCP的通信连接已断开！");
}
- private void timerOpenCloseState_Tick(object sender, EventArgs e)
+ //若打开程序时，ADCP未开始供电，则开始定时监测上电
+ private void timerWaitOpen_Tick(object sender, EventArgs e)
{
- if (IfOpen() == "打开")
+ if (Others.isADCPWork)
{
- timerOpenCloseState.Enabled = false;
- timerOpenCloseState.Stop();
-
try
{
thConnect = new Thread(ListenConnect);
thConnect.IsBackground = true;
thConnect.Start();
-
- timerStateCheck.Enabled = true;
- timerStateCheck.Interval = 30 * 1000;
- timerStateCheck.Start();
}
catch (Exception ee)
{
Console.WriteLine("ADCPLinkError：" + ee.Message);
}
+
+ timerWaitOpen.Enabled = false;
+ timerWaitOpen.Stop();
+ }
+ }
+
+ private void timerStateCheck_Tick(object sender, EventArgs e)
+ {
+ if (!Others.isADCPWork)
+ {
+ Others.g_adcpReceive = false;
+
+ Console.WriteLine("ADCP的通信连接已断开！");
+ CallInvokeUIUpdate("UpdateState", "连接断开");
+
+ if (serialPort == null)
+ {
+ EveryDayLog.WriteADCP("ADCP的通信连接已断开！");
+ return;
+ }
+
+ if (serialPort.IsOpen)
+ {
+ serialPort.Close();
+ serialPort.Dispose();
+ }
+
+ ConnectDispose();
+
+ timerStateCheck.Enabled = false;
+ timerStateCheck.Stop();
+
+ //开始监测何时重新上电
+ timerWaitOpen.Interval = 1 * 30 * 1000;
+ timerWaitOpen.Enabled = true;
+ timerWaitOpen.Start();
}
}
#endregion
@@ -1712,84 +1740,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320
dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59);
}
- private void timerStateCheck_Tick(object sender, EventArgs e)
- {
- if (!Others.isADCPWork)
- {
- Others.g_adcpReceive = false;
-
- Console.WriteLine("ADCP的通信连接已断开！");
- CallInvokeUIUpdate("UpdateState", "连接断开");
-
- if (serialPort == null)
- {
- EveryDayLog.WriteADCP("ADCP的通信连接已断开！");
- return;
- }
-
- if (serialPort.IsOpen)
- {
- serialPort.Close();
- serialPort.Dispose();
- }
-
- //ConnectDispose();
-
- timerStateCheck.Enabled = false;
- timerStateCheck.Stop();
- }
- //else
- //{
- // if (Others.g_adcpReceive == false || clientADCP == null || !clientADCP.Connected)
- // {
- // try
- // {
- // thConnect = new Thread(ListenConnect);
- // thConnect.IsBackground = true;
- // thConnect.Start();
- // }
- // catch (Exception ee)
- // {
- // Console.WriteLine("ADCPLinkError：" + ee.Message);
- // }
- // }
- // else
- // {
- // Console.WriteLine("ADCP Is Connected!");
- // }
- //}
- }
-
-
- private void timerChangeLink_Tick(object sender, EventArgs e)
- {
- if (Others.isADCPWork)
- {
- CallInvokeUIUpdate("UpdateState", "连接成功");
-
- timerChangeLink.Enabled = false;
- timerChangeLink.Stop();
-
- timerADCPSendTimes.Enabled = true;
- timerADCPSendTimes.Interval = 1 * 60 * 100;
- timerADCPSendTimes.Start();
- }
- }
-
- private void timerChangeDisLink_Tick(object sender, EventArgs e)
- {
- if (!Others.isADCPWork)
- {
- CallInvokeUIUpdate("UpdateState", "连接断开");
-
- timerADCPSendTimes.Enabled = false;
- timerADCPSendTimes.Stop();
-
- timerChangeLink.Enabled = true;
- timerChangeLink.Interval = 5 * 1000;
- timerChangeLink.Start();
- }
- }
public void ADCPDataForm_FormClosing(object sender, FormClosingEventArgs e)
{
@@ -1815,14 +1765,10 @@ namespace ZTTMS_Manage_yibayiyi_20230320
timerADCPSendTimes.Stop();
timerUpgradeTime.Enabled = false;
timerUpgradeTime.Stop();
- timerOpenCloseState.Enabled = false;
- timerOpenCloseState.Stop();
+ timerWaitOpen.Enabled = false;
+ timerWaitOpen.Stop();
timerStateCheck.Enabled = false;
timerStateCheck.Stop();
- timerChangeDisLink.Enabled = false;
- timerChangeDisLink.Stop();
- timerChangeLink.Enabled = false;
- timerChangeLink.Stop();
}
catch (Exception ex)
{
@@ -1831,6 +1777,5 @@ namespace ZTTMS_Manage_yibayiyi_20230320
}
}
-
}
}
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.resx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.resx
index a54b091..1c020f8 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.resx
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.resx
@@ -174,18 +174,12 @@
440, 17
-
+
603, 17
781, 17
-
- 930, 17
-
-
- 17, 55
-
333, 17
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.Designer.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.Designer.cs
index e5737b8..aaa22be 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.Designer.cs
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.Designer.cs
@@ -79,10 +79,8 @@
this.label17 = new System.Windows.Forms.Label();
this.timerCO2SendTimes = new System.Windows.Forms.Timer(this.components);
this.timerUpgradeTime = new System.Windows.Forms.Timer(this.components);
- this.timerOpenCloseState = new System.Windows.Forms.Timer(this.components);
+ this.timerWaitOpen = new System.Windows.Forms.Timer(this.components);
this.timerStateCheck = new System.Windows.Forms.Timer(this.components);
- this.timerChangeLink = new System.Windows.Forms.Timer(this.components);
- this.timerChangeDisLink = new System.Windows.Forms.Timer(this.components);
((System.ComponentModel.ISupportInitialize)(this.dgvDataDisplay)).BeginInit();
this.pnlSearch.SuspendLayout();
this.pnlSensorData.SuspendLayout();
@@ -642,22 +640,14 @@
//
this.timerUpgradeTime.Tick += new System.EventHandler(this.timerUpgradeTime_Tick);
//
- // timerOpenCloseState
+ // timerWaitOpen
//
- this.timerOpenCloseState.Tick += new System.EventHandler(this.timerOpenCloseState_Tick);
+ this.timerWaitOpen.Tick += new System.EventHandler(this.timerWaitOpen_Tick);
//
// timerStateCheck
//
this.timerStateCheck.Tick += new System.EventHandler(this.timerStateCheck_Tick);
//
- // timerChangeLink
- //
- this.timerChangeLink.Tick += new System.EventHandler(this.timerChangeLink_Tick);
- //
- // timerChangeDisLink
- //
- this.timerChangeDisLink.Tick += new System.EventHandler(this.timerChangeDisLink_Tick);
- //
// CO2DataForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -750,12 +740,10 @@
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Timer timerCO2SendTimes;
private System.Windows.Forms.Timer timerUpgradeTime;
- private System.Windows.Forms.Timer timerOpenCloseState;
+ private System.Windows.Forms.Timer timerWaitOpen;
private System.Windows.Forms.Timer timerStateCheck;
private System.Windows.Forms.DataGridViewTextBoxColumn columnId;
private System.Windows.Forms.DataGridViewTextBoxColumn columnTime;
private System.Windows.Forms.DataGridViewTextBoxColumn columnPotency;
- private System.Windows.Forms.Timer timerChangeLink;
- private System.Windows.Forms.Timer timerChangeDisLink;
}
}
\ No newline at end of file
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.cs
index 607ee9f..dd93494 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.cs
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.cs
@@ -38,30 +38,26 @@ namespace ZTTMS_Manage_yibayiyi_20230320
Others.g_co2Receive = false;
- //if (IfOpen() == "打开")
- //{
- // try
- // {
- // thConnect = new Thread(ListenConnect);
- // thConnect.IsBackground = true;
- // thConnect.Start();
-
- // timerStateCheck.Enabled = true;
- // timerStateCheck.Interval = 5 * 1000;
- // timerStateCheck.Start();
- // }
- // catch (Exception ee)
- // {
- // Console.WriteLine("CO2LinkError：" + ee.Message);
- // EveryDayLog.WriteErrorCO2("CO2LinkError：" + ee.Message);
- // }
- //}
- //else
- //{
- // timerOpenCloseState.Interval = 1 * 60 * 1000;
- // timerOpenCloseState.Enabled = true;
- // timerOpenCloseState.Start();
- //}
+ if (IfOpen() == "打开")
+ {
+ try
+ {
+ thConnect = new Thread(ListenConnect);
+ thConnect.IsBackground = true;
+ thConnect.Start();
+ }
+ catch (Exception ee)
+ {
+ Console.WriteLine("CO2LinkError：" + ee.Message);
+ EveryDayLog.WriteErrorCO2("CO2LinkError：" + ee.Message);
+ }
+ }
+ else
+ {
+ timerWaitOpen.Interval = 1 * 60 * 1000;
+ timerWaitOpen.Enabled = true;
+ timerWaitOpen.Start();
+ }
}
string openCloseState = "";
@@ -148,7 +144,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320
int reConnectTime = 0;
- string ip = "41.244.64.66";
+ string ip = Others.IP;
int port = 4002;
Thread thReceive = null;
@@ -372,10 +368,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320
//dgvDataDisplay.Visible = true;
chkConc.Checked = true;
-
- //timerChangeLink.Enabled = true;
- //timerChangeLink.Interval = 5 * 1000;
- //timerChangeLink.Start();
}
private void ElectDataForm_Shown(object sender, EventArgs e)
@@ -658,6 +650,10 @@ namespace ZTTMS_Manage_yibayiyi_20230320
timerCO2SendTimes.Interval = 1 * 40 * 100;
timerCO2SendTimes.Start();
+ timerStateCheck.Enabled = true;
+ timerStateCheck.Interval = 10 * 1000;
+ timerStateCheck.Start();
+
thReceive = new Thread(DataReceive);
thReceive.IsBackground = true;
thReceive.Start();
@@ -863,33 +859,57 @@ namespace ZTTMS_Manage_yibayiyi_20230320
EveryDayLog.WriteCO2("CO2传感器的通信连接已断开！");
}
- private void timerOpenCloseState_Tick(object sender, EventArgs e)
+ private void timerWaitOpen_Tick(object sender, EventArgs e)
{
if (Others.isCO2Work)
{
- timerOpenCloseState.Enabled = false;
- timerOpenCloseState.Stop();
-
try
{
thConnect = new Thread(ListenConnect);
thConnect.IsBackground = true;
thConnect.Start();
-
- timerStateCheck.Enabled = true;
- timerStateCheck.Interval = 5 * 1000;
- timerStateCheck.Start();
}
catch (Exception ee)
{
Console.WriteLine("CO2LinkError：" + ee.Message);
EveryDayLog.WriteErrorCO2("CO2LinkError：" + ee.Message);
}
+
+ timerWaitOpen.Enabled = false;
+ timerWaitOpen.Stop();
+ }
+ }
+
+ private void timerStateCheck_Tick(object sender, EventArgs e)
+ {
+ if (!Others.isCO2Work)
+ {
+ Others.g_co2Receive = false;
+
+ Console.WriteLine("CO2传感器的通信连接已断开！");
+ CallInvokeUIUpdate("UpdateState", "连接断开");
+
+ if (clientCO2 == null)
+ {
+ EveryDayLog.WriteCO2("CO2传感器的通信连接已断开！");
+ return;
+ }
+
+ if (clientCO2.Connected)
+ {
+ clientCO2.Close();
+ clientCO2.Dispose();
+ }
+
+ ConnectDispose();
+
+ timerStateCheck.Enabled = false;
+ timerStateCheck.Stop();
+
+ timerWaitOpen.Interval = 1 * 30 * 1000;
+ timerWaitOpen.Enabled = true;
+ timerWaitOpen.Start();
}
- //else
- //{
- // ConnectDispose();
- //}
}
#endregion
@@ -1242,84 +1262,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320
dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59);
}
- private void timerStateCheck_Tick(object sender, EventArgs e)
- {
- if (!Others.isCO2Work)
- {
- Others.g_co2Receive = false;
-
- Console.WriteLine("CO2传感器的通信连接已断开！");
- CallInvokeUIUpdate("UpdateState", "连接断开");
-
- if (clientCO2 == null)
- {
- EveryDayLog.WriteCO2("CO2传感器的通信连接已断开！");
- return;
- }
-
- if (clientCO2.Connected)
- {
- clientCO2.Close();
- clientCO2.Dispose();
- }
-
- //ConnectDispose();
-
- timerStateCheck.Enabled = false;
- timerStateCheck.Stop();
- }
- //else
- //{
- // if (Others.g_co2Receive == false || clientCO2 == null || !clientCO2.Connected)
- // {
- // try
- // {
- // thConnect = new Thread(ListenConnect);
- // thConnect.IsBackground = true;
- // thConnect.Start();
- // }
- // catch (Exception ee)
- // {
- // Console.WriteLine("CO2LinkError：" + ee.Message);
- // }
- // }
- // else
- // {
- // Console.WriteLine("CO2 Is Connected!");
- // }
- //}
- }
-
- private void timerChangeLink_Tick(object sender, EventArgs e)
- {
- if (Others.isCO2Work)
- {
- CallInvokeUIUpdate("UpdateState", "连接成功");
-
- timerChangeLink.Enabled = false;
- timerChangeLink.Stop();
-
- timerCO2SendTimes.Enabled = true;
- timerCO2SendTimes.Interval = 1 * 60 * 100;
- timerCO2SendTimes.Start();
- }
- }
-
- private void timerChangeDisLink_Tick(object sender, EventArgs e)
- {
- if (!Others.isCO2Work)
- {
- CallInvokeUIUpdate("UpdateState", "连接失败");
-
- timerCO2SendTimes.Enabled = false;
- timerCO2SendTimes.Stop();
-
- timerChangeLink.Enabled = true;
- timerChangeLink.Interval = 5 * 1000;
- timerChangeLink.Start();
- }
- }
-
public void CO2DataForm_FormClosing(object sender, FormClosingEventArgs e)
{
try
@@ -1342,14 +1284,10 @@ namespace ZTTMS_Manage_yibayiyi_20230320
timerCO2SendTimes.Stop();
timerUpgradeTime.Enabled = false;
timerUpgradeTime.Stop();
- timerOpenCloseState.Enabled = false;
- timerOpenCloseState.Stop();
+ timerWaitOpen.Enabled = false;
+ timerWaitOpen.Stop();
timerStateCheck.Enabled = false;
timerStateCheck.Stop();
- timerChangeLink.Enabled = false;
- timerChangeLink.Stop();
- timerChangeDisLink.Enabled = false;
- timerChangeDisLink.Stop();
}
catch (Exception ex)
{
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.resx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.resx
index e8a1d16..4b2a8bf 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.resx
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.resx
@@ -127,21 +127,15 @@
True
- 152, 17
+ 8, 8
- 906, 17
+ 185, 12
-
- 1247, 17
+
+ 347, 18
- 1425, 17
-
-
- 17, 56
-
-
- 166, 50
+ 525, 18
\ No newline at end of file
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.Designer.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.Designer.cs
index 4ec4bf6..25554fb 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.Designer.cs
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.Designer.cs
@@ -76,7 +76,7 @@
this.timerCycleGet = new System.Windows.Forms.Timer(this.components);
this.rtbDataAnalysis = new System.Windows.Forms.RichTextBox();
this.timerUpgradeTime = new System.Windows.Forms.Timer(this.components);
- this.timerOpenCloseState = new System.Windows.Forms.Timer(this.components);
+ this.timerWaitOpen = new System.Windows.Forms.Timer(this.components);
this.timerStateCheck = new System.Windows.Forms.Timer(this.components);
this.pnlTitle.SuspendLayout();
this.pnlSearch.SuspendLayout();
@@ -578,9 +578,9 @@
//
this.timerUpgradeTime.Tick += new System.EventHandler(this.timerUpgradeTime_Tick);
//
- // timerOpenCloseState
+ // timerWaitOpen
//
- this.timerOpenCloseState.Tick += new System.EventHandler(this.timerOpenCloseState_Tick);
+ this.timerWaitOpen.Tick += new System.EventHandler(this.timerWaitOpen_Tick);
//
// timerStateCheck
//
@@ -661,7 +661,7 @@
public System.Windows.Forms.TextBox txtCycle;
public System.Windows.Forms.CheckBox chkCycleGet;
private System.Windows.Forms.Timer timerUpgradeTime;
- private System.Windows.Forms.Timer timerOpenCloseState;
+ private System.Windows.Forms.Timer timerWaitOpen;
private System.Windows.Forms.Timer timerStateCheck;
private System.Windows.Forms.DataGridViewTextBoxColumn columnId;
private System.Windows.Forms.DataGridViewTextBoxColumn columnTime;
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.cs
index 27bee4e..47e8f14 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.cs
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.cs
@@ -42,30 +42,26 @@ namespace ZTTMS_Manage_yibayiyi_20230320
gDevConnSerialHandleBuf[i] = new DevSerialRecvHandle();
}
- //if (IfOpen() == "打开")
- //{
- // try
- // {
- // thConnect = new Thread(ListenConnect);
- // thConnect.IsBackground = true;
- // thConnect.Start();
-
- // timerStateCheck.Enabled = true;
- // timerStateCheck.Interval = 5 * 1000;
- // timerStateCheck.Start();
- // }
- // catch (Exception ee)
- // {
- // Console.WriteLine("CTDLinkError：" + ee.Message);
- // EveryDayLog.WriteErrorCTD("CTDLinkError：" + ee.Message);
- // }
- //}
- //else
- //{
- // timerOpenCloseState.Interval = 1 * 30 * 1000;
- // timerOpenCloseState.Enabled = true;
- // timerOpenCloseState.Start();
- //}
+ if (IfOpen() == "打开")
+ {
+ try
+ {
+ thConnect = new Thread(ListenConnect);
+ thConnect.IsBackground = true;
+ thConnect.Start();
+ }
+ catch (Exception ee)
+ {
+ Console.WriteLine("CTDLinkError：" + ee.Message);
+ EveryDayLog.WriteErrorCTD("CTDLinkError：" + ee.Message);
+ }
+ }
+ else
+ {
+ timerWaitOpen.Interval = 1 * 60 * 1000;
+ timerWaitOpen.Enabled = true;
+ timerWaitOpen.Start();
+ }
}
string openCloseState = "";
@@ -153,7 +149,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320
int reConnectTime = 0;
- string ip = "41.244.64.66";
+ string ip = Others.IP;
int port = 4004;
Thread thReceive = null;
@@ -957,6 +953,10 @@ namespace ZTTMS_Manage_yibayiyi_20230320
CallInvokeUIUpdate("UpdateState", "连接成功");
+ timerStateCheck.Enabled = true;
+ timerStateCheck.Interval = 10 * 1000;
+ timerStateCheck.Start();
+
thReceive = new Thread(DataReceive);
thReceive.IsBackground = true;
thReceive.Start();
@@ -1050,7 +1050,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320
Console.WriteLine("连接成功");
CallInvokeUIUpdate("UpdateState", "连接成功");
- //thConnect.Abort();
return true;
}
@@ -1164,32 +1163,57 @@ namespace ZTTMS_Manage_yibayiyi_20230320
EveryDayLog.WriteCTD("CTD的通信连接已断开！");
}
- private void timerOpenCloseState_Tick(object sender, EventArgs e)
+ private void timerWaitOpen_Tick(object sender, EventArgs e)
{
if (Others.isCTDWork)
{
- timerOpenCloseState.Enabled = false;
- timerOpenCloseState.Stop();
+ timerWaitOpen.Enabled = false;
+ timerWaitOpen.Stop();
try
{
thConnect = new Thread(ListenConnect);
thConnect.IsBackground = true;
thConnect.Start();
-
- timerStateCheck.Enabled = true;
- timerStateCheck.Interval = 5 * 1000;
- timerStateCheck.Start();
}
catch (Exception ee)
{
Console.WriteLine("CTDLinkError：" + ee.Message);
}
}
- //else
- //{
- // ConnectDispose();
- //}
+ }
+
+ private void timerStateCheck_Tick(object sender, EventArgs e)
+ {
+ if (!Others.isCTDWork)
+ {
+ Others.g_ctdReceive = false;
+
+ Console.WriteLine("CTD的通信连接已断开！");
+
+ CallInvokeUIUpdate("UpdateState", "连接断开");
+
+ if (clientCTD == null)
+ {
+ EveryDayLog.WriteCTD("CTD的通信连接已断开！");
+ return;
+ }
+
+ if (clientCTD.Connected)
+ {
+ clientCTD.Close();
+ clientCTD.Dispose();
+ }
+
+ ConnectDispose();
+
+ timerStateCheck.Enabled = false;
+ timerStateCheck.Stop();
+
+ timerWaitOpen.Interval = 1 * 30 * 1000;
+ timerWaitOpen.Enabled = true;
+ timerWaitOpen.Start();
+ }
}
#endregion
@@ -1580,54 +1604,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320
}
}
- private void timerStateCheck_Tick(object sender, EventArgs e)
- {
- if (!Others.isCTDWork)
- {
- Others.g_ctdReceive = false;
-
- Console.WriteLine("CTD的通信连接已断开！");
-
- CallInvokeUIUpdate("UpdateState", "连接断开");
-
- if (clientCTD == null)
- {
- EveryDayLog.WriteCTD("CTD的通信连接已断开！");
- return;
- }
-
- if (clientCTD.Connected)
- {
- clientCTD.Close();
- clientCTD.Dispose();
- }
-
- //ConnectDispose();
-
- timerStateCheck.Enabled = false;
- timerStateCheck.Stop();
- }
- //else
- //{
- //if (Others.g_ctdReceive == false || clientCTD == null || !clientCTD.Connected)
- //{
- // try
- // {
- // thConnect = new Thread(ListenConnect);
- // thConnect.IsBackground = true;
- // thConnect.Start();
- // }
- // catch (Exception ee)
- // {
- // Console.WriteLine("CTDLinkError：" + ee.Message);
- // }
- //}
- //else
- //{
- // Console.WriteLine("CTD Is Connected!");
- //}
- //}
- }
public void CTDDataForm_FormClosing(object sender, FormClosingEventArgs e)
{
@@ -1651,8 +1627,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320
timerCycleGet.Stop();
timerUpgradeTime.Enabled = false;
timerUpgradeTime.Stop();
- timerOpenCloseState.Enabled = false;
- timerOpenCloseState.Stop();
+ timerWaitOpen.Enabled = false;
+ timerWaitOpen.Stop();
timerStateCheck.Enabled = false;
timerStateCheck.Stop();
}
@@ -1663,6 +1639,5 @@ namespace ZTTMS_Manage_yibayiyi_20230320
}
}
-
}
}
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.resx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.resx
index 296810b..7950253 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.resx
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.resx
@@ -141,7 +141,7 @@
242, 17
-
+
405, 16
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs
index 59aa91e..86c53db 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs
@@ -386,8 +386,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320
g_serialSyncTime = 0;
g_serialFileTransfer = 0;
- g_ip = "41.244.64.66";
- //g_ip = "127.0.0.1";
+ g_ip = Others.IP;
//端口号赋初始值
g_port = 4007;
@@ -508,25 +507,25 @@ namespace ZTTMS_Manage_yibayiyi_20230320
btnRealTimeData_Click(null, new EventArgs());
- //try
- //{
- // trdConnect = new Thread(ListenConnect);
- // trdConnect.IsBackground = true;
- // trdConnect.Start();
+ try
+ {
+ trdConnect = new Thread(ListenConnect);
+ trdConnect.IsBackground = true;
+ trdConnect.Start();
- // trdDataSplit = new Thread(DataSplit);
- // trdDataSplit.IsBackground = true;
- // trdDataSplit.Start();
+ trdDataSplit = new Thread(DataSplit);
+ trdDataSplit.IsBackground = true;
+ trdDataSplit.Start();
- // trdDataAnalysis = new Thread(DataAnalysis);
- // trdDataAnalysis.IsBackground = true;
- // trdDataAnalysis.Start();
- //}
- //catch (Exception ee)
- //{
- // Console.WriteLine("LinkError：" + ee.Message);
- // EveryDayLog.WriteErrorDZ("建立连接Error：" + ee.Message);
- //}
+ trdDataAnalysis = new Thread(DataAnalysis);
+ trdDataAnalysis.IsBackground = true;
+ trdDataAnalysis.Start();
+ }
+ catch (Exception ee)
+ {
+ Console.WriteLine("LinkError：" + ee.Message);
+ EveryDayLog.WriteErrorDZ("建立连接Error：" + ee.Message);
+ }
//timerContinueRecord.Interval = 60 * 1000;
//timerContinueRecord.Enabled = true;
@@ -1952,7 +1951,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320
newCheckCode = Others.CRC(g_checkBuffer.ToArray());
//CRC校验通过
- if (newCheckCode == dataTemp[dataTemp.Length - 2] && dataTemp[3] == 0x00 && dataTemp[4] == 0x00 && dataTemp[5] == 0x00 && dataTemp[6] == 0xc9 && dataTemp[7] == 0x00 && dataTemp[8] == 0x00 && dataTemp[9] == 0x00 && dataTemp[10] == 0x03)
+ if (newCheckCode == dataTemp[dataTemp.Length - 2] && dataTemp[3] == 0x00 && dataTemp[4] == 0x00 && dataTemp[5] == 0x00 && dataTemp[6] == 0xc9 && dataTemp[7] == 0x00 && dataTemp[8] == 0x00 && dataTemp[9] == 0x00 && dataTemp[10] == Others.DZID)
{
//终端通用应答
if (dataTemp[1] == 0x00 && dataTemp[2] == 0x00)
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.Designer.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.Designer.cs
index 97ab79c..ca99fad 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.Designer.cs
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.Designer.cs
@@ -124,7 +124,7 @@
this.lblMaxChl = new System.Windows.Forms.Label();
this.label45 = new System.Windows.Forms.Label();
this.timerUpgradeTime = new System.Windows.Forms.Timer(this.components);
- this.timerOpenCloseState = new System.Windows.Forms.Timer(this.components);
+ this.timerWaitOpen = new System.Windows.Forms.Timer(this.components);
this.timerStateCheck = new System.Windows.Forms.Timer(this.components);
this.pnlTitle.SuspendLayout();
this.pnlSearch.SuspendLayout();
@@ -1138,9 +1138,9 @@
//
this.timerUpgradeTime.Tick += new System.EventHandler(this.timerUpgradeTime_Tick);
//
- // timerOpenCloseState
+ // timerWaitOpen
//
- this.timerOpenCloseState.Tick += new System.EventHandler(this.timerOpenCloseState_Tick);
+ this.timerWaitOpen.Tick += new System.EventHandler(this.timerWaitOpen_Tick);
//
// timerStateCheck
//
@@ -1304,7 +1304,7 @@
public System.Windows.Forms.TextBox txtCycle;
public System.Windows.Forms.CheckBox chkCycleGet;
private System.Windows.Forms.Timer timerUpgradeTime;
- private System.Windows.Forms.Timer timerOpenCloseState;
+ private System.Windows.Forms.Timer timerWaitOpen;
private System.Windows.Forms.Timer timerStateCheck;
private System.Windows.Forms.DataGridViewTextBoxColumn columnId;
private System.Windows.Forms.DataGridViewTextBoxColumn columnTime;
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.cs
index 3e23dca..f8ce7fe 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.cs
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.cs
@@ -44,30 +44,30 @@ namespace ZTTMS_Manage_yibayiyi_20230320
Others.g_multiReceive = false;
- //if (IfOpen() == "打开")
- //{
- // try
- // {
- // thConnect = new Thread(ListenConnect);
- // thConnect.IsBackground = true;
- // thConnect.Start();
+ if (IfOpen() == "打开")
+ {
+ try
+ {
+ thConnect = new Thread(ListenConnect);
+ thConnect.IsBackground = true;
+ thConnect.Start();
- // timerStateCheck.Enabled = true;
- // timerStateCheck.Interval = 5 * 1000;
- // timerStateCheck.Start();
- // }
- // catch (Exception ee)
- // {
- // Console.WriteLine("MultiLinkError：" + ee.Message);
- // EveryDayLog.WriteErrorEXO2("MultiLinkError：" + ee.Message);
- // }
- //}
- //else
- //{
- // timerOpenCloseState.Interval = 1 * 30 * 1000;
- // timerOpenCloseState.Enabled = true;
- // timerOpenCloseState.Start();
- //}
+ timerStateCheck.Enabled = true;
+ timerStateCheck.Interval = 5 * 1000;
+ timerStateCheck.Start();
+ }
+ catch (Exception ee)
+ {
+ Console.WriteLine("MultiLinkError：" + ee.Message);
+ EveryDayLog.WriteErrorEXO2("MultiLinkError：" + ee.Message);
+ }
+ }
+ else
+ {
+ timerWaitOpen.Interval = 1 * 60 * 1000;
+ timerWaitOpen.Enabled = true;
+ timerWaitOpen.Start();
+ }
}
string openCloseState = "";
@@ -154,7 +154,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320
int reConnectTime = 0;
- string ip = "41.244.64.66";
+ string ip = Others.IP;
int port = 4006;
Thread thReceive = null;
@@ -1081,6 +1081,10 @@ namespace ZTTMS_Manage_yibayiyi_20230320
CallInvokeUIUpdate("UpdateState", "连接成功");
+ timerStateCheck.Enabled = true;
+ timerStateCheck.Interval = 10 * 1000;
+ timerStateCheck.Start();
+
thReceive = new Thread(DataReceive);
thReceive.IsBackground = true;
thReceive.Start();
@@ -1276,33 +1280,57 @@ namespace ZTTMS_Manage_yibayiyi_20230320
EveryDayLog.WriteMulti("EXO2的通信连接已断开！");
}
- private void timerOpenCloseState_Tick(object sender, EventArgs e)
+ private void timerWaitOpen_Tick(object sender, EventArgs e)
{
if (Others.isEXO2Work)
{
- timerOpenCloseState.Enabled = false;
- timerOpenCloseState.Stop();
-
try
{
thConnect = new Thread(ListenConnect);
thConnect.IsBackground = true;
thConnect.Start();
-
- timerStateCheck.Enabled = true;
- timerStateCheck.Interval = 5 * 1000;
- timerStateCheck.Start();
}
catch (Exception ee)
{
Console.WriteLine("MultiLinkError：" + ee.Message);
EveryDayLog.WriteErrorEXO2("MultiLinkError：" + ee.Message);
}
+
+ timerWaitOpen.Enabled = false;
+ timerWaitOpen.Stop();
+ }
+ }
+
+ private void timerStateCheck_Tick(object sender, EventArgs e)
+ {
+ if (!Others.isEXO2Work)
+ {
+ Others.g_multiReceive = false;
+
+ Console.WriteLine("EXO2的通信连接已断开！");
+ CallInvokeUIUpdate("UpdateState", "连接断开");
+
+ if (clientMulti == null)
+ {
+ EveryDayLog.WriteMulti("EXO2的通信连接已断开！");
+ return;
+ }
+
+ if (clientMulti.Connected)
+ {
+ clientMulti.Close();
+ clientMulti.Dispose();
+ }
+
+ ConnectDispose();
+
+ timerStateCheck.Enabled = false;
+ timerStateCheck.Stop();
+
+ timerWaitOpen.Interval = 1 * 30 * 1000;
+ timerWaitOpen.Enabled = true;
+ timerWaitOpen.Start();
}
- //else
- //{
- // ConnectDispose();
- //}
}
#endregion
@@ -1704,54 +1732,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320
}
}
- private void timerStateCheck_Tick(object sender, EventArgs e)
- {
- if (!Others.isEXO2Work)
- {
- Others.g_multiReceive = false;
-
- Console.WriteLine("EXO2的通信连接已断开！");
- CallInvokeUIUpdate("UpdateState", "连接断开");
-
- if (clientMulti == null)
- {
- EveryDayLog.WriteMulti("EXO2的通信连接已断开！");
- return;
- }
-
- if (clientMulti.Connected)
- {
- clientMulti.Close();
- clientMulti.Dispose();
- }
-
- //ConnectDispose();
-
- timerStateCheck.Enabled = false;
- timerStateCheck.Stop();
- }
- //else
- //{
- // if (Others.g_multiReceive == false || clientMulti == null || !clientMulti.Connected)
- // {
- // try
- // {
- // thConnect = new Thread(ListenConnect);
- // thConnect.IsBackground = true;
- // thConnect.Start();
- // }
- // catch (Exception ee)
- // {
- // Console.WriteLine("MultiLinkError：" + ee.Message);
- // }
- // }
- // else
- // {
- // Console.WriteLine("Multi Is Connected!");
- // }
- //}
- }
-
public void MulitiDataForm_FormClosing(object sender, FormClosingEventArgs e)
{
try
@@ -1776,8 +1756,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320
timerUpgradeTime.Stop();
timerStateCheck.Enabled = false;
timerStateCheck.Stop();
- timerOpenCloseState.Enabled = false;
- timerOpenCloseState.Stop();
+ timerWaitOpen.Enabled = false;
+ timerWaitOpen.Stop();
}
catch (Exception ex)
{
@@ -1785,5 +1765,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320
EveryDayLog.WriteErrorEXO2("EXO2CloseError:" + ex.ToString());
}
}
+
}
}
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.resx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.resx
index b5383a8..03098bd 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.resx
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.resx
@@ -147,8 +147,8 @@
158, 19
-
- 453, 17
+
+ 480, 16
320, 24
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MySQL.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MySQL.cs
index 2ccec1b..4ee9eb2 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MySQL.cs
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MySQL.cs
@@ -13,8 +13,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320
{
class MySQL
{
- //public static string connectionString = @"server=41.244.64.54;port=3306;user=root;password=zttZTT123!;database=daojiao;sslMode=none;charset=utf8;pooling=true;max pool size=1024;connect timeout = 20;AllowPublicKeyRetrieval=true;";
- public static string connectionString = @"server=127.0.0.1;port=3306;user=root;password=ztt12345;database=daojiaoyx;sslMode=none;charset=utf8;pooling=true;max pool size=1024;connect timeout = 20;";
+ public static string connectionString = Others.connectionString;
#region 公用方法
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/Others.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/Others.cs
index 10fee38..e03a5ce 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/Others.cs
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/Others.cs
@@ -14,6 +14,66 @@ namespace ZTTMS_Manage_yibayiyi_20230320
{
class Others
{
+ ////68DN
+ public static string connectionString = @"server=127.0.0.1;port=3306;user=root;password=ztt12345;database=daojiao68;sslMode=none;charset=utf8;pooling=true;max pool size=1024;connect timeout = 20;";
+ public static string IP = "41.244.68.66";
+ public static byte DZID = 0x01;
+ public static byte[] g_terminalEquipmentId = new byte[4] { 0x00, 0x00, 0x00, 0x01 };
+ public static byte GDFLID = 0x02;
+ public static byte[] g_terminalEquipmentIdGDFL = new byte[4] { 0x00, 0x00, 0x00, 0x02 };
+
+ public static string picPathShow = @"F:\Code\text\daojiao\Image\Image_01";
+ public static string vidPathShow = @"F:\Code\text\daojiao\Video\Video_01";
+ public static string picPath = @"F:\Code\text\daojiao\Image\Image_01\";
+ public static string totalPath = @"F:\Code\text\daojiao\";
+ public static string FFmpegPath = Environment.CurrentDirectory + @"\FFmpeg\bin\x86\ffmpeg.exe";
+
+ public static string ftpIp = "41.244.68.54:50021";
+
+
+ ////68GKJ
+ //public static string connectionString = @"server=41.244.68.54;port=3306;user=root;password=ztt12345;database=daojiao68;sslMode=none;charset=utf8;pooling=true;max pool size=1024;connect timeout = 20;";
+ //public static string IP = "41.244.68.66";
+ //public static byte DZID = 0x01;
+ //public static byte[] g_terminalEquipmentId = new byte[4] { 0x00, 0x00, 0x00, 0x01 };
+ //public static byte GDFLID = 0x02;
+ //public static byte[] g_terminalEquipmentIdGDFL = new byte[4] { 0x00, 0x00, 0x00, 0x02 };
+ //public static string totalPath = @"E:\Output\";
+ //public static string FFmpegPath = Environment.CurrentDirectory + @"\FFmpeg\bin\x86\ffmpeg.exe";
+ //public static string picPath = @"E:\Output\Image\Image_01\";
+ //public static string picPathShow = @"E:\Output\Image\Image_01";
+ //public static string vidPathShow = @"E:\Output\Video\Video_01";
+
+
+ ////64DN
+ //public static string connectionString = @"server=127.0.0.1;port=3306;user=root;password=ztt12345;database=daojiaoyx;sslMode=none;charset=utf8;pooling=true;max pool size=1024;connect timeout = 20;";
+ //public static string IP = "41.244.64.66";
+ //public static byte DZID = 0x03;
+ //public static byte[] g_terminalEquipmentId = new byte[4] { 0x00, 0x00, 0x00, 0x03 };
+ //public static byte GDFLID = 0x04;
+ //public static byte[] g_terminalEquipmentIdGDFL = new byte[4] { 0x00, 0x00, 0x00, 0x04 };
+ //public static string picPathShow = @"F:\Code\text\daojiaoyx\Image\Image_01";
+ //public static string vidPathShow = @"F:\Code\text\daojiaoyx\Video\Video_01";
+ //public static string picPath = @"F:\Code\text\daojiaoyx\Image\Image_01\";
+ //public static string totalPath = @"F:\Code\text\daojiaoyx\";
+ //public static string FFmpegPath = Environment.CurrentDirectory + @"\FFmpeg\bin\x86\ffmpeg.exe";
+
+ //public static string ftpIp = "41.244.64.54:50021";
+
+ ////64GKJ
+ //public static string connectionString = @"server=41.244.64.54;port=3306;user=root;password=ztt12345;database=daojiaoyx;sslMode=none;charset=utf8;pooling=true;max pool size=1024;connect timeout = 20;";
+ //public static string IP = "41.244.64.66";
+ //public static byte DZID = 0x03;
+ //public static byte[] g_terminalEquipmentId = new byte[4] { 0x00, 0x00, 0x00, 0x03 };
+ //public static byte GDFLID = 0x04;
+ //public static byte[] g_terminalEquipmentIdGDFL = new byte[4] { 0x00, 0x00, 0x00, 0x04 };
+ //public static string totalPath = @"E:\Output\";
+ //public static string FFmpegPath = Environment.CurrentDirectory + @"\FFmpeg\bin\x86\ffmpeg.exe";
+ //public static string picPath = @"E:\Output\Image\Image_01\";
+ //public static string picPathShow = @"E:\Output\Image\Image_01";
+ //public static string vidPathShow = @"E:\Output\Video\Video_01";
+
+
public static string g_ipGDFL;
//键值对集合：键为IP地址，值为Socket
@@ -85,7 +145,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320
public static long cameraReceiveAbnormalAnalysisTimes;
//FTP
- public static string ftpIp = "41.244.64.54:50021";
+ //public static string ftpIp = "41.244.64.54:50021";
public static string ftpUserId = "FTP_USER";
public static string ftpPassword = "ZTTztt1811!";
public static string ftpPicturePath = @"/Image/Image_01"; //图片
@@ -106,19 +166,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320
public static string ftpCTDDataPath = @"/File/SensorData/CTDData";
public static string ftpRecordData = @"/File/RecordData";
- //public static string totalPath = @"E:\Output\";
- //public static string FFmpegPath = Environment.CurrentDirectory + @"\FFmpeg\bin\x86\ffmpeg.exe";
- //public static string picPath = @"E:\Output\Image\Image_01\";
- //public static string picPathShow = @"E:\Output\Image\Image_01";
- //public static string vidPathShow = @"E:\Output\Video\Video_01";
-
- public static string picPathShow = @"F:\Code\text\daojiaoyx\Image\Image_01";
- public static string vidPathShow = @"F:\Code\text\daojiaoyx\Video\Video_01";
- public static string picPath = @"F:\Code\text\daojiaoyx\Image\Image_01\";
- public static string totalPath = @"F:\Code\text\daojiaoyx\";
- public static string FFmpegPath = Environment.CurrentDirectory + @"\FFmpeg\bin\x86\ffmpeg.exe";
-
-
+
//标记设备是否使能
public static bool isADCPWork;
public static bool isCTDWork;
@@ -418,12 +466,9 @@ namespace ZTTMS_Manage_yibayiyi_20230320
public static byte g_flagBit = 0x7f;
public static byte[] g_messageId = new byte[2];
public static byte[] g_terminalEquipmentType = new byte[4] { 0x00, 0x00, 0x00, 0xc9 };
- public static byte[] g_terminalEquipmentId = new byte[4] { 0x00, 0x00, 0x00, 0x03 };
public static byte[] g_messageBodyProperty = new byte[2];
public static byte[] g_versionNumber = new byte[2] { 0x00, 0x01 };
-
public static byte[] g_messageIdGDFL = new byte[2];
- public static byte[] g_terminalEquipmentIdGDFL = new byte[4] { 0x00, 0x00, 0x00, 0x04 };
public static byte[] g_messageBodyPropertyGDFL = new byte[2];
//消息体属性
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/PhotoelectricSeparationDataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/PhotoelectricSeparationDataForm.cs
index d3d793a..bef4415 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/PhotoelectricSeparationDataForm.cs
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/PhotoelectricSeparationDataForm.cs
@@ -58,8 +58,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320
Others.g_gdflReceive = false;
- //g_ip = "41.244.64.61";
- //g_ip = "127.0.0.1";
g_port = 55000;
g_serialSyncTime = 0;
@@ -68,45 +66,43 @@ namespace ZTTMS_Manage_yibayiyi_20230320
g_serialDataError = 0;
g_serialRequestData = 0;
- //try
- //{
- // //在服务器端创建一个负责IP地址和端口号的Socket
- // g_socketWatch = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
- // //g_socketWatch.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+ try
+ {
+ //在服务器端创建一个负责IP地址和端口号的Socket
+ g_socketWatch = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+ //g_socketWatch.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
- // //string ip3 = "192.168.1.240";
- // IPAddress ip2 = IPAddress.Any;
- // //创建端口号对象
- // Console.WriteLine("创建端口号对象");
- // //IPEndPoint point = new IPEndPoint(IPAddress.Parse(ip3), g_port);
- // IPEndPoint point = new IPEndPoint(ip2, g_port);
- // //监听
- // g_socketWatch.Bind(point);
- // g_socketWatch.Listen(10);
+ IPAddress ip2 = IPAddress.Any;
+ //创建端口号对象
+ Console.WriteLine("创建端口号对象");
+ IPEndPoint point = new IPEndPoint(ip2, g_port);
+ //监听
+ g_socketWatch.Bind(point);
+ g_socketWatch.Listen(10);
- // trdConnect = new Thread(ListenConnect);
- // trdConnect.IsBackground = true;
- // trdConnect.Start(g_socketWatch);
+ trdConnect = new Thread(ListenConnect);
+ trdConnect.IsBackground = true;
+ trdConnect.Start(g_socketWatch);
- // //trdConnect = new Thread(ListenConnectClient);
- // //trdConnect.IsBackground = true;
- // //trdConnect.Start();
+ //trdConnect = new Thread(ListenConnectClient);
+ //trdConnect.IsBackground = true;
+ //trdConnect.Start();
- // Thread trdDataSplit = new Thread(DataSplit);
- // trdDataSplit.IsBackground = true;
- // trdDataSplit.Start();
+ Thread trdDataSplit = new Thread(DataSplit);
+ trdDataSplit.IsBackground = true;
+ trdDataSplit.Start();
- // Thread trdDataAnalysis = new Thread(DataAnalysis);
- // trdDataAnalysis.IsBackground = true;
- // trdDataAnalysis.Start();
- //}
- //catch (Exception ee)
- //{
- // Console.WriteLine("GDFLLinkError：" + ee.Message);
- // EveryDayLog.WriteErrorGDFL("GDFLLinkError：" + ee.Message);
- // Others.g_gdflReceive = false;
- // Others.g_socketSendGDFL = null;
- //}
+ Thread trdDataAnalysis = new Thread(DataAnalysis);
+ trdDataAnalysis.IsBackground = true;
+ trdDataAnalysis.Start();
+ }
+ catch (Exception ee)
+ {
+ Console.WriteLine("GDFLLinkError：" + ee.Message);
+ EveryDayLog.WriteErrorGDFL("GDFLLinkError：" + ee.Message);
+ Others.g_gdflReceive = false;
+ Others.g_socketSendGDFL = null;
+ }
}
@@ -1298,7 +1294,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320
newCheckCode = Others.CRC(g_checkBuffer.ToArray());
//CRC校验通过
- if (newCheckCode == dataTemp[dataTemp.Length - 2] && dataTemp[3] == 0x00 && dataTemp[4] == 0x00 && dataTemp[5] == 0x00 && dataTemp[6] == 0xc9 && dataTemp[7] == 0x00 && dataTemp[8] == 0x00 && dataTemp[9] == 0x00 && dataTemp[10] == 0x04)
+ if (newCheckCode == dataTemp[dataTemp.Length - 2] && dataTemp[3] == 0x00 && dataTemp[4] == 0x00 && dataTemp[5] == 0x00 && dataTemp[6] == 0xc9 && dataTemp[7] == 0x00 && dataTemp[8] == 0x00 && dataTemp[9] == 0x00 && dataTemp[10] == Others.GDFLID)
{
//终端通用应答
if (dataTemp[1] == 0x00 && dataTemp[2] == 0x00)
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/Interop.WMPLib.dll b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/Interop.WMPLib.dll
index 64a2218..af9f17f 100644
Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/Interop.WMPLib.dll and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/Interop.WMPLib.dll differ
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.exe b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.exe
index 3538987..0dcf369 100644
Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.exe and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.exe differ
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb
index adf6bbc..9a228e0 100644
Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb differ
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index a9715cc..39229bf 100644
Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/Interop.WMPLib.dll b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/Interop.WMPLib.dll
index 50008a6..af9f17f 100644
Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/Interop.WMPLib.dll and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/Interop.WMPLib.dll differ
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.AssemblyReference.cache b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.AssemblyReference.cache
index c757bef..48a2e05 100644
Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.AssemblyReference.cache and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.AssemblyReference.cache differ
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.CoreCompileInputs.cache b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.CoreCompileInputs.cache
index 6215378..7643e57 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.CoreCompileInputs.cache
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-05dfcd20f03557f2c700af175f23e4576f59af35
+5a65d66a2847f2c25feb8512df84fb71610de84a
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.FileListAbsolute.txt b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.FileListAbsolute.txt
index 22752b1..e9a9995 100644
--- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.FileListAbsolute.txt
+++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.FileListAbsolute.txt
@@ -2911,3 +2911,147 @@ F:\Code\yibayiyi\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_y
F:\Code\yibayiyi\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.csproj.CopyComplete
F:\Code\yibayiyi\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.exe
F:\Code\yibayiyi\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.pdb
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\x64\concrt140.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\x64\cvextern.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\x64\msvcp140.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\x64\opencv_ffmpeg343_64.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\x64\vcruntime140.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\x86\concrt140.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\x86\cvextern.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\x86\msvcp140.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\x86\opencv_ffmpeg343.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\x86\vcruntime140.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\ZTTMS_Manage_yibayiyi_20230320.exe.config
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\ZTTMS_Manage_yibayiyi_20230320.exe
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\ZTTMS_Manage_yibayiyi_20230320.pdb
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\BouncyCastle.Crypto.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\CsvHelper.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Emgu.CV.UI.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Emgu.CV.World.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\FFmpeg.AutoGen.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Google.Protobuf.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\IdHelper.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\IdHelper.Zookeeper.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\K4os.Compression.LZ4.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\K4os.Compression.LZ4.Streams.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\K4os.Hash.xxHash.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Microsoft.Bcl.HashCode.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\MQTTnet.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\MvCameraControl.Net.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\MySql.Data.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Newtonsoft.Json.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Buffers.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Collections.Immutable.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Memory.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Numerics.Vectors.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Text.Encodings.Web.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Text.Json.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Threading.Tasks.Extensions.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.ValueTuple.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.Diagnostics.Eventing.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.Fonts.Fluent.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.Foundation.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.Foundation.Logging.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.UI.Composition.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.UI.Dispatching.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.UI.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.UI.FluentTheme.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.UI.FluentTheme.v1.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.UI.FluentTheme.v2.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.UI.Toolkit.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.Xaml.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\VisioForge.Core.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\VisioForge.Libs.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\VisioForge.MediaFramework.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\VisioForge.Types.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\ZedGraph.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\ZooKeeperNetEx.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\ZstdNet.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\BouncyCastle.Crypto.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\CsvHelper.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Emgu.CV.UI.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Emgu.CV.World.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\FFmpeg.AutoGen.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Google.Protobuf.pdb
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Google.Protobuf.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\IdHelper.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\IdHelper.Zookeeper.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\K4os.Compression.LZ4.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\K4os.Compression.LZ4.Streams.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\K4os.Hash.xxHash.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Microsoft.Bcl.HashCode.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\MQTTnet.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\MySql.Data.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Newtonsoft.Json.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Buffers.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Collections.Immutable.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Memory.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Numerics.Vectors.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Text.Encodings.Web.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Text.Json.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.Threading.Tasks.Extensions.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\System.ValueTuple.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.Diagnostics.Eventing.pdb
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.UI.FluentTheme.pdb
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.UI.FluentTheme.v1.pdb
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.UI.FluentTheme.v2.pdb
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Uno.UI.Toolkit.pdb
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\ZedGraph.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\ZooKeeperNetEx.xml
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\de\ZedGraph.resources.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\es\ZedGraph.resources.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\fr\ZedGraph.resources.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\hu\ZedGraph.resources.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\it\ZedGraph.resources.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\ja\ZedGraph.resources.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\pt\ZedGraph.resources.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\ru\ZedGraph.resources.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\sk\ZedGraph.resources.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\sv\ZedGraph.resources.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\tr\ZedGraph.resources.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\zh-cn\ZedGraph.resources.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\zh-tw\ZedGraph.resources.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\Interop.WMPLib.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\bin\Debug\AxInterop.WMPLib.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.csproj.AssemblyReference.cache
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.csproj.SuggestedBindingRedirects.cache
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\Interop.WMPLib.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\AxInterop.WMPLib.dll
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.csproj.ResolveComReference.cache
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.ADCPDataForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.CloseBoxForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.CTDDataForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.CO2DataForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.DeviceGovernForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.EnsureMessageForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.FileAcquisitionForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.GDFLPortStateForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.LoadingForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.MainForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.MessageBoxForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.OtherSettingForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.OutputPortStateData.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.OutputStatusInfoDataForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.PhotoelectricSeparationDataForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.PictureSearchForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.Properties.Resources.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.RealTimeDataForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.RelayControlForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.RemoteUpgradeForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.MulitiDataForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.PictureTakeForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.SendNorthForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.VideoForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.WorkStatusInfoDataForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.VideoRecordForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.VideoSearchForm.resources
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.csproj.GenerateResource.cache
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.csproj.CoreCompileInputs.cache
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.csproj.CopyComplete
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.exe
+F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3\ZTTMS_Manage_yibayiyi_20230320\obj\Debug\ZTTMS_Manage_yibayiyi_20230320.pdb
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.GenerateResource.cache b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.GenerateResource.cache
index 7087ce5..85a845f 100644
Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.GenerateResource.cache and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.GenerateResource.cache differ
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.ResolveComReference.cache b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.ResolveComReference.cache
index 7047366..7c4fa4e 100644
Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.ResolveComReference.cache and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.csproj.ResolveComReference.cache differ
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.exe b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.exe
index 3538987..0dcf369 100644
Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.exe and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.exe differ
diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb
index adf6bbc..9a228e0 100644
Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb differ