From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1
---
HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs | 57 +++++++++++++++------------------------------------------
1 files changed, 15 insertions(+), 42 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
index 6da5522..55f7cc3 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs
@@ -24,14 +24,17 @@
{
return;
}
+ if(!scrolView.ScrollEnabled)
+ {
+ return;
+ }
if (room != null)
{
- if (!updataFunction.roomIdList.Contains(room.sid))
+ if (!updataFunction.roomIds.Contains(room.sid))
{
return;
}
}
- //if(updataFunction.roomIdList.Contains(Room))
for (int i = 0; i < scrolView.ChildrenCount; i++)
{
if (scrolView.GetChildren(i).Tag == null || scrolView.GetChildren(i).Tag.ToString() == "")
@@ -39,9 +42,9 @@
continue;
}
var viewTag = scrolView.GetChildren(i).Tag.ToString();
- if (viewTag == updataFunction.functionCategory.ToString() + "-" + updataFunction.functionType + "-" + updataFunction.sid)
+ if (viewTag == updataFunction.sid)
{
- if (scrolView.GetChildren(i).GetType().Name == "FunctionControlZone")
+ if (scrolView.GetChildren(i).Tag != null && scrolView.GetChildren(i).Tag.ToString() == updataFunction.sid)
{
var fcView = scrolView.GetChildren(i) as FrameLayout;
for (int j = 0; j < fcView.ChildrenCount; j++)
@@ -54,11 +57,11 @@
case FunctionCategory.Light:
case FunctionCategory.Thermostat:
#region 鎸夐挳鐘舵�佹洿鏂�
- if (cTag == updataFunction.functionType + "_Switch_" + updataFunction.sid)
+ if (cTag == updataFunction.sid + "_Switch")
{
try
{
- (fcView.GetChildren(j) as Button).IsSelected = updataFunction.trait_on_off.value.ToString() == "on";
+ (fcView.GetChildren(j) as Button).IsSelected = updataFunction.trait_on_off.curValue.ToString() == "on";
}
catch (Exception ex)
{
@@ -67,11 +70,11 @@
}
#endregion
#region 璋冨厜鐘舵�佽繘搴︽洿鏂�
- else if (cTag == updataFunction.functionType + "_DimmerBar_" + updataFunction.sid)
+ else if (cTag == updataFunction.sid + "_DimmerBar")
{
try
{
- if (updataFunction.trait_on_off.value.ToString() == "on")
+ if (updataFunction.trait_on_off.curValue.ToString() == "on")
{
(fcView.GetChildren(j) as DiyImageSeekBar).Progress = (updataFunction as Light).brightness;
(fcView.GetChildren(j) as DiyImageSeekBar).ProgressBarColor = CSS.CSS_Color.AuxiliaryColor1;
@@ -93,7 +96,7 @@
{
try
{
- (fcView.GetChildren(j) as Button).IsSelected = updataFunction.trait_on_off.value.ToString() == "on";
+ (fcView.GetChildren(j) as Button).IsSelected = updataFunction.trait_on_off.curValue.ToString() == "on";
(fcView.GetChildren(j) as Button).Text = updataFunction.lastState;
}
catch (Exception ex)
@@ -110,7 +113,7 @@
{
try
{
- (fcView.GetChildren(j) as Button).IsSelected = uCurtain.trait_on_off.value.ToString() == "off";
+ (fcView.GetChildren(j) as Button).IsSelected = uCurtain.trait_on_off.curValue.ToString() == "off";
}
catch (Exception ex)
{
@@ -121,7 +124,7 @@
{
try
{
- (fcView.GetChildren(j) as Button).IsSelected = uCurtain.trait_on_off.value.ToString() == "on";
+ (fcView.GetChildren(j) as Button).IsSelected = uCurtain.trait_on_off.curValue.ToString() == "on";
}
catch (Exception ex)
{
@@ -159,35 +162,5 @@
}
}
-
-
- //public static void UpdataLightStates(Light uLight)
- //{
- // Application.RunOnMainThread(() =>
- // {
- // if (bodyDiv == null)
- // return;
- // if(uLight.sid == function.sid&& uLight.functionType == function.functionType)
- // {
- // for (int i = 0; i < bodyDiv.ChildrenCount; i++)
- // {
- // var c1 = bodyDiv.GetChildren(i);
- // if (c1.Tag != null && c1.Tag.ToString() == "")
- // {
- // if (c1.Tag.ToString() == function.functionType + "_Switch_" + function.sid)
- // {
- // var btn = c1 as Button;
- // btn.IsSelected = uLight.on_off == 1;
- // }
- // else if (c1.Tag.ToString() == function.functionType + "_DimmerBar_" + function.sid)
- // {
- // var bar = c1 as DiyImageSeekBar;
- // bar.ProgressBarColor = uLight.on_off == 1 ? CSS.CSS_Color.AuxiliaryColor1 : CSS.CSS_Color.PromptingColor2;
- // }
- // }
- // }
- // }
- // });
- //}
- }
+ }
}
--
Gitblit v1.8.0