章政 7 سال پیش
والد
کامیت
812238fba2
3فایلهای تغییر یافته به همراه12 افزوده شده و 6 حذف شده
  1. 4 0
      UAS-出货标签管理/UAS_出货标签管理.Designer.cs
  2. 6 2
      UAS_DeviceMonitor/Main.Designer.cs
  3. 2 4
      UAS_DeviceMonitor/Main.cs

+ 4 - 0
UAS-出货标签管理/UAS_出货标签管理.Designer.cs

@@ -528,6 +528,10 @@
             this.PowerSetting.Visible = false;
             this.PowerSetting.Click += new System.EventHandler(this.PowerSetting_Click);
             // 
+            // RefreshDBConnect
+            // 
+            this.RefreshDBConnect.Tick += new System.EventHandler(this.RefreshDBConnect_Tick);
+            // 
             // GetGridOnly
             // 
             this.GetGridOnly.AutoSize = true;

+ 6 - 2
UAS_DeviceMonitor/Main.Designer.cs

@@ -139,7 +139,7 @@ namespace UAS_DeviceMonitor
             this.GridWorkCenterStatus = new UAS_DeviceMonitor.CustomerControl.AutoDataGridControl.AutoDataGridControl();
             this.GridViewWorkCenterStatus = new UAS_DeviceMonitor.CustomerControl.GridViewWithSerialNum.GridViewWithSerialNum();
             this.TimerDeviceStatus = new System.Windows.Forms.Timer(this.components);
-            this.CommonTipController = new DevExpress.Utils.ToolTipController(this.components);
+            this.CommonTipController = new System.Windows.Forms.ToolTip(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.RibbonNav)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).BeginInit();
             this.MainTabControl.SuspendLayout();
@@ -1258,6 +1258,10 @@ namespace UAS_DeviceMonitor
             this.TimerDeviceStatus.Interval = 10000;
             this.TimerDeviceStatus.Tick += new System.EventHandler(this.TimerDeviceStatus_Tick);
             // 
+            // CommonTipController
+            // 
+            this.CommonTipController.ShowAlways = true;
+            // 
             // Main
             // 
             this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.False;
@@ -1417,6 +1421,6 @@ namespace UAS_DeviceMonitor
         private GridViewWithSerialNum GridViewWorkCenterStatus;
         private XtraScrollableControl PanelDeviceStatus;
         private PictureEdit pictureEdit1;
-        private DevExpress.Utils.ToolTipController CommonTipController;
+        private System.Windows.Forms.ToolTip CommonTipController;
     }
 }

+ 2 - 4
UAS_DeviceMonitor/Main.cs

@@ -411,7 +411,6 @@ namespace UAS_DeviceMonitor
                 {
                     LastRowCount = Count % CountPerRow;
                 }
-                CommonTipController.ShowBeak = true;
                 for (int i = 0; i < (j == RowCount - 1 ? LastRowCount : CountPerRow); i++)
                 {
                     PictureEditWithText pic = new PictureEditWithText();
@@ -419,15 +418,14 @@ namespace UAS_DeviceMonitor
                     pic.Anchor = AnchorStyles.Left;
                     pic.Anchor = AnchorStyles.Top;
                     pic.Picedit.Properties.SizeMode = PictureSizeMode.Squeeze;
-
                     if (dt.Rows[j * CountPerRow + i]["dpc_status"].ToString() != "Running")
                     {
-                        CommonTipController.SetToolTip(pic, "离线");
+                        CommonTipController.SetToolTip(pic.Picedit, "离线");
                         pic.Picedit.Image = Properties.Resources.network_offline;
                     }
                     else
                     {
-                        CommonTipController.SetToolTip(pic, "在线");
+                        CommonTipController.SetToolTip(pic.Picedit, "在线");
                         pic.Picedit.Image = Properties.Resources.net_connected;
                     }
                     pic.Text = dt.Rows[j * CountPerRow + i]["de_code"].ToString();