From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 97d9500..c1fb7ac 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -120,7 +120,7 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = function.trait_on_off.value.ToString() == "on",
+ IsSelected = function.trait_on_off.curValue.ToString() == "on",
Tag = function.sid + "_Switch",
};
bodyDiv.AddChidren(btnSwitch);
@@ -135,7 +135,7 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = function.trait_on_off.value.ToString() == "on",
+ IsSelected = function.trait_on_off.curValue.ToString() == "on",
Tag = function.sid + "_Switch",
};
bodyDiv.AddChidren(btnSwitch);
@@ -160,7 +160,7 @@
break;
case FunctionCategory.Light:
btnIcon.UnSelectedImagePath = "FunctionIcon/Light/LightThinIcon.png";
- btnSwitch.IsSelected = function.trait_on_off.value.ToString() == "on";
+ btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
LoadLightControl();
break;
case FunctionCategory.SwitchDevice:
@@ -170,7 +170,7 @@
btnIcon.UnSelectedImagePath = "FunctionIcon/Socket/SocketThinIcon.png";
break;
}
- btnSwitch.IsSelected = function.trait_on_off.value.ToString() == "on";
+ btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
break;
case FunctionCategory.Electrical:
switch (function.functionType)
@@ -182,7 +182,7 @@
btnIcon.UnSelectedImagePath = "FunctionIcon/Electrical/TVThinIcon.png";
break;
}
- btnSwitch.IsSelected = function.trait_on_off.value.ToString() == "on";
+ btnSwitch.IsSelected = function.trait_on_off.curValue.ToString() == "on";
break;
}
#endregion
@@ -280,7 +280,7 @@
SeekBarViewHeight = Application.GetRealHeight(8),
ThumbImagePath = "Public/ThumbImage.png",
ThumbImageHeight = Application.GetRealHeight(54),
- ProgressBarColor = function.trait_on_off.value.ToString() == "on" ? CSS_Color.AuxiliaryColor1 : CSS_Color.PromptingColor2,
+ ProgressBarColor = function.trait_on_off.curValue.ToString() == "on" ? CSS_Color.AuxiliaryColor1 : CSS_Color.PromptingColor2,
ProgressTextColor = CSS_Color.FirstLevelTitleColor,
ProgressTextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
MaxValue = 100,
@@ -415,7 +415,7 @@
TextColor = 0x00000000,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
Tag = function.functionType + "_laststates_" + function.sid,
- IsSelected = function.trait_on_off.value.ToString() == "on"
+ IsSelected = function.trait_on_off.curValue.ToString() == "on"
};
bodyDiv.AddChidren(btnLastStates);
}
--
Gitblit v1.8.0