From 3d697e7ef53ed906ac7eb4c292b440dcb6232b6a Mon Sep 17 00:00:00 2001 From: xiaoguo Date: Thu, 28 Mar 2024 16:55:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E8=AD=A6=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CommonController.cs | 9 +++++++ .../GuideScreen.UI/FormScreen.Designer.cs | 24 +++++++++++++------ .../GuideScreen/GuideScreen.UI/FormScreen.cs | 9 +++++++ .../GuideScreen.UI/FormScreen.resx | 3 +++ 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/guidescreen/GuideScreen/GuideScreen.UI/Controller/CommonController.cs b/guidescreen/GuideScreen/GuideScreen.UI/Controller/CommonController.cs index c90fc67..87af3f9 100644 --- a/guidescreen/GuideScreen/GuideScreen.UI/Controller/CommonController.cs +++ b/guidescreen/GuideScreen/GuideScreen.UI/Controller/CommonController.cs @@ -18,6 +18,15 @@ namespace GuideScreen.UI.Controller public string Title { get; private set; } + public string AlarmText + { + get + { + var model = systemService.GetSystemConfig(SystemConfigKeys.AlarmText.ToString()); + return model.ConfigValue; + } + } + private void Init() { var model = systemService.GetSystemConfig(SystemConfigKeys.ScreenTitle.ToString()); diff --git a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.Designer.cs b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.Designer.cs index 2896e1d..37b93b2 100644 --- a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.Designer.cs +++ b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.Designer.cs @@ -147,6 +147,7 @@ namespace GuideScreen.UI this.ChartPassengerFlow = new Sunny.UI.UIBarChart(); this.timer2 = new System.Windows.Forms.Timer(this.components); this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); + this.ToolStripMenuBackAdmin = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuIClose = new System.Windows.Forms.ToolStripMenuItem(); this.uiPanel3 = new Sunny.UI.UIPanel(); this.lblweek = new Sunny.UI.UILabel(); @@ -155,7 +156,7 @@ namespace GuideScreen.UI this.lblTitle = new Sunny.UI.UILabel(); this.lblTime = new Sunny.UI.UILabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.ToolStripMenuBackAdmin = new System.Windows.Forms.ToolStripMenuItem(); + this.timer3 = new System.Windows.Forms.Timer(this.components); this.uiPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pBoxWeatherIcon)).BeginInit(); this.uiPanel5.SuspendLayout(); @@ -1433,8 +1434,10 @@ namespace GuideScreen.UI // // txtAlarm // + this.txtAlarm.Active = true; this.txtAlarm.FillColor = System.Drawing.Color.Empty; this.txtAlarm.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.txtAlarm.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); this.txtAlarm.Location = new System.Drawing.Point(160, 3); this.txtAlarm.MinimumSize = new System.Drawing.Size(1, 1); this.txtAlarm.Name = "txtAlarm"; @@ -1813,10 +1816,16 @@ namespace GuideScreen.UI this.contextMenuStrip.Size = new System.Drawing.Size(125, 48); this.contextMenuStrip.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.contextMenuStrip1_ItemClicked); // + // ToolStripMenuBackAdmin + // + this.ToolStripMenuBackAdmin.Name = "ToolStripMenuBackAdmin"; + this.ToolStripMenuBackAdmin.Size = new System.Drawing.Size(124, 22); + this.ToolStripMenuBackAdmin.Text = "后台管理"; + // // toolStripMenuIClose // this.toolStripMenuIClose.Name = "toolStripMenuIClose"; - this.toolStripMenuIClose.Size = new System.Drawing.Size(180, 22); + this.toolStripMenuIClose.Size = new System.Drawing.Size(124, 22); this.toolStripMenuIClose.Text = "关闭"; // // uiPanel3 @@ -1918,11 +1927,11 @@ namespace GuideScreen.UI this.lblTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblTime.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0); // - // ToolStripMenuBackAdmin + // timer3 // - this.ToolStripMenuBackAdmin.Name = "ToolStripMenuBackAdmin"; - this.ToolStripMenuBackAdmin.Size = new System.Drawing.Size(180, 22); - this.ToolStripMenuBackAdmin.Text = "后台管理"; + this.timer3.Enabled = true; + this.timer3.Interval = 5000; + this.timer3.Tick += new System.EventHandler(this.timer3_Tick); // // FormScreen // @@ -2110,7 +2119,8 @@ namespace GuideScreen.UI private Sunny.UI.UILabel uiLabel6; private Sunny.UI.UILabel uiLabel19; private Sunny.UI.UILabel uiLabel24; - private Sunny.UI.UIScrollingText txtAlarm; private ToolStripMenuItem ToolStripMenuBackAdmin; + private Sunny.UI.UIScrollingText txtAlarm; + private Timer timer3; } } \ No newline at end of file diff --git a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs index da90ae5..164b63d 100644 --- a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs +++ b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs @@ -134,6 +134,9 @@ namespace GuideScreen.UI //ȡ lblTitle.Text = commonController.Title; + // + this.txtAlarm.Text = commonController.AlarmText; + //PLCͨ plcController.Start(); @@ -761,5 +764,11 @@ namespace GuideScreen.UI } #endregion Timer + + private void timer3_Tick(object sender, EventArgs e) + { + // + this.txtAlarm.Text = commonController.AlarmText; + } } } \ No newline at end of file diff --git a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.resx b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.resx index 4ef3115..d93bb33 100644 --- a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.resx +++ b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.resx @@ -8845,6 +8845,9 @@ 107, 17 + + 499, 17 + 91