diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs index cbb9402..f5dd0cc 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs @@ -205,7 +205,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl this.AlarmMoveText.Font = new Font("宋体", 15f, FontStyle.Regular, GraphicsUnit.Point, 134); this.AlarmMoveText.ForeColor = Color.White; - this.AlarmMoveText.MoveSpeed = 10f; + this.AlarmMoveText.MoveSpeed = 4f; this.AlarmMoveText.Text = AlarmString; } @@ -2018,7 +2018,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl } else { - lanternSimple.LanternBackground = Color.Transparent; + lanternSimple.LanternBackground = Color.DarkGray; } } @@ -2031,7 +2031,7 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl } else { - lanternSimple.LanternBackground = Color.Transparent; + lanternSimple.LanternBackground = Color.DarkGray; } } diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/HslMoveText.cs b/Controls/Mesnac.Controls.ChemicalWeighing/HslMoveText.cs index 55a10c6..a8e124f 100644 --- a/Controls/Mesnac.Controls.ChemicalWeighing/HslMoveText.cs +++ b/Controls/Mesnac.Controls.ChemicalWeighing/HslMoveText.cs @@ -34,7 +34,7 @@ namespace Mesnac.Controls.ChemicalWeighing base.SetStyle(ControlStyles.OptimizedDoubleBuffer, true); base.SetStyle(ControlStyles.AllPaintingInWmPaint, true); this.timer = new Timer(); - this.timer.Interval = 50; + this.timer.Interval = 30; this.timer.Tick += this.Timer_Tick; this.timer.Start(); } @@ -183,11 +183,9 @@ namespace Mesnac.Controls.ChemicalWeighing // Token: 0x060005DB RID: 1499 RVA: 0x0003A01C File Offset: 0x0003821C private void Timer_Tick(object sender, EventArgs e) { - bool flag = this.moveSpeed != 0f; - if (flag) + if (this.moveSpeed != 0f) { - bool flag2 = this.startLocationX < -this.fontWidth - 5f; - if (flag2) + if (this.startLocationX < -this.fontWidth - 5f) { this.startLocationX = (float)(base.Width + 1); } diff --git a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml index 494ea09..33faa59 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/MainDetail.xml @@ -2,121 +2,87 @@ - 32, 860 + 46, 872 AlarmMoveText - 1865, 28 - - - False - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJoBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zLCBNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9uBAAAKk1lc25hYy5Db250cm9scy5CYXNlLkRhdGFHcmlkVmlld0NvbHVtbnNbXQIAAAAICAkDAAAAAgAAAGIAAAAHAwAAAAABAAAABAAAAAQoTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGF0YUdyaWRWaWV3Q29sdW1ucwIAAAAJBAAAAAkFAAAADQIFBAAAAChNZXNuYWMuQ29udHJvbHMuQmFzZS5EYXRhR3JpZFZpZXdDb2x1bW5zAgAAAApfZmlsZWREYXRhDF9kaXNwbGF5TmFtZQEBAgAAAAYGAAAADOaKpeitpuiuvuWkhwYHAAAADOaKpeitpuiuvuWkhwEFAAAABAAAAAYIAAAADOaKpeitpuWGheWuuQYJAAAADOaKpeitpuWGheWuuQs= - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - - AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - - AlarmForm - - False - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAE5TeXN0ZW0uRGF0YSwgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAABVTeXN0ZW0uRGF0YS5EYXRhVGFibGUDAAAAGURhdGFUYWJsZS5SZW1vdGluZ1ZlcnNpb24JWG1sU2NoZW1hC1htbERpZmZHcmFtAwEBDlN5c3RlbS5WZXJzaW9uAgAAAAkDAAAABgQAAACFBDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi0xNiI/Pg0KPHhzOnNjaGVtYSB4bWxucz0iIiB4bWxuczp4cz0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEiIHhtbG5zOm1zZGF0YT0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp4bWwtbXNkYXRhIj4NCiAgPHhzOmVsZW1lbnQgbmFtZT0iTUNEYXRhR3JpZFZpZXciPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQogIDx4czplbGVtZW50IG5hbWU9InRtcERhdGFTZXQiIG1zZGF0YTpJc0RhdGFTZXQ9InRydWUiIG1zZGF0YTpNYWluRGF0YVRhYmxlPSJNQ0RhdGFHcmlkVmlldyIgbXNkYXRhOlVzZUN1cnJlbnRMb2NhbGU9InRydWUiPg0KICAgIDx4czpjb21wbGV4VHlwZT4NCiAgICAgIDx4czpjaG9pY2UgbWluT2NjdXJzPSIwIiBtYXhPY2N1cnM9InVuYm91bmRlZCIgLz4NCiAgICA8L3hzOmNvbXBsZXhUeXBlPg0KICA8L3hzOmVsZW1lbnQ+DQo8L3hzOnNjaGVtYT4GBQAAAIABPGRpZmZncjpkaWZmZ3JhbSB4bWxuczptc2RhdGE9InVybjpzY2hlbWFzLW1pY3Jvc29mdC1jb206eG1sLW1zZGF0YSIgeG1sbnM6ZGlmZmdyPSJ1cm46c2NoZW1hcy1taWNyb3NvZnQtY29tOnhtbC1kaWZmZ3JhbS12MSIgLz4EAwAAAA5TeXN0ZW0uVmVyc2lvbgQAAAAGX01ham9yBl9NaW5vcgZfQnVpbGQJX1JldmlzaW9uAAAAAAgICAgCAAAAAAAAAP//////////Cw== - - InitData - True - True - 32, 72, 98 - None - DarkCyan - False - 1410, 664 - MCDataGridView1 - 466, 190 - 564 + 1830, 28 - 1774, 592 + 1776, 703 RGVWaitDisPlay8 75, 32 - 1693, 592 + 1695, 703 RGVWaitDisPlay7 75, 32 - 1774, 554 + 1776, 665 WetWaitDisPlay8 75, 32 - 1693, 554 + 1695, 665 WetWaitDisPlay7 75, 32 - 1460, 592 + 1462, 703 RGVWaitDisPlay6 75, 32 - 1379, 592 + 1381, 703 RGVWaitDisPlay5 75, 32 - 1460, 554 + 1462, 665 WetWaitDisPlay6 75, 32 - 1379, 554 + 1381, 665 WetWaitDisPlay5 75, 32 - 1219, 592 + 1221, 703 RGVWaitDisPlay4 75, 32 - 1138, 592 + 1140, 703 RGVWaitDisPlay3 75, 32 - 1219, 554 + 1221, 665 WetWaitDisPlay4 75, 32 - 1138, 554 + 1140, 665 WetWaitDisPlay3 75, 32 - 913, 592 + 915, 703 RGVWaitDisPlay2 75, 32 - 832, 592 + 834, 703 RGVWaitDisPlay1 75, 32 - 913, 554 + 915, 665 WetWaitDisPlay2 75, 32 - 832, 554 + 834, 665 WetWaitDisPlay1 75, 32 @@ -136,7 +102,7 @@ True 响应 White - 797, 601 + 799, 712 MCLabel133 29, 12 @@ -156,7 +122,7 @@ True 呼叫 White - 797, 564 + 799, 675 MCLabel132 29, 12 @@ -254,11 +220,11 @@ None True True - ←RGV是否到达→ + RGV状态 White - 1015, 517 + 781, 612 MCLabel140 - 95, 12 + 47, 12 @@ -274,11 +240,11 @@ None True True - ←是否搅拌完成→ + 搅拌状态 White - 1011, 472 + 775, 570 MCLabel141 - 101, 12 + 53, 12 1739, 366 @@ -321,42 +287,42 @@ 15, 17 - 1850, 470 + 1803, 570 HslLanternSimple8 15, 17 - 1676, 470 + 1725, 570 HslLanternSimple7 15, 17 - 1533, 470 + 1489, 570 HslLanternSimple6 15, 17 - 1365, 470 + 1412, 570 HslLanternSimple5 15, 17 - 1290, 470 + 1248, 570 HslLanternSimple4 15, 17 - 1118, 470 + 1171, 570 HslLanternSimple3 15, 17 - 990, 472 + 940, 570 HslLanternSimple2 15, 17 - 815, 472 + 863, 570 HslLanternSimple1 15, 17 @@ -445,42 +411,42 @@ 16, 16 - 1850, 506 + 1800, 603 HslLanternAlarm8 22, 31 - 1673, 506 + 1721, 603 HslLanternAlarm7 22, 31 - 1530, 505 + 1487, 603 HslLanternAlarm6 22, 31 - 1358, 505 + 1408, 603 HslLanternAlarm5 22, 31 - 1289, 505 + 1245, 603 HslLanternAlarm4 22, 31 - 1116, 505 + 1167, 603 HslLanternAlarm3 22, 31 - 988, 505 + 937, 603 HslLanternAlarm2 22, 31 - 809, 505 + 860, 603 HslLanternAlarm1 22, 31