1

DeviceLibrary/DeviceLibrary/led/BaseLEDManager.cs

@@ -246,9 +246,12 @@ namespace SmartShelf.DeviceLibrary
 
 
     public class Light
     public class Light
     {
     {
+        public static byte defaultR = 0;
+        public static byte defaultG = 50;
+        public static byte defaultB = 0;
         public static Light DefaultLight(int dmxId, int index)
         public static Light DefaultLight(int dmxId, int index)
         {
         {
-            return new Light(dmxId, index, 0, 50, 0,200);
+            return new Light(dmxId, index, defaultR, defaultG, defaultB,200);
         }
         }
         public static Light GetLight(int dmxId,int index,   string color="green")
         public static Light GetLight(int dmxId,int index,   string color="green")
         {
         {
@@ -324,13 +327,6 @@ namespace SmartShelf.DeviceLibrary
         public byte Green { get; set; }
         public byte Green { get; set; }
         public byte Blue { get; set; }
         public byte Blue { get; set; }
          
          
-        ///// <summary>
-        ///// 单色灯
-        ///// </summary> 
-        //public static Light DefaultLight(int dmx, int index)
-        //{
-        //    return new Light(dmx, index, LEDManager.DefaultLight);
-        //}
         /// <summary>
         /// <summary>
         /// 单色灯
         /// 单色灯
         /// </summary> 
         /// </summary> 

SmartShelf/FrmStore.cs

@@ -52,6 +52,9 @@ namespace SmartShelf
                 cmbNum.Items.Add(i);
                 cmbNum.Items.Add(i);
             } 
             } 
             cmbNum.SelectedIndex = 0;
             cmbNum.SelectedIndex = 0;
+            trackBar1.Value = Light.defaultR;
+            trackBar2.Value = Light.defaultG;
+            trackBar3.Value = Light.defaultB;
         }
         }
        
        
         private void cmbPositionList_SelectedIndexChanged(object sender, EventArgs e)
         private void cmbPositionList_SelectedIndexChanged(object sender, EventArgs e)
@@ -63,6 +66,7 @@ namespace SmartShelf
             }
             }
             BoxPosition posi = PMap[text];
             BoxPosition posi = PMap[text];
             txtAddr.Text = posi.DeviceIp.ToString();
             txtAddr.Text = posi.DeviceIp.ToString();
+            txtIp2.Text = posi.DeviceIp.ToString();
             txtNum.Text = posi.LedIndex.ToString();
             txtNum.Text = posi.LedIndex.ToString();
             txtDmxId.Text = posi.DmxId.ToString();
             txtDmxId.Text = posi.DmxId.ToString();
         }
         }
@@ -179,7 +183,7 @@ namespace SmartShelf
 
 
         private void button4_Click(object sender, EventArgs e)
         private void button4_Click(object sender, EventArgs e)
         {
         {
-            string ip = txtAddr.Text;
+            string ip = txtIp2.Text;
             int index = FormUtil.GetIntValue(txtLedIndex);
             int index = FormUtil.GetIntValue(txtLedIndex);
             int dmxId =(int) numYu.Value;
             int dmxId =(int) numYu.Value;
             LEDManager.GetLedModule(ip).LightOn(Light.DefaultLight(dmxId, index));
             LEDManager.GetLedModule(ip).LightOn(Light.DefaultLight(dmxId, index));
@@ -187,7 +191,7 @@ namespace SmartShelf
 
 
         private void btnCloseLed_Click(object sender, EventArgs e)
         private void btnCloseLed_Click(object sender, EventArgs e)
         {
         {
-            string ip = txtAddr.Text;
+            string ip = txtIp2.Text;
             int index = FormUtil.GetIntValue(txtLedIndex);
             int index = FormUtil.GetIntValue(txtLedIndex);
             int dmxId = (int)numYu.Value;
             int dmxId = (int)numYu.Value;
             LEDManager.GetLedModule(ip).LightOff( dmxId, index);
             LEDManager.GetLedModule(ip).LightOff( dmxId, index);
@@ -239,5 +243,52 @@ namespace SmartShelf
         {
         {
             LEDManager.OpenStatusLights("yellow");
             LEDManager.OpenStatusLights("yellow");
         }
         }
+
+        private void btOAll_Click(object sender, EventArgs e)
+        {
+            string ip = txtIp2.Text; 
+            LEDManager.GetLedModule(ip).AllLightOn(Light.DefaultLight(0,0));
+        }
+
+        private void btnCAll_Click(object sender, EventArgs e)
+        { 
+            string ip = txtIp2.Text; 
+            LEDManager.GetLedModule(ip).AllLightOff();
+        }
+
+        private void trackBar1_ValueChanged(object sender, EventArgs e)
+        {
+            if (!trackBar1.Value.Equals(Light.defaultR))
+            {
+                Light.defaultR =(byte) trackBar1.Value;
+            }
+            lblR.Text = Light.defaultR.ToString();
+        }
+
+        private void trackBar2_ValueChanged(object sender, EventArgs e)
+        {
+
+            if (!trackBar2.Value.Equals(Light.defaultG))
+            {
+                Light.defaultG = (byte)trackBar2.Value;
+            }
+
+            lblG.Text = Light.defaultG.ToString();
+        }
+
+        private void trackBar3_ValueChanged(object sender, EventArgs e)
+        {
+            if (!trackBar3.Value.Equals(Light.defaultB))
+            {
+                Light.defaultB = (byte)trackBar3.Value;
+            }
+
+            lblB.Text = Light.defaultB.ToString();
+        }
+
+        private void groupTest_Enter(object sender, EventArgs e)
+        {
+
+        }
     }
     }
 }
 }