From 6a9ad7ec93218913a2ce3b898bb036f18f8f0da4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 八月 2020 17:06:36 +0800
Subject: [PATCH] 20200813

---
 HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs |   45 +++++++++++++++++++++++++++++++--------------
 1 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
index 96b9127..00cd0d1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs
@@ -21,8 +21,8 @@
                         if (!bodyView.onDimmerBar)
                         {
                             bodyView.dimmerBar.Progress = uFunction.brightness;
-                            bodyView.dimmerBar.ProgressBarColor = uFunction.on_off == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                         }
+                        bodyView.dimmerBar.ProgressBarColor = uFunction.on_off == "on" ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                         bodyView.btnSwitch.IsSelected = uFunction.on_off == "on";
                         bodyView.btnCurColor.BackgroundColor = (uint)(0xFF000000 + bodyView.light.redColor * 256 * 256 + bodyView.light.greenColor * 256 + bodyView.light.blueColor);
                     }
@@ -63,8 +63,10 @@
                     light.blueColor = e2[2];
                     colorChangeTime = DateTime.Now;
                     btnCurColor.BackgroundColor = (uint)(0xFF000000 + light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor);
-                    MainPage.Log($"color change {light.brightness}");
-                    Control.Send(CommandType_A.write, this.light);
+                    //Control.Send(CommandType_A.write, this.light);
+                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                    d.Add("color", (light.redColor * 256 * 256 + light.greenColor * 256 + light.blueColor).ToString());
+                    Control.SendWriteCommand(light, d);
                 }
             };
             colorPicker.MouseUpEventHandler = (sender, e) =>
@@ -91,12 +93,16 @@
         /// </summary>
         void LoadEvent_DimmerBar()
         {
-            DateTime dimmerTime = DateTime.MinValue;
-            dimmerBar.MouseDownEventHandler = (sender, e)=>{
+            dimmerBar.OnStartTrackingTouchEvent = (sender, e)=>{
                 onDimmerBar = true;
             };
-            dimmerBar.MouseUpEventHandler = (sender, e) => {
+            dimmerBar.OnStopTrackingTouchEvent = (sender, e) => {
                 onDimmerBar = false;
+                light.brightness = dimmerBar.Progress;
+                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                d.Add("brightness", light.brightness.ToString());
+                Control.SendWriteCommand(light, d);
+                //Control.Send(CommandType_A.write, light);
             };
             dimmerBar.OnProgressChangedEvent = (sender, e) => {
                 if (!btnSwitch.IsSelected)
@@ -109,16 +115,22 @@
 
                 if (e == 0 || e == 100)
                 {
-                    Control.Send(CommandType_A.write, this.light);
+                    //Control.Send(CommandType_A.write, this.light);
+                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                    d.Add("brightness", light.brightness.ToString());
+                    Control.SendWriteCommand(light, d);
                 }
                 else
                 {
-                    if (dimmerTime.AddMilliseconds(500) < DateTime.Now)
+                    if (200 < (DateTime.Now - light.refreshTime).TotalMilliseconds)
                     {
-                        dimmerTime = DateTime.Now;
+                        light.refreshTime = DateTime.Now;
                         new System.Threading.Thread(() =>
                         {
-                            Control.Send(CommandType_A.write, light);
+                            //Control.Send(CommandType_A.write, light);
+                            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                            d.Add("brightness", light.brightness.ToString());
+                            Control.SendWriteCommand(light, d);
                         })
                         { IsBackground = true }.Start();
                     }
@@ -141,9 +153,11 @@
                 dimmerBar.ProgressBarColor = btnSwitch.IsSelected ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
                 new System.Threading.Thread(() =>
                 {
-                    var light = this.light as Light;
                     light.on_off = btnSwitch.IsSelected ? "on" : "off";
-                    Control.Send(CommandType_A.write, this.light);
+                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                    d.Add("on_off", light.on_off.ToString());
+                    Control.SendWriteCommand(light, d);
+                    //Control.Send(CommandType_A.write, this.light);
                 })
                 { IsBackground = true }.Start();
             };
@@ -155,9 +169,12 @@
         {
             btnRestoredPoint.MouseUpEventHandler = (sender, e) =>
             {
-                light.color = "255255255";
+                light.color = 0xFFFFFF;
                 btnCurColor.BackgroundColor = 0xFFFFFFFF;
-                Control.Send(CommandType_A.write, this.light);
+                //Control.Send(CommandType_A.write, this.light);
+                System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+                d.Add("color", "FFFFFF");
+                Control.SendWriteCommand(light, d);
             };
         }
 

--
Gitblit v1.8.0