From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 15 三月 2021 14:55:49 +0800
Subject: [PATCH] 合并前上传一个版本

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

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
index 306075a..03b6752 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -12,23 +12,23 @@
         /// </summary>
         public static void UpdataStates(Light uFunction)
         {
-            Application.RunOnMainThread(() =>
+            Application.RunOnMainThread((Action)(() =>
             {
                 try
                 {
                     if (bodyView == null)
                         return;
-                    if (uFunction.functionType == bodyView.light.functionType && uFunction.sid == bodyView.light.sid)
-                    {
-                        bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
-                        bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
+                    if (uFunction.spk == bodyView.light.spk && uFunction.sid == bodyView.light.sid)
+                    {
                         if (uFunction.trait_on_off.curValue.ToString() == "on")
                         {
                             bodyView.dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
                             if (!bodyView.onDimmerBar)
                             {
                                 bodyView.dimmerBar.Progress = uFunction.brightness;
-                            }
+                            }
+                            bodyView.btnBrightnessText.Text = uFunction.brightness + "%";
+                            bodyView.btnBrightnessText.Y = ((100 - uFunction.brightness) * Application.GetRealHeight(222 - 16) / 100) + Application.GetRealWidth(80);
                         }
                         else
                         {
@@ -48,7 +48,7 @@
                 {
                     MainPage.Log($"{bodyView.GetType().Name } UpdataStates error : {ex.Message}");
                 }
-            });
+            }));
         }
 
         void LoadEventList()

--
Gitblit v1.8.0