From d1af1b8337591363e60c286348501a841138dbb3 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 24 十二月 2020 16:00:09 +0800
Subject: [PATCH] 20201224-3
---
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
index 8777f4f..14ce065 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
@@ -121,9 +121,14 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = light.collection
+ IsSelected = light.collect
};
- controlView.AddChidren(btnCollection);
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
dimmerBar = new WaveSeekBarOn()
{
@@ -131,19 +136,14 @@
Y = Application.GetRealHeight(74 + 16),
Width = Application.GetRealWidth(168 - 40),
Height = Application.GetRealHeight(288 - 16 - 16),
- //WaveBorderColor = CSS_Color.PromptingColor2,
BorderColor = 0x00000000,
CornerRadius = Application.GetRealWidth(40),
BorderWidth = 0,
- //WavePadding = Application.GetRealWidth(-5),
- //BackgroundColor = CSS_Color.BackgroundColor,
- //Radius = (uint)Application.GetRealWidth(40),
Progress = light.brightness,
- //ProgressTextColor =0x00000000,
IsProgressTextShow = false,
};
controlView.AddChidren(dimmerBar);
- if(light.trait_on_off.value.ToString() == "on")
+ if(light.trait_on_off.curValue.ToString() == "on")
{
dimmerBar.SetProgressBarColors(CSS_Color.AuxiliaryColor1, CSS_Color.AuxiliaryColor1);
}
@@ -234,14 +234,18 @@
Height = Application.GetMinRealAverage(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = light.trait_on_off.value.ToString() == "on",
+ IsSelected = light.trait_on_off.curValue.ToString() == "on",
};
controlView.AddChidren(btnSwitch);
LoadEventList();
new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(light, actionRefresh);
-
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(light);
+ })
+ { IsBackground = true }.Start();
}
--
Gitblit v1.8.0