From 3246b9db47308cc809df595a5cb704fc82c96439 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 17 十二月 2020 16:18:48 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL

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

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index 18bd9d9..fb0b739 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -95,7 +95,7 @@
                 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());
+                d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
                 Control.Ins.SendWriteCommand(light, d);
                 light.fadeTime = barFadeTime.Progress;
             };
@@ -113,7 +113,7 @@
                 {
                     //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());
+                    d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
                     Control.Ins.SendWriteCommand(light, d);
                 }
                 else
@@ -124,7 +124,7 @@
                         new System.Threading.Thread(() =>
                         {
                             System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
-                            d.Add("brightness", light.brightness.ToString());
+                            d.Add(FunctionAttributeKey.Brightness, light.brightness.ToString());
                             Control.Ins.SendWriteCommand(light, d);
                         })
                         { IsBackground = true }.Start();
@@ -157,7 +157,7 @@
                 {
                     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.curValue.ToString());
+                    d.Add(FunctionAttributeKey.OnOff, light.trait_on_off.curValue.ToString());
                     Control.Ins.SendWriteCommand(light, d);
                 })
                 { IsBackground = true }.Start();

--
Gitblit v1.8.0