diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/e55c956b-7174-49d3-a2ec-11311d7e5e8e.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/1fdbbfb7-a23f-44d4-9da3-c175885cd845.vsidx similarity index 51% rename from ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/e55c956b-7174-49d3-a2ec-11311d7e5e8e.vsidx rename to ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/1fdbbfb7-a23f-44d4-9da3-c175885cd845.vsidx index 92e1b70..afb8b82 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/e55c956b-7174-49d3-a2ec-11311d7e5e8e.vsidx and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/1fdbbfb7-a23f-44d4-9da3-c175885cd845.vsidx differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/28b10280-67a3-46f2-beca-82af14371307.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/28b10280-67a3-46f2-beca-82af14371307.vsidx deleted file mode 100644 index 36691fc..0000000 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/28b10280-67a3-46f2-beca-82af14371307.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 deleted file mode 100644 index 8f14490..0000000 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/bd843aae-b695-4b89-828a-e850504c1742.vsidx and /dev/null differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/e3a02c5a-99ba-483c-86cd-5a02dac5e8a3.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/e3a02c5a-99ba-483c-86cd-5a02dac5e8a3.vsidx new file mode 100644 index 0000000..0807f8f Binary files /dev/null and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/e3a02c5a-99ba-483c-86cd-5a02dac5e8a3.vsidx differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/efb21d9f-63ce-4e81-be25-c49dfc38fcb4.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/efb21d9f-63ce-4e81-be25-c49dfc38fcb4.vsidx new file mode 100644 index 0000000..ba2b393 Binary files /dev/null and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/efb21d9f-63ce-4e81-be25-c49dfc38fcb4.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 de6df3f..ecdbb0f 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.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.cs index d62de5c..a17668d 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,27 +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(); - } - catch (Exception ee) - { - Console.WriteLine("ADCPLinkError：" + ee.Message); - } - } - else - { - timerWaitOpen.Interval = 1 * 60 * 1000; - timerWaitOpen.Enabled = true; - timerWaitOpen.Start(); - } + // } + // catch (Exception ee) + // { + // Console.WriteLine("ADCPLinkError：" + ee.Message); + // } + //} + //else + //{ + // timerWaitOpen.Interval = 1 * 60 * 1000; + // timerWaitOpen.Enabled = true; + // timerWaitOpen.Start(); + //} } string openCloseState = ""; 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 dd93494..deeb482 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 @@ -58,6 +58,14 @@ namespace ZTTMS_Manage_yibayiyi_20230320 timerWaitOpen.Enabled = true; timerWaitOpen.Start(); } + + Thread trdDataSplit = new Thread(DataSplit); + trdDataSplit.IsBackground = true; + trdDataSplit.Start(); + + Thread trdDataAnalysis = new Thread(DataAnalysis); + trdDataAnalysis.IsBackground = true; + trdDataAnalysis.Start(); } string openCloseState = ""; @@ -654,18 +662,16 @@ namespace ZTTMS_Manage_yibayiyi_20230320 timerStateCheck.Interval = 10 * 1000; timerStateCheck.Start(); + if(thReceive!=null) + { + thReceive.Abort(); + thReceive = null; + } + thReceive = new Thread(DataReceive); thReceive.IsBackground = true; thReceive.Start(); - Thread trdDataSplit = new Thread(DataSplit); - trdDataSplit.IsBackground = true; - trdDataSplit.Start(); - - Thread trdDataAnalysis = new Thread(DataAnalysis); - trdDataAnalysis.IsBackground = true; - trdDataAnalysis.Start(); - EveryDayLog.WriteCO2("CO2传感器已连接！"); } else @@ -961,13 +967,13 @@ namespace ZTTMS_Manage_yibayiyi_20230320 Thread.Sleep(1); // 无数据处理时，进入睡眠态，以防止过多的占用CPU continue; } - if (gDevConnSerialRecvBuff[gDevConnSerialRecvBufHandleLocation] == 0x53 && gDevConnSerialRecvBuff[gDevConnSerialRecvBufHandleLocation + 1] == 0x34) + if (gDevConnSerialRecvBuff[gDevConnSerialRecvBufHandleLocation] == 0x0A) { for (i = 0; i < gDevConnSerialHandleBufLen; i++) { if (gDevConnSerialHandleBuf[i].gDevConnectRecvHandleFlag == DevSerialRecvHandle.DevDataHandleFlag.RECVING) { - if (gDevConnSerialHandleBuf[i].gDevConnectRecvHandleCount < 18) + if (gDevConnSerialHandleBuf[i].gDevConnectRecvHandleCount < 100) { // 18为数据包最小单位长度 /* 该帧数据错误,将该帧数据变成空闲态，并清空内部长度 */ gDevConnSerialHandleBuf[i].gDevConnectRecvHandleFlag = DevSerialRecvHandle.DevDataHandleFlag.IDILING; @@ -986,8 +992,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 } if ((i < gDevConnSerialHandleBufLen) && (gDevConnSerialHandleBuf[i].gDevConnectRecvHandleFlag == DevSerialRecvHandle.DevDataHandleFlag.HANDLING)) { - gDevConnSerialRecvBufHandleLocation++; // 数据处理完成的跳出之一，因此该字节处理完成,且为完成一帧数据获取的跳出 - gDevConnSerialRecvBufHandleLocation = gDevConnSerialRecvBufHandleLocation % gDevConnSerialRecvBuffLen; + //gDevConnSerialRecvBufHandleLocation++; // 数据处理完成的跳出之一，因此该字节处理完成,且为完成一帧数据获取的跳出 + //gDevConnSerialRecvBufHandleLocation = gDevConnSerialRecvBufHandleLocation % gDevConnSerialRecvBuffLen; continue; } for (i = 0; i < gDevConnSerialHandleBufLen; i++) @@ -1059,6 +1065,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 string hexStrData = tool.ByteToHexString(byteRead); string strData = tool.HexToString(hexStrData); + strData = strData.Replace("\r", "").Replace("\n", ""); #region 原始指令存储 sqlTime = DateTime.Now; @@ -1098,14 +1105,9 @@ namespace ZTTMS_Manage_yibayiyi_20230320 try { - ////异或校验和检验 - //byte originalSum = byte.Parse(strData.Substring(strData.Length - 3, 2)); - //if (originalSum == tool.CheckSum(byteRead) && co2Data.Length == 52 && co2Data[0] == "$CODS4") - if (co2Data.Length == 52 || co2Data.Length == 57) + if (co2Data.Length > 31) { - //校验成功 //数据解析 - //float pressure; float potency; string state; string state1; 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 47e8f14..f42463f 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 @@ -1269,7 +1269,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 Thread.Sleep(1); // 无数据处理时，进入睡眠态，以防止过多的占用CPU continue; } - if (gDevConnSerialRecvBuff[gDevConnSerialRecvBufHandleLocation] == 0x0A && gDevConnSerialRecvBuff[gDevConnSerialRecvBufHandleLocation - 1] == 0x0D) + if (gDevConnSerialRecvBuff[gDevConnSerialRecvBufHandleLocation] == 0x0A ) { for (i = 0; i < gDevConnSerialHandleBufLen; i++) { @@ -1294,8 +1294,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 } if ((i < gDevConnSerialHandleBufLen) && (gDevConnSerialHandleBuf[i].gDevConnectRecvHandleFlag == DevSerialRecvHandle.DevDataHandleFlag.HANDLING)) { - gDevConnSerialRecvBufHandleLocation++; // 数据处理完成的跳出之一，因此该字节处理完成,且为完成一帧数据获取的跳出 - gDevConnSerialRecvBufHandleLocation = gDevConnSerialRecvBufHandleLocation % gDevConnSerialRecvBuffLen; + //gDevConnSerialRecvBufHandleLocation++; // 数据处理完成的跳出之一，因此该字节处理完成,且为完成一帧数据获取的跳出 + //gDevConnSerialRecvBufHandleLocation = gDevConnSerialRecvBufHandleLocation % gDevConnSerialRecvBuffLen; continue; } for (i = 0; i < gDevConnSerialHandleBufLen; i++) @@ -1373,7 +1373,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 string hexStrData = tool.ByteToHexString(byteRead); string strData = tool.HexToString(hexStrData); - strData.Replace(" ", ""); + strData = strData.Replace(" ", ""); + string[] CTDData = strData.Split(','); #region 原始指令存储 @@ -1423,8 +1424,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 string date; string time; - - string[] temp = CTDData[0].Split(' '); + string[] temp = CTDData[0].Split(','); if (temp.Length == 1) { temperature = float.Parse(CTDData[0]); @@ -1501,7 +1501,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 { sqlId = IdHelper.GetId(); - string sql = $"insert into tb_ctd_data(id,record_time,device_number,temperature,conductivity,pressure,salinity,date,time,error_code) " + + string sql = $"insert into tb_ctd_abnormaldata(id,record_time,device_number,temperature,conductivity,pressure,salinity,date,time,error_code) " + $"values('{sqlId}','{sqlTime}','1',FORMAT('{temperature}',2),FORMAT('{conductivity}',2),FORMAT('{pressure}',2),FORMAT('{salinity}',2)" + $",'{date}','{time}','{message}');"; try @@ -1531,7 +1531,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320 } #endregion - } else { diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MainForm.Designer.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MainForm.Designer.cs index b56d759..d6ed761 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MainForm.Designer.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MainForm.Designer.cs @@ -114,6 +114,7 @@ this.timerRecordHXDataHour = new System.Windows.Forms.Timer(this.components); this.timerRecordSWDataSS = new System.Windows.Forms.Timer(this.components); this.timerRecordHXDataSS = new System.Windows.Forms.Timer(this.components); + this.btnNetworkSet = new System.Windows.Forms.Button(); this.pnlSideMenu.SuspendLayout(); this.pnlSubOthers.SuspendLayout(); this.pnlSubSetting.SuspendLayout(); @@ -170,7 +171,7 @@ this.btnSendNorth.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSendNorth.Font = new System.Drawing.Font("方正楷体简体", 24F); this.btnSendNorth.ForeColor = System.Drawing.SystemColors.ButtonHighlight; - this.btnSendNorth.Location = new System.Drawing.Point(0, 2743); + this.btnSendNorth.Location = new System.Drawing.Point(0, 2813); this.btnSendNorth.Name = "btnSendNorth"; this.btnSendNorth.Padding = new System.Windows.Forms.Padding(20, 0, 0, 0); this.btnSendNorth.Size = new System.Drawing.Size(325, 70); @@ -187,7 +188,7 @@ this.btnRealTimeData.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnRealTimeData.Font = new System.Drawing.Font("方正楷体简体", 24F); this.btnRealTimeData.ForeColor = System.Drawing.SystemColors.ButtonHighlight; - this.btnRealTimeData.Location = new System.Drawing.Point(0, 2673); + this.btnRealTimeData.Location = new System.Drawing.Point(0, 2743); this.btnRealTimeData.Name = "btnRealTimeData"; this.btnRealTimeData.Padding = new System.Windows.Forms.Padding(20, 0, 0, 0); this.btnRealTimeData.Size = new System.Drawing.Size(325, 70); @@ -202,7 +203,7 @@ this.pnlSubOthers.Controls.Add(this.btnFileAcquisition); this.pnlSubOthers.Controls.Add(this.btnDeviceGovern); this.pnlSubOthers.Dock = System.Windows.Forms.DockStyle.Top; - this.pnlSubOthers.Location = new System.Drawing.Point(0, 2673); + this.pnlSubOthers.Location = new System.Drawing.Point(0, 2743); this.pnlSubOthers.Name = "pnlSubOthers"; this.pnlSubOthers.Size = new System.Drawing.Size(325, 0); this.pnlSubOthers.TabIndex = 14; @@ -249,7 +250,7 @@ this.btnOther.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOther.Font = new System.Drawing.Font("方正楷体简体", 24F); this.btnOther.ForeColor = System.Drawing.SystemColors.ButtonHighlight; - this.btnOther.Location = new System.Drawing.Point(0, 2603); + this.btnOther.Location = new System.Drawing.Point(0, 2673); this.btnOther.Name = "btnOther"; this.btnOther.Padding = new System.Windows.Forms.Padding(20, 0, 0, 0); this.btnOther.Size = new System.Drawing.Size(325, 70); @@ -261,12 +262,13 @@ // // pnlSubSetting // + this.pnlSubSetting.Controls.Add(this.btnNetworkSet); this.pnlSubSetting.Controls.Add(this.btnSetting2); this.pnlSubSetting.Controls.Add(this.btnSetting1); this.pnlSubSetting.Dock = System.Windows.Forms.DockStyle.Top; this.pnlSubSetting.Location = new System.Drawing.Point(0, 2463); this.pnlSubSetting.Name = "pnlSubSetting"; - this.pnlSubSetting.Size = new System.Drawing.Size(325, 140); + this.pnlSubSetting.Size = new System.Drawing.Size(325, 210); this.pnlSubSetting.TabIndex = 20; this.pnlSubSetting.VisibleChanged += new System.EventHandler(this.pnlSubSetting_VisibleChanged); // @@ -1081,9 +1083,9 @@ this.label1.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.label1.Location = new System.Drawing.Point(28, 17); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(572, 52); + this.label1.Size = new System.Drawing.Size(645, 52); this.label1.TabIndex = 4; - this.label1.Text = "岛礁观测系统显控软件_64"; + this.label1.Text = "岛礁观测系统显控软件(NEW)"; // // picbtnClose // @@ -1231,6 +1233,23 @@ // this.timerRecordHXDataSS.Tick += new System.EventHandler(this.timerRecordHXDataSS_Tick); // + // btnNetworkSet + // + this.btnNetworkSet.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(118)))), ((int)(((byte)(141)))), ((int)(((byte)(157))))); + this.btnNetworkSet.Dock = System.Windows.Forms.DockStyle.Top; + this.btnNetworkSet.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnNetworkSet.Font = new System.Drawing.Font("方正楷体简体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnNetworkSet.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.btnNetworkSet.Location = new System.Drawing.Point(0, 140); + this.btnNetworkSet.Name = "btnNetworkSet"; + this.btnNetworkSet.Padding = new System.Windows.Forms.Padding(60, 0, 0, 0); + this.btnNetworkSet.Size = new System.Drawing.Size(325, 70); + this.btnNetworkSet.TabIndex = 16; + this.btnNetworkSet.Text = "网口配置"; + this.btnNetworkSet.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.btnNetworkSet.UseVisualStyleBackColor = false; + this.btnNetworkSet.Click += new System.EventHandler(this.btnNetworkSet_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -1361,6 +1380,7 @@ private System.Windows.Forms.Button btnSetting2; private System.Windows.Forms.Button btnSetting1; private System.Windows.Forms.Button btnSendNorth; + private System.Windows.Forms.Button btnNetworkSet; } } 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 86c53db..9c0cc4f 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 @@ -212,6 +212,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 public static OtherSettingForm otherSettingForm = new OtherSettingForm(); public static PhotoelectricSeparationDataForm photoelectricSeparationDataForm = new PhotoelectricSeparationDataForm(); public static OutputPortStateData outputPortStateData = new OutputPortStateData(); + NetworkSetForm networkSetForm = new NetworkSetForm(); #region 定时器设置 @@ -406,10 +407,10 @@ namespace ZTTMS_Manage_yibayiyi_20230320 Others.isUV3Work = false; Others.isUV4Work = false; - //加载存储的状态 - Thread thLoadState = new Thread(LoadState); - thLoadState.IsBackground = true; - thLoadState.Start(); + ////加载存储的状态 + //Thread thLoadState = new Thread(LoadState); + //thLoadState.IsBackground = true; + //thLoadState.Start(); } private void MainForm_Shown(object sender, EventArgs e) @@ -420,9 +421,9 @@ namespace ZTTMS_Manage_yibayiyi_20230320 //videoForm.Visible = false; - //timerUpdateTime.Interval = 100; - //timerUpdateTime.Enabled = true; - //timerUpdateTime.Start(); + timerUpdateTime.Interval = 100; + timerUpdateTime.Enabled = true; + timerUpdateTime.Start(); //timerDataQualityLog.Enabled = true; //timerDataQualityLog.Interval = 1 * 60 * 1000; // 1分钟执行一次 @@ -3706,6 +3707,11 @@ namespace ZTTMS_Manage_yibayiyi_20230320 { OpenChildForm(relayControlForm); } + + private void btnNetworkSet_Click(object sender, EventArgs e) + { + OpenChildForm(networkSetForm); + } #endregion @@ -5893,5 +5899,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320 } #endregion + } } diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MainForm.resx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MainForm.resx index a8b77b2..d6e8580 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MainForm.resx +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/MainForm.resx @@ -121,7 +121,7 @@ iVBORw0KGgoAAAANSUhEUgAAAQAAAAA5CAYAAADZcPW3AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAI99JREFUeF7t3fe3VNWSB/D5o+bnCWvmvXl5XvCZnjlHRFARURETilkxRzBjQAUD + vQAADr0BR/uQrQAAI99JREFUeF7t3fe3VNWSB/D5o+bnCWvmvXl5XvCZnjlHRFARURETilkxRzBjQAUD 5oCKigEUEVAMKJjFjPHM/tTpgqbte+m+AXjDqbVq9aXPOXvXrl31rdq192n+ZaeDjqoabrjhbZMbAGi4 4W2YGwBouOFtmBsAaLjhbZgbAGi44W2YGwBouOFtmBsAaLjhbZgbAGi44W2YGwBouOFtmLc4AOx88ITq H4cULp/drjfccMOjx1scALbbd1z1l70Pq/62z+EBBt3uabjh4fDOXb5ruOYtBgCcnfNfeM1N1T0PP1Ed 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 f8ce7fe..4554b2e 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 @@ -174,7 +174,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 Console.WriteLine("EXO2未响应，请重新点击发送！"); CallInvokeUIUpdate("UpdataEnable", "true"); - btnGetNewInfo_Click(null, null); + //btnGetNewInfo_Click(null, null); } } #endregion @@ -183,7 +183,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 public void SensorDataForm_Load(object sender, EventArgs e) { g_timerGetData.Enabled = true; - g_timerGetData.Interval = 20000; + g_timerGetData.Interval = 10000; g_timerGetData.AutoReset = false; g_timerGetData.Elapsed += new System.Timers.ElapsedEventHandler(methodGetData); @@ -1384,7 +1384,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 Thread.Sleep(1); // 无数据处理时，进入睡眠态，以防止过多的占用CPU continue; } - if (gDevConnSerialRecvBuff[gDevConnSerialRecvBufHandleLocation] == 0x0A && gDevConnSerialRecvBuff[gDevConnSerialRecvBufHandleLocation - 1] == 0x0D) + if (gDevConnSerialRecvBuff[gDevConnSerialRecvBufHandleLocation] == 0x0A) { for (i = 0; i < gDevConnSerialHandleBufLen; i++) { @@ -1409,8 +1409,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 } if ((i < gDevConnSerialHandleBufLen) && (gDevConnSerialHandleBuf[i].gDevConnectRecvHandleFlag == DevSerialRecvHandle.DevDataHandleFlag.HANDLING)) { - gDevConnSerialRecvBufHandleLocation++; // 数据处理完成的跳出之一，因此该字节处理完成,且为完成一帧数据获取的跳出 - gDevConnSerialRecvBufHandleLocation = gDevConnSerialRecvBufHandleLocation % gDevConnSerialRecvBuffLen; + //gDevConnSerialRecvBufHandleLocation++; // 数据处理完成的跳出之一，因此该字节处理完成,且为完成一帧数据获取的跳出 + //gDevConnSerialRecvBufHandleLocation = gDevConnSerialRecvBufHandleLocation % gDevConnSerialRecvBuffLen; continue; } for (i = 0; i < gDevConnSerialHandleBufLen; i++) @@ -1487,8 +1487,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 string hexStrData = tool.ByteToHexString(byteRead); string strData = tool.HexToString(hexStrData); - strData.Replace("\r", ""); - strData.Replace("\n", ""); + strData = strData.Replace("\r", "").Replace("\n", "").Replace("#", "").Replace("d", "").Replace("a", "").Replace("t", ""); + string[] EXO2Data1 = strData.Split(' '); #region 原始指令存储 @@ -1527,7 +1527,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320 } #endregion - try { //数据解析 @@ -1556,7 +1555,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 { try { - temperature = float.Parse(EXO2Data[0].Substring(5)); + temperature = float.Parse(EXO2Data[0]); salinity = float.Parse(EXO2Data[1]); ph = float.Parse(EXO2Data[2]); dissolvedoxygen = float.Parse(EXO2Data[3]); diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/NetworkSetForm.Designer.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/NetworkSetForm.Designer.cs new file mode 100644 index 0000000..cf2187e --- /dev/null +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/NetworkSetForm.Designer.cs @@ -0,0 +1,234 @@ +namespace ZTTMS_Manage_yibayiyi_20230320 +{ + partial class NetworkSetForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + this.pnlTitle = new System.Windows.Forms.Panel(); + this.lblTitle = new System.Windows.Forms.Label(); + this.pnlDataDisplay = new System.Windows.Forms.Panel(); + this.dgvDataDisplay = new System.Windows.Forms.DataGridView(); + this.columnId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.columnTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.columnTerminalIP = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.columnTerminalPort = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.columnTerminalMask = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.columnGatewayIP = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pnlTitle.SuspendLayout(); + this.pnlDataDisplay.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dgvDataDisplay)).BeginInit(); + this.SuspendLayout(); + // + // pnlTitle + // + this.pnlTitle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(105)))), ((int)(((byte)(118)))), ((int)(((byte)(128))))); + this.pnlTitle.Controls.Add(this.lblTitle); + this.pnlTitle.Dock = System.Windows.Forms.DockStyle.Top; + this.pnlTitle.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.pnlTitle.ForeColor = System.Drawing.SystemColors.ControlLightLight; + this.pnlTitle.Location = new System.Drawing.Point(0, 0); + this.pnlTitle.Margin = new System.Windows.Forms.Padding(8, 7, 8, 7); + this.pnlTitle.Name = "pnlTitle"; + this.pnlTitle.Size = new System.Drawing.Size(1560, 85); + this.pnlTitle.TabIndex = 7; + // + // lblTitle + // + this.lblTitle.AutoSize = true; + this.lblTitle.Font = new System.Drawing.Font("方正楷体简体", 26.25F); + this.lblTitle.Location = new System.Drawing.Point(27, 25); + this.lblTitle.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0); + this.lblTitle.Name = "lblTitle"; + this.lblTitle.Size = new System.Drawing.Size(354, 38); + this.lblTitle.TabIndex = 0; + this.lblTitle.Text = "网络配置(光电分离腔)"; + // + // pnlDataDisplay + // + this.pnlDataDisplay.Controls.Add(this.dgvDataDisplay); + this.pnlDataDisplay.Dock = System.Windows.Forms.DockStyle.Left; + this.pnlDataDisplay.Location = new System.Drawing.Point(0, 85); + this.pnlDataDisplay.Name = "pnlDataDisplay"; + this.pnlDataDisplay.Size = new System.Drawing.Size(771, 783); + this.pnlDataDisplay.TabIndex = 8; + // + // dgvDataDisplay + // + this.dgvDataDisplay.AllowUserToAddRows = false; + this.dgvDataDisplay.AllowUserToDeleteRows = false; + this.dgvDataDisplay.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; + this.dgvDataDisplay.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; + this.dgvDataDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(236)))), ((int)(((byte)(233))))); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(225)))), ((int)(((byte)(229)))), ((int)(((byte)(227))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("方正楷体简体", 21.75F); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.InfoText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvDataDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + this.dgvDataDisplay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvDataDisplay.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.columnId, + this.columnTime, + this.columnTerminalIP, + this.columnTerminalPort, + this.columnTerminalMask, + this.columnGatewayIP}); + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(236)))), ((int)(((byte)(233))))); + dataGridViewCellStyle8.Font = new System.Drawing.Font("方正楷体简体", 20.25F); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvDataDisplay.DefaultCellStyle = dataGridViewCellStyle8; + this.dgvDataDisplay.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvDataDisplay.EnableHeadersVisualStyles = false; + this.dgvDataDisplay.Location = new System.Drawing.Point(0, 0); + this.dgvDataDisplay.Name = "dgvDataDisplay"; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(225)))), ((int)(((byte)(229)))), ((int)(((byte)(227))))); + dataGridViewCellStyle9.Font = new System.Drawing.Font("方正楷体简体", 20.25F); + dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvDataDisplay.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; + this.dgvDataDisplay.RowHeadersWidth = 40; + this.dgvDataDisplay.RowTemplate.Height = 35; + this.dgvDataDisplay.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; + this.dgvDataDisplay.Size = new System.Drawing.Size(771, 783); + this.dgvDataDisplay.TabIndex = 1; + // + // columnId + // + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.columnId.DefaultCellStyle = dataGridViewCellStyle2; + this.columnId.FillWeight = 58.42016F; + this.columnId.HeaderText = "序号"; + this.columnId.Name = "columnId"; + this.columnId.ReadOnly = true; + this.columnId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.columnId.Width = 78; + // + // columnTime + // + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.columnTime.DefaultCellStyle = dataGridViewCellStyle3; + this.columnTime.FillWeight = 134.0101F; + this.columnTime.HeaderText = "配置时间"; + this.columnTime.Name = "columnTime"; + this.columnTime.ReadOnly = true; + this.columnTime.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.columnTime.Width = 136; + // + // columnTerminalIP + // + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.columnTerminalIP.DefaultCellStyle = dataGridViewCellStyle4; + this.columnTerminalIP.FillWeight = 101.2616F; + this.columnTerminalIP.HeaderText = "终端IP"; + this.columnTerminalIP.Name = "columnTerminalIP"; + this.columnTerminalIP.ReadOnly = true; + this.columnTerminalIP.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.columnTerminalIP.Width = 104; + // + // columnTerminalPort + // + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.columnTerminalPort.DefaultCellStyle = dataGridViewCellStyle5; + this.columnTerminalPort.HeaderText = "终端port"; + this.columnTerminalPort.Name = "columnTerminalPort"; + this.columnTerminalPort.ReadOnly = true; + this.columnTerminalPort.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.columnTerminalPort.Width = 125; + // + // columnTerminalMask + // + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.columnTerminalMask.DefaultCellStyle = dataGridViewCellStyle6; + this.columnTerminalMask.HeaderText = "终端子网掩码"; + this.columnTerminalMask.Name = "columnTerminalMask"; + this.columnTerminalMask.ReadOnly = true; + this.columnTerminalMask.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.columnTerminalMask.Width = 194; + // + // columnGatewayIP + // + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.columnGatewayIP.DefaultCellStyle = dataGridViewCellStyle7; + this.columnGatewayIP.HeaderText = "网关IP"; + this.columnGatewayIP.Name = "columnGatewayIP"; + this.columnGatewayIP.ReadOnly = true; + this.columnGatewayIP.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.columnGatewayIP.Width = 104; + // + // NetworkSetForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(15F, 29F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(125)))), ((int)(((byte)(137)))), ((int)(((byte)(145))))); + this.ClientSize = new System.Drawing.Size(1560, 868); + this.Controls.Add(this.pnlDataDisplay); + this.Controls.Add(this.pnlTitle); + this.Font = new System.Drawing.Font("方正楷体简体", 20.25F); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(8, 7, 8, 7); + this.Name = "NetworkSetForm"; + this.Text = "NetworkSetForm"; + this.pnlTitle.ResumeLayout(false); + this.pnlTitle.PerformLayout(); + this.pnlDataDisplay.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dgvDataDisplay)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel pnlTitle; + private System.Windows.Forms.Label lblTitle; + private System.Windows.Forms.Panel pnlDataDisplay; + private System.Windows.Forms.DataGridView dgvDataDisplay; + private System.Windows.Forms.DataGridViewTextBoxColumn columnId; + private System.Windows.Forms.DataGridViewTextBoxColumn columnTime; + private System.Windows.Forms.DataGridViewTextBoxColumn columnTerminalIP; + private System.Windows.Forms.DataGridViewTextBoxColumn columnTerminalPort; + private System.Windows.Forms.DataGridViewTextBoxColumn columnTerminalMask; + private System.Windows.Forms.DataGridViewTextBoxColumn columnGatewayIP; + } +} \ No newline at end of file diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/NetworkSetForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/NetworkSetForm.cs new file mode 100644 index 0000000..e2c06ac --- /dev/null +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/NetworkSetForm.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace ZTTMS_Manage_yibayiyi_20230320 +{ + public partial class NetworkSetForm : Form + { + public NetworkSetForm() + { + InitializeComponent(); + } + } +} diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/NetworkSetForm.resx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/NetworkSetForm.resx new file mode 100644 index 0000000..74825da --- /dev/null +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/NetworkSetForm.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file 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 e03a5ce..a778898 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 @@ -15,20 +15,20 @@ 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 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 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"; + //public static string ftpIp = "41.244.68.54:50021"; ////68GKJ @@ -46,19 +46,19 @@ namespace ZTTMS_Manage_yibayiyi_20230320 ////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 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"; + 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;"; diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/RealTimeDataForm.Designer.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/RealTimeDataForm.Designer.cs index 4f127ce..a198e56 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/RealTimeDataForm.Designer.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/RealTimeDataForm.Designer.cs @@ -52,6 +52,9 @@ this.lblTemperature = new System.Windows.Forms.Label(); this.lblConductivity = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.label19 = new System.Windows.Forms.Label(); + this.lblSality = new System.Windows.Forms.Label(); + this.label36 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label(); @@ -115,9 +118,6 @@ this.timerUpdate = new System.Windows.Forms.Timer(this.components); this.lblTimeCTD = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); - this.label19 = new System.Windows.Forms.Label(); - this.lblSality = new System.Windows.Forms.Label(); - this.label36 = new System.Windows.Forms.Label(); this.panel.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -130,7 +130,7 @@ this.lblTu.AutoSize = true; this.lblTu.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.lblTu.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblTu.Location = new System.Drawing.Point(29, 230); + this.lblTu.Location = new System.Drawing.Point(27, 215); this.lblTu.Name = "lblTu"; this.lblTu.Size = new System.Drawing.Size(138, 32); this.lblTu.TabIndex = 26; @@ -141,7 +141,7 @@ this.lblD.AutoSize = true; this.lblD.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.lblD.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblD.Location = new System.Drawing.Point(29, 110); + this.lblD.Location = new System.Drawing.Point(27, 103); this.lblD.Name = "lblD"; this.lblD.Size = new System.Drawing.Size(167, 32); this.lblD.TabIndex = 25; @@ -152,7 +152,7 @@ this.lblCo.AutoSize = true; this.lblCo.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.lblCo.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblCo.Location = new System.Drawing.Point(29, 170); + this.lblCo.Location = new System.Drawing.Point(27, 159); this.lblCo.Name = "lblCo"; this.lblCo.Size = new System.Drawing.Size(138, 32); this.lblCo.TabIndex = 24; @@ -163,7 +163,7 @@ this.lblp.AutoSize = true; this.lblp.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.lblp.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblp.Location = new System.Drawing.Point(29, 290); + this.lblp.Location = new System.Drawing.Point(27, 271); this.lblp.Name = "lblp"; this.lblp.Size = new System.Drawing.Size(117, 32); this.lblp.TabIndex = 23; @@ -174,7 +174,7 @@ this.lblT.AutoSize = true; this.lblT.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.lblT.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblT.Location = new System.Drawing.Point(29, 50); + this.lblT.Location = new System.Drawing.Point(27, 47); this.lblT.Name = "lblT"; this.lblT.Size = new System.Drawing.Size(138, 32); this.lblT.TabIndex = 22; @@ -189,14 +189,14 @@ this.panel.ForeColor = System.Drawing.SystemColors.ControlLightLight; this.panel.Location = new System.Drawing.Point(0, 0); this.panel.Name = "panel"; - this.panel.Size = new System.Drawing.Size(1560, 85); + this.panel.Size = new System.Drawing.Size(1560, 80); this.panel.TabIndex = 27; // // lblTitle // this.lblTitle.AutoSize = true; this.lblTitle.Font = new System.Drawing.Font("方正楷体简体", 26.25F); - this.lblTitle.Location = new System.Drawing.Point(27, 25); + this.lblTitle.Location = new System.Drawing.Point(25, 23); this.lblTitle.Name = "lblTitle"; this.lblTitle.Size = new System.Drawing.Size(157, 38); this.lblTitle.TabIndex = 0; @@ -224,9 +224,9 @@ this.groupBox1.Controls.Add(this.lblT); this.groupBox1.Controls.Add(this.lblCo); this.groupBox1.Font = new System.Drawing.Font("方正楷体简体", 20.25F); - this.groupBox1.Location = new System.Drawing.Point(51, 114); + this.groupBox1.Location = new System.Drawing.Point(66, 107); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(496, 457); + this.groupBox1.Size = new System.Drawing.Size(465, 428); this.groupBox1.TabIndex = 28; this.groupBox1.TabStop = false; this.groupBox1.Text = "▷ EXO2"; @@ -235,7 +235,7 @@ // this.label7.AutoSize = true; this.label7.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label7.Location = new System.Drawing.Point(306, 350); + this.label7.Location = new System.Drawing.Point(287, 327); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(67, 29); this.label7.TabIndex = 75; @@ -245,7 +245,7 @@ // this.label11.AutoSize = true; this.label11.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label11.Location = new System.Drawing.Point(306, 230); + this.label11.Location = new System.Drawing.Point(287, 215); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(74, 29); this.label11.TabIndex = 37; @@ -255,7 +255,7 @@ // this.lblChlorophyll.AutoSize = true; this.lblChlorophyll.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblChlorophyll.Location = new System.Drawing.Point(202, 350); + this.lblChlorophyll.Location = new System.Drawing.Point(189, 327); this.lblChlorophyll.Name = "lblChlorophyll"; this.lblChlorophyll.Size = new System.Drawing.Size(73, 29); this.lblChlorophyll.TabIndex = 74; @@ -265,7 +265,7 @@ // this.lblTimeMulti.AutoSize = true; this.lblTimeMulti.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblTimeMulti.Location = new System.Drawing.Point(202, 410); + this.lblTimeMulti.Location = new System.Drawing.Point(189, 384); this.lblTimeMulti.Name = "lblTimeMulti"; this.lblTimeMulti.Size = new System.Drawing.Size(73, 29); this.lblTimeMulti.TabIndex = 62; @@ -276,7 +276,7 @@ this.label34.AutoSize = true; this.label34.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label34.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label34.Location = new System.Drawing.Point(29, 350); + this.label34.Location = new System.Drawing.Point(27, 327); this.label34.Name = "label34"; this.label34.Size = new System.Drawing.Size(167, 32); this.label34.TabIndex = 73; @@ -286,7 +286,7 @@ // this.label10.AutoSize = true; this.label10.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label10.Location = new System.Drawing.Point(306, 110); + this.label10.Location = new System.Drawing.Point(287, 103); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(74, 29); this.label10.TabIndex = 36; @@ -297,7 +297,7 @@ this.label12.AutoSize = true; this.label12.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label12.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label12.Location = new System.Drawing.Point(29, 410); + this.label12.Location = new System.Drawing.Point(27, 384); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(138, 32); this.label12.TabIndex = 61; @@ -307,7 +307,7 @@ // this.label9.AutoSize = true; this.label9.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label9.Location = new System.Drawing.Point(306, 170); + this.label9.Location = new System.Drawing.Point(287, 159); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(47, 29); this.label9.TabIndex = 35; @@ -317,7 +317,7 @@ // this.label8.AutoSize = true; this.label8.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label8.Location = new System.Drawing.Point(321, 50); + this.label8.Location = new System.Drawing.Point(301, 47); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(40, 29); this.label8.TabIndex = 34; @@ -327,7 +327,7 @@ // this.lblTurbidity.AutoSize = true; this.lblTurbidity.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblTurbidity.Location = new System.Drawing.Point(202, 230); + this.lblTurbidity.Location = new System.Drawing.Point(189, 215); this.lblTurbidity.Name = "lblTurbidity"; this.lblTurbidity.Size = new System.Drawing.Size(73, 29); this.lblTurbidity.TabIndex = 32; @@ -337,7 +337,7 @@ // this.lblDissolvedOxygen.AutoSize = true; this.lblDissolvedOxygen.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblDissolvedOxygen.Location = new System.Drawing.Point(202, 110); + this.lblDissolvedOxygen.Location = new System.Drawing.Point(189, 103); this.lblDissolvedOxygen.Name = "lblDissolvedOxygen"; this.lblDissolvedOxygen.Size = new System.Drawing.Size(73, 29); this.lblDissolvedOxygen.TabIndex = 31; @@ -347,7 +347,7 @@ // this.lblpH.AutoSize = true; this.lblpH.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblpH.Location = new System.Drawing.Point(202, 290); + this.lblpH.Location = new System.Drawing.Point(189, 271); this.lblpH.Name = "lblpH"; this.lblpH.Size = new System.Drawing.Size(73, 29); this.lblpH.TabIndex = 30; @@ -357,7 +357,7 @@ // this.lblTemperature.AutoSize = true; this.lblTemperature.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblTemperature.Location = new System.Drawing.Point(202, 50); + this.lblTemperature.Location = new System.Drawing.Point(189, 47); this.lblTemperature.Name = "lblTemperature"; this.lblTemperature.Size = new System.Drawing.Size(73, 29); this.lblTemperature.TabIndex = 29; @@ -367,7 +367,7 @@ // this.lblConductivity.AutoSize = true; this.lblConductivity.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblConductivity.Location = new System.Drawing.Point(202, 170); + this.lblConductivity.Location = new System.Drawing.Point(189, 159); this.lblConductivity.Name = "lblConductivity"; this.lblConductivity.Size = new System.Drawing.Size(73, 29); this.lblConductivity.TabIndex = 28; @@ -375,7 +375,9 @@ // // groupBox2 // + this.groupBox2.Controls.Add(this.lblTimeCTD); this.groupBox2.Controls.Add(this.label19); + this.groupBox2.Controls.Add(this.label5); this.groupBox2.Controls.Add(this.lblSality); this.groupBox2.Controls.Add(this.label36); this.groupBox2.Controls.Add(this.label13); @@ -389,17 +391,48 @@ this.groupBox2.Controls.Add(this.label28); this.groupBox2.Font = new System.Drawing.Font("方正楷体简体", 20.25F); this.groupBox2.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.groupBox2.Location = new System.Drawing.Point(589, 680); + this.groupBox2.Location = new System.Drawing.Point(589, 626); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(908, 166); + this.groupBox2.Size = new System.Drawing.Size(896, 220); this.groupBox2.TabIndex = 38; this.groupBox2.TabStop = false; this.groupBox2.Text = "▷ CTD"; // + // label19 + // + this.label19.AutoSize = true; + this.label19.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; + this.label19.Location = new System.Drawing.Point(759, 47); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(47, 29); + this.label19.TabIndex = 81; + this.label19.Text = "ppt"; + // + // lblSality + // + this.lblSality.AutoSize = true; + this.lblSality.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; + this.lblSality.Location = new System.Drawing.Point(654, 47); + this.lblSality.Name = "lblSality"; + this.lblSality.Size = new System.Drawing.Size(73, 29); + this.lblSality.TabIndex = 80; + this.lblSality.Text = "XXX"; + // + // label36 + // + this.label36.AutoSize = true; + this.label36.Font = new System.Drawing.Font("方正楷体简体", 21.75F); + this.label36.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; + this.label36.Location = new System.Drawing.Point(492, 47); + this.label36.Name = "label36"; + this.label36.Size = new System.Drawing.Size(138, 32); + this.label36.TabIndex = 79; + this.label36.Text = "④ 盐度："; + // // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(763, 50); + this.label13.Location = new System.Drawing.Point(324, 166); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(34, 29); this.label13.TabIndex = 36; @@ -408,7 +441,7 @@ // label14 // this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(318, 115); + this.label14.Location = new System.Drawing.Point(324, 108); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(91, 29); this.label14.TabIndex = 35; @@ -417,7 +450,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(325, 50); + this.label15.Location = new System.Drawing.Point(331, 47); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(40, 29); this.label15.TabIndex = 34; @@ -426,7 +459,7 @@ // lblPressure1 // this.lblPressure1.AutoSize = true; - this.lblPressure1.Location = new System.Drawing.Point(651, 50); + this.lblPressure1.Location = new System.Drawing.Point(219, 166); this.lblPressure1.Name = "lblPressure1"; this.lblPressure1.Size = new System.Drawing.Size(73, 29); this.lblPressure1.TabIndex = 31; @@ -435,7 +468,7 @@ // lblWaterTemperature // this.lblWaterTemperature.AutoSize = true; - this.lblWaterTemperature.Location = new System.Drawing.Point(206, 50); + this.lblWaterTemperature.Location = new System.Drawing.Point(219, 47); this.lblWaterTemperature.Name = "lblWaterTemperature"; this.lblWaterTemperature.Size = new System.Drawing.Size(73, 29); this.lblWaterTemperature.TabIndex = 29; @@ -444,7 +477,7 @@ // lblConductivityCTD // this.lblConductivityCTD.AutoSize = true; - this.lblConductivityCTD.Location = new System.Drawing.Point(206, 115); + this.lblConductivityCTD.Location = new System.Drawing.Point(219, 108); this.lblConductivityCTD.Name = "lblConductivityCTD"; this.lblConductivityCTD.Size = new System.Drawing.Size(73, 29); this.lblConductivityCTD.TabIndex = 28; @@ -455,7 +488,7 @@ this.label26.AutoSize = true; this.label26.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label26.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label26.Location = new System.Drawing.Point(478, 50); + this.label26.Location = new System.Drawing.Point(57, 166); this.label26.Name = "label26"; this.label26.Size = new System.Drawing.Size(138, 32); this.label26.TabIndex = 25; @@ -466,7 +499,7 @@ this.label27.AutoSize = true; this.label27.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label27.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label27.Location = new System.Drawing.Point(33, 50); + this.label27.Location = new System.Drawing.Point(57, 47); this.label27.Name = "label27"; this.label27.Size = new System.Drawing.Size(138, 32); this.label27.TabIndex = 22; @@ -477,7 +510,7 @@ this.label28.AutoSize = true; this.label28.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label28.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label28.Location = new System.Drawing.Point(33, 115); + this.label28.Location = new System.Drawing.Point(57, 108); this.label28.Name = "label28"; this.label28.Size = new System.Drawing.Size(167, 32); this.label28.TabIndex = 24; @@ -530,9 +563,9 @@ this.groupBox3.Controls.Add(this.label44); this.groupBox3.Controls.Add(this.label45); this.groupBox3.Font = new System.Drawing.Font("方正楷体简体", 20.25F); - this.groupBox3.Location = new System.Drawing.Point(589, 114); + this.groupBox3.Location = new System.Drawing.Point(589, 97); this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(908, 545); + this.groupBox3.Size = new System.Drawing.Size(896, 510); this.groupBox3.TabIndex = 39; this.groupBox3.TabStop = false; this.groupBox3.Text = "▷ ADCP"; @@ -541,7 +574,7 @@ // this.label2.AutoSize = true; this.label2.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label2.Location = new System.Drawing.Point(775, 245); + this.label2.Location = new System.Drawing.Point(771, 226); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(21, 29); this.label2.TabIndex = 73; @@ -551,7 +584,7 @@ // this.label4.AutoSize = true; this.label4.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label4.Location = new System.Drawing.Point(775, 375); + this.label4.Location = new System.Drawing.Point(771, 348); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(34, 29); this.label4.TabIndex = 72; @@ -561,7 +594,7 @@ // this.label1.AutoSize = true; this.label1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label1.Location = new System.Drawing.Point(775, 310); + this.label1.Location = new System.Drawing.Point(771, 287); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(40, 29); this.label1.TabIndex = 71; @@ -571,7 +604,7 @@ // this.label30.AutoSize = true; this.label30.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label30.Location = new System.Drawing.Point(775, 115); + this.label30.Location = new System.Drawing.Point(771, 105); this.label30.Name = "label30"; this.label30.Size = new System.Drawing.Size(40, 29); this.label30.TabIndex = 70; @@ -581,7 +614,7 @@ // this.label29.AutoSize = true; this.label29.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label29.Location = new System.Drawing.Point(337, 500); + this.label29.Location = new System.Drawing.Point(342, 468); this.label29.Name = "label29"; this.label29.Size = new System.Drawing.Size(40, 29); this.label29.TabIndex = 69; @@ -591,7 +624,7 @@ // this.label24.AutoSize = true; this.label24.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label24.Location = new System.Drawing.Point(337, 375); + this.label24.Location = new System.Drawing.Point(342, 351); this.label24.Name = "label24"; this.label24.Size = new System.Drawing.Size(40, 29); this.label24.TabIndex = 68; @@ -601,7 +634,7 @@ // this.label23.AutoSize = true; this.label23.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label23.Location = new System.Drawing.Point(337, 245); + this.label23.Location = new System.Drawing.Point(342, 229); this.label23.Name = "label23"; this.label23.Size = new System.Drawing.Size(40, 29); this.label23.TabIndex = 67; @@ -611,7 +644,7 @@ // this.label22.AutoSize = true; this.label22.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label22.Location = new System.Drawing.Point(761, 50); + this.label22.Location = new System.Drawing.Point(757, 44); this.label22.Name = "label22"; this.label22.Size = new System.Drawing.Size(54, 29); this.label22.TabIndex = 66; @@ -621,7 +654,7 @@ // this.label21.AutoSize = true; this.label21.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label21.Location = new System.Drawing.Point(325, 437); + this.label21.Location = new System.Drawing.Point(331, 409); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(54, 29); this.label21.TabIndex = 65; @@ -631,7 +664,7 @@ // this.label20.AutoSize = true; this.label20.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label20.Location = new System.Drawing.Point(325, 310); + this.label20.Location = new System.Drawing.Point(331, 290); this.label20.Name = "label20"; this.label20.Size = new System.Drawing.Size(54, 29); this.label20.TabIndex = 64; @@ -641,7 +674,7 @@ // this.label18.AutoSize = true; this.label18.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label18.Location = new System.Drawing.Point(325, 180); + this.label18.Location = new System.Drawing.Point(331, 168); this.label18.Name = "label18"; this.label18.Size = new System.Drawing.Size(54, 29); this.label18.TabIndex = 63; @@ -651,7 +684,7 @@ // this.lblTimeADCP.AutoSize = true; this.lblTimeADCP.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblTimeADCP.Location = new System.Drawing.Point(651, 437); + this.lblTimeADCP.Location = new System.Drawing.Point(654, 406); this.lblTimeADCP.Name = "lblTimeADCP"; this.lblTimeADCP.Size = new System.Drawing.Size(73, 29); this.lblTimeADCP.TabIndex = 62; @@ -662,7 +695,7 @@ this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label16.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label16.Location = new System.Drawing.Point(478, 437); + this.label16.Location = new System.Drawing.Point(492, 406); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(138, 32); this.label16.TabIndex = 61; @@ -672,7 +705,7 @@ // this.lblDepth.AutoSize = true; this.lblDepth.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblDepth.Location = new System.Drawing.Point(651, 375); + this.lblDepth.Location = new System.Drawing.Point(654, 348); this.lblDepth.Name = "lblDepth"; this.lblDepth.Size = new System.Drawing.Size(73, 29); this.lblDepth.TabIndex = 59; @@ -683,7 +716,7 @@ this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label6.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label6.Location = new System.Drawing.Point(478, 375); + this.label6.Location = new System.Drawing.Point(492, 348); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(138, 32); this.label6.TabIndex = 58; @@ -693,7 +726,7 @@ // this.lblWaveDirection.AutoSize = true; this.lblWaveDirection.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblWaveDirection.Location = new System.Drawing.Point(651, 310); + this.lblWaveDirection.Location = new System.Drawing.Point(654, 287); this.lblWaveDirection.Name = "lblWaveDirection"; this.lblWaveDirection.Size = new System.Drawing.Size(73, 29); this.lblWaveDirection.TabIndex = 56; @@ -704,7 +737,7 @@ this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label3.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label3.Location = new System.Drawing.Point(478, 310); + this.label3.Location = new System.Drawing.Point(492, 287); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(138, 32); this.label3.TabIndex = 55; @@ -714,7 +747,7 @@ // this.label47.AutoSize = true; this.label47.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label47.Location = new System.Drawing.Point(775, 180); + this.label47.Location = new System.Drawing.Point(771, 165); this.label47.Name = "label47"; this.label47.Size = new System.Drawing.Size(34, 29); this.label47.TabIndex = 53; @@ -724,7 +757,7 @@ // this.lblPeriod.AutoSize = true; this.lblPeriod.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblPeriod.Location = new System.Drawing.Point(651, 245); + this.lblPeriod.Location = new System.Drawing.Point(654, 226); this.lblPeriod.Name = "lblPeriod"; this.lblPeriod.Size = new System.Drawing.Size(73, 29); this.lblPeriod.TabIndex = 49; @@ -734,7 +767,7 @@ // this.lblHeight.AutoSize = true; this.lblHeight.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblHeight.Location = new System.Drawing.Point(651, 180); + this.lblHeight.Location = new System.Drawing.Point(654, 165); this.lblHeight.Name = "lblHeight"; this.lblHeight.Size = new System.Drawing.Size(73, 29); this.lblHeight.TabIndex = 48; @@ -744,7 +777,7 @@ // this.lblSpeed5.AutoSize = true; this.lblSpeed5.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblSpeed5.Location = new System.Drawing.Point(651, 50); + this.lblSpeed5.Location = new System.Drawing.Point(654, 44); this.lblSpeed5.Name = "lblSpeed5"; this.lblSpeed5.Size = new System.Drawing.Size(73, 29); this.lblSpeed5.TabIndex = 47; @@ -754,7 +787,7 @@ // this.lblDirection4.AutoSize = true; this.lblDirection4.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblDirection4.Location = new System.Drawing.Point(206, 500); + this.lblDirection4.Location = new System.Drawing.Point(219, 468); this.lblDirection4.Name = "lblDirection4"; this.lblDirection4.Size = new System.Drawing.Size(73, 29); this.lblDirection4.TabIndex = 46; @@ -764,7 +797,7 @@ // this.lblDirection5.AutoSize = true; this.lblDirection5.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblDirection5.Location = new System.Drawing.Point(651, 115); + this.lblDirection5.Location = new System.Drawing.Point(654, 105); this.lblDirection5.Name = "lblDirection5"; this.lblDirection5.Size = new System.Drawing.Size(73, 29); this.lblDirection5.TabIndex = 45; @@ -774,7 +807,7 @@ // this.lblSpeed4.AutoSize = true; this.lblSpeed4.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblSpeed4.Location = new System.Drawing.Point(206, 440); + this.lblSpeed4.Location = new System.Drawing.Point(219, 412); this.lblSpeed4.Name = "lblSpeed4"; this.lblSpeed4.Size = new System.Drawing.Size(73, 29); this.lblSpeed4.TabIndex = 44; @@ -785,7 +818,7 @@ this.label57.AutoSize = true; this.label57.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label57.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label57.Location = new System.Drawing.Point(478, 50); + this.label57.Location = new System.Drawing.Point(492, 44); this.label57.Name = "label57"; this.label57.Size = new System.Drawing.Size(152, 32); this.label57.TabIndex = 40; @@ -796,7 +829,7 @@ this.label58.AutoSize = true; this.label58.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label58.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label58.Location = new System.Drawing.Point(33, 440); + this.label58.Location = new System.Drawing.Point(57, 412); this.label58.Name = "label58"; this.label58.Size = new System.Drawing.Size(152, 32); this.label58.TabIndex = 38; @@ -807,7 +840,7 @@ this.label59.AutoSize = true; this.label59.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label59.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label59.Location = new System.Drawing.Point(478, 245); + this.label59.Location = new System.Drawing.Point(492, 226); this.label59.Name = "label59"; this.label59.Size = new System.Drawing.Size(167, 32); this.label59.TabIndex = 43; @@ -818,7 +851,7 @@ this.label60.AutoSize = true; this.label60.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label60.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label60.Location = new System.Drawing.Point(478, 180); + this.label60.Location = new System.Drawing.Point(492, 165); this.label60.Name = "label60"; this.label60.Size = new System.Drawing.Size(138, 32); this.label60.TabIndex = 42; @@ -829,7 +862,7 @@ this.label61.AutoSize = true; this.label61.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label61.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label61.Location = new System.Drawing.Point(33, 500); + this.label61.Location = new System.Drawing.Point(57, 468); this.label61.Name = "label61"; this.label61.Size = new System.Drawing.Size(152, 32); this.label61.TabIndex = 39; @@ -840,7 +873,7 @@ this.label62.AutoSize = true; this.label62.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label62.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label62.Location = new System.Drawing.Point(478, 115); + this.label62.Location = new System.Drawing.Point(492, 105); this.label62.Name = "label62"; this.label62.Size = new System.Drawing.Size(152, 32); this.label62.TabIndex = 41; @@ -850,7 +883,7 @@ // this.label32.AutoSize = true; this.label32.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label32.Location = new System.Drawing.Point(337, 115); + this.label32.Location = new System.Drawing.Point(342, 108); this.label32.Name = "label32"; this.label32.Size = new System.Drawing.Size(40, 29); this.label32.TabIndex = 34; @@ -860,7 +893,7 @@ // this.label33.AutoSize = true; this.label33.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label33.Location = new System.Drawing.Point(325, 50); + this.label33.Location = new System.Drawing.Point(331, 47); this.label33.Name = "label33"; this.label33.Size = new System.Drawing.Size(54, 29); this.label33.TabIndex = 33; @@ -870,7 +903,7 @@ // this.lblDirection3.AutoSize = true; this.lblDirection3.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblDirection3.Location = new System.Drawing.Point(206, 375); + this.lblDirection3.Location = new System.Drawing.Point(219, 351); this.lblDirection3.Name = "lblDirection3"; this.lblDirection3.Size = new System.Drawing.Size(73, 29); this.lblDirection3.TabIndex = 32; @@ -880,7 +913,7 @@ // this.lblSpeed3.AutoSize = true; this.lblSpeed3.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblSpeed3.Location = new System.Drawing.Point(206, 310); + this.lblSpeed3.Location = new System.Drawing.Point(219, 290); this.lblSpeed3.Name = "lblSpeed3"; this.lblSpeed3.Size = new System.Drawing.Size(73, 29); this.lblSpeed3.TabIndex = 31; @@ -890,7 +923,7 @@ // this.lblSpeed2.AutoSize = true; this.lblSpeed2.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblSpeed2.Location = new System.Drawing.Point(206, 180); + this.lblSpeed2.Location = new System.Drawing.Point(219, 168); this.lblSpeed2.Name = "lblSpeed2"; this.lblSpeed2.Size = new System.Drawing.Size(73, 29); this.lblSpeed2.TabIndex = 30; @@ -900,7 +933,7 @@ // this.lblDirection1.AutoSize = true; this.lblDirection1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblDirection1.Location = new System.Drawing.Point(206, 115); + this.lblDirection1.Location = new System.Drawing.Point(219, 108); this.lblDirection1.Name = "lblDirection1"; this.lblDirection1.Size = new System.Drawing.Size(73, 29); this.lblDirection1.TabIndex = 29; @@ -910,7 +943,7 @@ // this.lblDirection2.AutoSize = true; this.lblDirection2.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblDirection2.Location = new System.Drawing.Point(206, 245); + this.lblDirection2.Location = new System.Drawing.Point(219, 229); this.lblDirection2.Name = "lblDirection2"; this.lblDirection2.Size = new System.Drawing.Size(73, 29); this.lblDirection2.TabIndex = 28; @@ -920,7 +953,7 @@ // this.lblSpeed1.AutoSize = true; this.lblSpeed1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblSpeed1.Location = new System.Drawing.Point(206, 50); + this.lblSpeed1.Location = new System.Drawing.Point(219, 47); this.lblSpeed1.Name = "lblSpeed1"; this.lblSpeed1.Size = new System.Drawing.Size(73, 29); this.lblSpeed1.TabIndex = 27; @@ -931,7 +964,7 @@ this.label40.AutoSize = true; this.label40.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label40.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label40.Location = new System.Drawing.Point(33, 180); + this.label40.Location = new System.Drawing.Point(57, 168); this.label40.Name = "label40"; this.label40.Size = new System.Drawing.Size(152, 32); this.label40.TabIndex = 23; @@ -942,7 +975,7 @@ this.label41.AutoSize = true; this.label41.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label41.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label41.Location = new System.Drawing.Point(33, 50); + this.label41.Location = new System.Drawing.Point(57, 47); this.label41.Name = "label41"; this.label41.Size = new System.Drawing.Size(152, 32); this.label41.TabIndex = 21; @@ -953,7 +986,7 @@ this.label42.AutoSize = true; this.label42.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label42.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label42.Location = new System.Drawing.Point(33, 375); + this.label42.Location = new System.Drawing.Point(57, 351); this.label42.Name = "label42"; this.label42.Size = new System.Drawing.Size(152, 32); this.label42.TabIndex = 26; @@ -964,7 +997,7 @@ this.label43.AutoSize = true; this.label43.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label43.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label43.Location = new System.Drawing.Point(33, 310); + this.label43.Location = new System.Drawing.Point(57, 290); this.label43.Name = "label43"; this.label43.Size = new System.Drawing.Size(152, 32); this.label43.TabIndex = 25; @@ -975,7 +1008,7 @@ this.label44.AutoSize = true; this.label44.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label44.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label44.Location = new System.Drawing.Point(33, 115); + this.label44.Location = new System.Drawing.Point(57, 108); this.label44.Name = "label44"; this.label44.Size = new System.Drawing.Size(152, 32); this.label44.TabIndex = 22; @@ -986,7 +1019,7 @@ this.label45.AutoSize = true; this.label45.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label45.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label45.Location = new System.Drawing.Point(33, 245); + this.label45.Location = new System.Drawing.Point(57, 229); this.label45.Name = "label45"; this.label45.Size = new System.Drawing.Size(152, 32); this.label45.TabIndex = 24; @@ -1001,9 +1034,9 @@ this.groupBox4.Controls.Add(this.label25); this.groupBox4.Font = new System.Drawing.Font("方正楷体简体", 20.25F); this.groupBox4.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.groupBox4.Location = new System.Drawing.Point(51, 602); + this.groupBox4.Location = new System.Drawing.Point(66, 619); this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(496, 157); + this.groupBox4.Size = new System.Drawing.Size(465, 147); this.groupBox4.TabIndex = 39; this.groupBox4.TabStop = false; this.groupBox4.Text = "▷ CO2"; @@ -1013,7 +1046,7 @@ this.label31.AutoSize = true; this.label31.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label31.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label31.Location = new System.Drawing.Point(42, 48); + this.label31.Location = new System.Drawing.Point(39, 45); this.label31.Name = "label31"; this.label31.Size = new System.Drawing.Size(138, 32); this.label31.TabIndex = 65; @@ -1023,7 +1056,7 @@ // this.lblTimeCO2.AutoSize = true; this.lblTimeCO2.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblTimeCO2.Location = new System.Drawing.Point(202, 110); + this.lblTimeCO2.Location = new System.Drawing.Point(189, 103); this.lblTimeCO2.Name = "lblTimeCO2"; this.lblTimeCO2.Size = new System.Drawing.Size(73, 29); this.lblTimeCO2.TabIndex = 64; @@ -1032,7 +1065,7 @@ // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(321, 50); + this.label17.Location = new System.Drawing.Point(301, 47); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(67, 29); this.label17.TabIndex = 34; @@ -1041,7 +1074,7 @@ // lblPotency // this.lblPotency.AutoSize = true; - this.lblPotency.Location = new System.Drawing.Point(202, 50); + this.lblPotency.Location = new System.Drawing.Point(189, 47); this.lblPotency.Name = "lblPotency"; this.lblPotency.Size = new System.Drawing.Size(73, 29); this.lblPotency.TabIndex = 29; @@ -1052,7 +1085,7 @@ this.label25.AutoSize = true; this.label25.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label25.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label25.Location = new System.Drawing.Point(42, 108); + this.label25.Location = new System.Drawing.Point(39, 101); this.label25.Name = "label25"; this.label25.Size = new System.Drawing.Size(138, 32); this.label25.TabIndex = 22; @@ -1067,7 +1100,7 @@ this.lblTimeCTD.AutoSize = true; this.lblTimeCTD.Font = new System.Drawing.Font("方正楷体简体", 20.25F); this.lblTimeCTD.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblTimeCTD.Location = new System.Drawing.Point(253, 793); + this.lblTimeCTD.Location = new System.Drawing.Point(654, 106); this.lblTimeCTD.Name = "lblTimeCTD"; this.lblTimeCTD.Size = new System.Drawing.Size(73, 29); this.lblTimeCTD.TabIndex = 66; @@ -1078,57 +1111,24 @@ this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label5.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label5.Location = new System.Drawing.Point(93, 793); + this.label5.Location = new System.Drawing.Point(492, 106); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(138, 32); this.label5.TabIndex = 65; this.label5.Text = "⑤ 时间："; // - // label19 - // - this.label19.AutoSize = true; - this.label19.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label19.Location = new System.Drawing.Point(763, 115); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(47, 29); - this.label19.TabIndex = 81; - this.label19.Text = "ppt"; - // - // lblSality - // - this.lblSality.AutoSize = true; - this.lblSality.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblSality.Location = new System.Drawing.Point(651, 115); - this.lblSality.Name = "lblSality"; - this.lblSality.Size = new System.Drawing.Size(73, 29); - this.lblSality.TabIndex = 80; - this.lblSality.Text = "XXX"; - // - // label36 - // - this.label36.AutoSize = true; - this.label36.Font = new System.Drawing.Font("方正楷体简体", 21.75F); - this.label36.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label36.Location = new System.Drawing.Point(478, 115); - this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(138, 32); - this.label36.TabIndex = 79; - this.label36.Text = "④ 盐度："; - // // RealTimeDataForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(16F, 31F); + this.AutoScaleDimensions = new System.Drawing.SizeF(15F, 29F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(236)))), ((int)(((byte)(233))))); this.ClientSize = new System.Drawing.Size(1560, 868); - this.Controls.Add(this.lblTimeCTD); - this.Controls.Add(this.label5); this.Controls.Add(this.groupBox4); this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.panel); - this.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Font = new System.Drawing.Font("方正楷体简体", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Margin = new System.Windows.Forms.Padding(8, 7, 8, 7); this.Name = "RealTimeDataForm"; @@ -1146,7 +1146,6 @@ this.groupBox4.ResumeLayout(false); this.groupBox4.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ZTTMS_Manage_yibayiyi_20230320.csproj b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ZTTMS_Manage_yibayiyi_20230320.csproj index 244ac04..a630e96 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ZTTMS_Manage_yibayiyi_20230320.csproj +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/ZTTMS_Manage_yibayiyi_20230320.csproj @@ -296,6 +296,12 @@ MessageBoxForm.cs + + Form + + + NetworkSetForm.cs + Form @@ -431,6 +437,9 @@ MessageBoxForm.cs Designer + + NetworkSetForm.cs + OtherSettingForm.cs 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 af9f17f..84a48c9 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 0dcf369..897354a 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 9a228e0..6dd8cd7 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/Interop.WMPLib.dll b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/Interop.WMPLib.dll index af9f17f..84a48c9 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.MainForm.resources b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.MainForm.resources index cd9e21b..541aa8f 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.MainForm.resources and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.MainForm.resources differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.NetworkSetForm.resources b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.NetworkSetForm.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_64_V1.3/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.NetworkSetForm.resources 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 7643e57..38e6668 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 @@ -5a65d66a2847f2c25feb8512df84fb71610de84a +937589c4ab3dfe59f61a0cc7fd02343dc431e11a 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 e9a9995..4789ab6 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 @@ -3055,3 +3055,4 @@ F:\Code\yibayiyi\20230201_1811_upperpc_64\ZTTMS_Manage_yibayiyi_KeepaliveTest3_G 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 +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.NetworkSetForm.resources 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 85a845f..e8b673a 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 7c4fa4e..c149097 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 0dcf369..897354a 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 9a228e0..6dd8cd7 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