From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 九月 2020 15:22:09 +0800
Subject: [PATCH] 2020-09-01

---
 HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
index faeec32..cc40ad1 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
@@ -125,15 +125,15 @@
                 Height = Application.GetRealHeight(288 - 16 - 16),
                 //WaveBorderColor = CSS_Color.PromptingColor2,
                 BorderColor = 0x00000000,
-                CornerRadius = Application.GetRealWidth(1),
+                CornerRadius = Application.GetRealWidth(40),
                 BorderWidth = 0,
                 //WavePadding = Application.GetRealWidth(-5),
-                BackgroundColor = CSS_Color.BackgroundColor,
-                Radius = (uint)Application.GetRealWidth(40),
+                //BackgroundColor = CSS_Color.BackgroundColor,
+                //Radius = (uint)Application.GetRealWidth(40),
                 Progress = light.brightness,
             };
             controlView.AddChidren(dimmerBar);
-            if(light.on_off == "on")
+            if(light.trait_on_off.value.ToString() == "on")
             {
                 dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
             }
@@ -210,7 +210,7 @@
                 Height = Application.GetMinRealAverage(40),
                 UnSelectedImagePath = "Public/PowerClose.png",
                 SelectedImagePath = "Public/PowerOpen.png",
-                IsSelected = light.on_off == "on",
+                IsSelected = light.trait_on_off.value.ToString() == "on",
                 //Tag = 
             };
             controlView.AddChidren(btnSwitch);

--
Gitblit v1.8.0