打开软件默认关闭照明灯

Rs.DeweyTester/Commom/Ops.cs

@@ -75,7 +75,7 @@ namespace Rs.MotionPlat.Commom
                     MessageQueue.Instance.Warn("Init fail");
                 }
                 LightManger.Instance.SetStatus(ELightStatus.YellowBlink);
-                On("照明灯");
+                //On("照明灯");
                 Off("光源1");
                 Off("光源2");
             }

Rs.DeweyTester/FormMain.cs

@@ -70,6 +70,19 @@ namespace Rs.MotionPlat
                 if (txtGrrTestNum.Enabled)
                     txtGrrTestNum.Enabled = false;
             }
+
+            if(Ops.IsOutOn("照明灯") )
+            {
+                if(btnLight.BackColor != Color.Lime)
+                {
+                    btnLight.BackColor = Color.Lime;
+                }
+            }
+            else
+            {
+                btnLight.BackColor = Color.FromArgb(56, 56, 56);
+            }
+
             //获取运行信息
             while (MessageQueue.Instance.HaveMessage())
             {
@@ -612,6 +625,9 @@ namespace Rs.MotionPlat
         }
 
         private void btnClearData_Click(object sender, EventArgs e)
+        {
+            EButtonType btn =  Msgbox.ShowDialog(EButtonType.Ok | EButtonType.Cancel, "Are you sure to clear data?");
+            if(btn== EButtonType.Ok)
             {
                 TestFixtureManager.Instance.GetTestFixture(1).ClearData();
                 TestFixtureManager.Instance.GetTestFixture(2).ClearData();
@@ -620,6 +636,7 @@ namespace Rs.MotionPlat
                 TestFixtureManager.Instance.GetTestFixture(5).ClearData();
                 TestFixtureManager.Instance.GetTestFixture(6).ClearData();
             }
+        }
 
         private void btnLight_Click(object sender, EventArgs e)
         {

Rs.DeweyTester/FormMain.designer.cs

@@ -764,11 +764,13 @@ namespace Rs.MotionPlat
             // btnClearData
             // 
             this.btnClearData.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
+            this.btnClearData.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnClearData.Dock = System.Windows.Forms.DockStyle.Fill;
             this.btnClearData.FlatAppearance.BorderSize = 0;
             this.btnClearData.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnClearData.Location = new System.Drawing.Point(16, 4);
+            this.btnClearData.Location = new System.Drawing.Point(0, 0);
             this.btnClearData.Name = "btnClearData";
-            this.btnClearData.Size = new System.Drawing.Size(88, 32);
+            this.btnClearData.Size = new System.Drawing.Size(119, 29);
             this.btnClearData.TabIndex = 0;
             this.btnClearData.Text = "ClearData";
             this.btnClearData.UseVisualStyleBackColor = false;
@@ -786,11 +788,13 @@ namespace Rs.MotionPlat
             // btnLight
             // 
             this.btnLight.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
+            this.btnLight.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnLight.Dock = System.Windows.Forms.DockStyle.Fill;
             this.btnLight.FlatAppearance.BorderSize = 0;
             this.btnLight.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnLight.Location = new System.Drawing.Point(16, 1);
+            this.btnLight.Location = new System.Drawing.Point(0, 0);
             this.btnLight.Name = "btnLight";
-            this.btnLight.Size = new System.Drawing.Size(88, 32);
+            this.btnLight.Size = new System.Drawing.Size(119, 29);
             this.btnLight.TabIndex = 0;
             this.btnLight.Text = "Light";
             this.btnLight.UseVisualStyleBackColor = false;
@@ -808,13 +812,15 @@ namespace Rs.MotionPlat
             // btnSelectProduct
             // 
             this.btnSelectProduct.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
+            this.btnSelectProduct.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnSelectProduct.Dock = System.Windows.Forms.DockStyle.Fill;
             this.btnSelectProduct.FlatAppearance.BorderSize = 0;
             this.btnSelectProduct.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnSelectProduct.Location = new System.Drawing.Point(16, 3);
+            this.btnSelectProduct.Location = new System.Drawing.Point(0, 0);
             this.btnSelectProduct.Name = "btnSelectProduct";
-            this.btnSelectProduct.Size = new System.Drawing.Size(88, 32);
+            this.btnSelectProduct.Size = new System.Drawing.Size(119, 29);
             this.btnSelectProduct.TabIndex = 0;
-            this.btnSelectProduct.Text = "Pick product";
+            this.btnSelectProduct.Text = "PickProduct";
             this.btnSelectProduct.UseVisualStyleBackColor = false;
             this.btnSelectProduct.Click += new System.EventHandler(this.btnSelectProduct_Click);
             // 
@@ -916,11 +922,13 @@ namespace Rs.MotionPlat
             // btnNozzleStatus
             // 
             this.btnNozzleStatus.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
+            this.btnNozzleStatus.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnNozzleStatus.Dock = System.Windows.Forms.DockStyle.Fill;
             this.btnNozzleStatus.FlatAppearance.BorderSize = 0;
             this.btnNozzleStatus.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnNozzleStatus.Location = new System.Drawing.Point(10, 4);
+            this.btnNozzleStatus.Location = new System.Drawing.Point(0, 0);
             this.btnNozzleStatus.Name = "btnNozzleStatus";
-            this.btnNozzleStatus.Size = new System.Drawing.Size(56, 32);
+            this.btnNozzleStatus.Size = new System.Drawing.Size(77, 29);
             this.btnNozzleStatus.TabIndex = 0;
             this.btnNozzleStatus.Text = "Nozzle";
             this.btnNozzleStatus.UseVisualStyleBackColor = false;
@@ -938,11 +946,13 @@ namespace Rs.MotionPlat
             // btnBuzzer
             // 
             this.btnBuzzer.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
+            this.btnBuzzer.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnBuzzer.Dock = System.Windows.Forms.DockStyle.Fill;
             this.btnBuzzer.FlatAppearance.BorderSize = 0;
             this.btnBuzzer.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnBuzzer.Location = new System.Drawing.Point(10, 1);
+            this.btnBuzzer.Location = new System.Drawing.Point(0, 0);
             this.btnBuzzer.Name = "btnBuzzer";
-            this.btnBuzzer.Size = new System.Drawing.Size(56, 32);
+            this.btnBuzzer.Size = new System.Drawing.Size(77, 29);
             this.btnBuzzer.TabIndex = 0;
             this.btnBuzzer.Text = "Buzzer";
             this.btnBuzzer.UseVisualStyleBackColor = false;