|
|
@@ -1,19 +1,19 @@
|
|
|
using System;
|
|
|
-using DevExpress.XtraBars;
|
|
|
-using UAS_DeviceMonitor.DataOperate;
|
|
|
using System.Data;
|
|
|
using System.Text;
|
|
|
-using UAS_DeviceMonitor.Entity;
|
|
|
-using UAS_DeviceMonitor.PublicMethod;
|
|
|
-using DevExpress.XtraGrid.Views.Grid;
|
|
|
using System.Collections.Generic;
|
|
|
using System.Drawing;
|
|
|
-using DevExpress.XtraBars.Ribbon;
|
|
|
using System.Threading;
|
|
|
-using UAS_DeviceMonitor.CustomerControl.PictureEditWithText;
|
|
|
using System.Windows.Forms;
|
|
|
+using DevExpress.XtraBars;
|
|
|
+using DevExpress.XtraGrid.Views.Grid;
|
|
|
+using DevExpress.XtraBars.Ribbon;
|
|
|
using DevExpress.XtraEditors.Controls;
|
|
|
using DevExpress.XtraEditors;
|
|
|
+using UAS_DeviceMonitor.DataOperate;
|
|
|
+using UAS_DeviceMonitor.Entity;
|
|
|
+using UAS_DeviceMonitor.PublicMethod;
|
|
|
+using UAS_DeviceMonitor.CustomerControl.PictureEditWithText;
|
|
|
using UAS_DeviceMonitor.Device.Infomation;
|
|
|
|
|
|
namespace UAS_DeviceMonitor
|
|
|
@@ -249,7 +249,6 @@ namespace UAS_DeviceMonitor
|
|
|
private void ButtonStartPolling_Click(object sender, EventArgs e)
|
|
|
{
|
|
|
GridView grid = GridViewPollSetting;
|
|
|
-
|
|
|
for (int i = 0; i < GridPollingSetting.RowCount; i++)
|
|
|
{
|
|
|
Polling pl = new Polling();
|
|
|
@@ -257,7 +256,6 @@ namespace UAS_DeviceMonitor
|
|
|
pl.DeviceCode = GridViewPollSetting.GetRowCellValue(i, "DPC_DECODE").ToString();
|
|
|
pl.CommandCode = GridViewPollSetting.GetRowCellValue(i, "DPC_DCCODE").ToString();
|
|
|
pl.Interval = int.Parse(GridViewPollSetting.GetRowCellValue(i, "DPC_INTERVAL").ToString());
|
|
|
- pl.SendRadix = GridViewPollSetting.GetRowCellValue(i, "DPC_INTERVAL").ToString();
|
|
|
pl.Enable = GridViewPollSetting.GetRowCellValue(i, "DPC_ENABLE").ToString() != "0";
|
|
|
pl.Dh = new DataHelper();
|
|
|
if (pl.Enable)
|
|
|
@@ -295,7 +293,7 @@ namespace UAS_DeviceMonitor
|
|
|
PollingTimer timer = new PollingTimer();
|
|
|
Polling pl = (Polling)i;
|
|
|
timer.Polling = i;
|
|
|
- timer.Interval = pl.Interval * 5000;
|
|
|
+ timer.Interval = pl.Interval * 1000;
|
|
|
timer.Elapsed += Timer_Tick;
|
|
|
timer.Start();
|
|
|
try
|
|
|
@@ -417,6 +415,7 @@ namespace UAS_DeviceMonitor
|
|
|
pl.Id = int.Parse(GridViewPollSetting.GetRowCellValue(e.RowHandle, "DPC_ID").ToString());
|
|
|
pl.DeviceCode = GridViewPollSetting.GetRowCellValue(e.RowHandle, "DPC_DECODE").ToString();
|
|
|
pl.Interval = int.Parse(GridViewPollSetting.GetRowCellValue(e.RowHandle, "DPC_INTERVAL").ToString());
|
|
|
+ pl.CommandCode = GridViewPollSetting.GetRowCellValue(e.RowHandle, "DPC_DCCODE").ToString();
|
|
|
pl.Enable = GridViewPollSetting.GetRowCellValue(e.RowHandle, "DPC_ENABLE").ToString() != "0";
|
|
|
pl.Dh = new DataHelper();
|
|
|
if (pl.Enable)
|
章政