From 31e484e5d3e42e825e43ef9d1707c1adc02a4e1c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 十二月 2020 19:57:34 +0800
Subject: [PATCH] 完成 dali 的 UI

---
 HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
old mode 100644
new mode 100755
index 5ba2ea3..fb0b739
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -1,4 +1,5 @@
 锘縰sing System;
+using HDL_ON.DriverLayer;
 using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
 using Shared;
@@ -24,7 +25,7 @@
                             bodyView.dimmerBar.Progress = uFunction.brightness;
                         }
 
-                        if (uFunction.trait_on_off.value.ToString() == "on")
+                        if (uFunction.trait_on_off.curValue.ToString() == "on")
                         {
                             bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                         }
@@ -32,7 +33,7 @@
                         {
                             bodyView.dimmerBar.SetProgressBarColors(CSS_Color.DividingLineColor, CSS_Color.DividingLineColor);
                         }
-                        bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.value.ToString() == "on";
+                        bodyView.btnSwitch.IsSelected = uFunction.trait_on_off.curValue.ToString() == "on";
 
                         bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(288 - 16 - 16) / 100) + Application.GetRealWidth(40);
                         bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
@@ -55,6 +56,7 @@
             actionRefresh = () => {
                 btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
                 btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
+                //light.SaveFunctionData(true);
             };
         }
         /// <summary>
@@ -65,7 +67,7 @@
             barFadeTime.OnProgressChangedEvent = (sender, e) =>
             {
                 light.fadeTime = e;
-                light.SaveFunctionData();
+                light.SaveFunctionData(false);
             };
         }
 
@@ -75,8 +77,8 @@
         void LoadCollectionEvent()
         {
             btnCollection.MouseUpEventHandler += (sender, e) => {
-                btnCollection.IsSelected = light.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
-                light.SaveFunctionData();
+                btnCollection.IsSelected = light.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+                light.SaveFunctionData(true);
             };
         }
 
@@ -93,8 +95,9 @@
                 light.brightness = dimmerBar.Progress;
                 //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);
+                d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
+                Control.Ins.SendWriteCommand(light, d);
+                light.fadeTime = barFadeTime.Progress;
             };
             dimmerBar.OnProgressChangedEvent = (sender, e) => {
                 light.fadeTime = 0;
@@ -104,14 +107,14 @@
                 }   
                 btnSwitch.IsSelected = e > 0 ? true : false;
                 light.brightness = e;
-                light.trait_on_off.value = e > 0 ? "on" : "off";
+                light.trait_on_off.curValue = e > 0 ? "on" : "off";
 
                 if (e == 0 || e == 100)
                 {
                     //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);
+                    d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
+                    Control.Ins.SendWriteCommand(light, d);
                 }
                 else
                 {
@@ -121,8 +124,8 @@
                         new System.Threading.Thread(() =>
                         {
                             System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
-                            d.Add("brightness", light.brightness.ToString());
-                            Control.SendWriteCommand(light, d);
+                            d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
+                            Control.Ins.SendWriteCommand(light, d);
                         })
                         { IsBackground = true }.Start();
                     }
@@ -152,11 +155,10 @@
                 }
                 new System.Threading.Thread(() =>
                 {
-                    light.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+                    light.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
                     System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
-                    d.Add("on_off", light.trait_on_off.value.ToString());
-                    Control.SendWriteCommand(light, d);
-                    //Control.Send(CommandType_A.write, this.light);
+                    d.Add(FunctionAttributeKey.OnOff, light.trait_on_off.curValue.ToString());
+                    Control.Ins.SendWriteCommand(light, d);
                 })
                 { IsBackground = true }.Start();
             };

--
Gitblit v1.8.0