From d07d62be7111d78b2aaa44c9cdee23a7d22b4dda Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 10:38:15 +0800
Subject: [PATCH] 20201222-1
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 73 +++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 5fdff81..23de300 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -65,31 +65,25 @@
switch (function.functionCategory)
{
case FunctionCategory.Curtain:
- btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
+ switch(function.functionType)
+ {
+ case FunctionType.Curtain:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/CurtainThinIcon.png";
+ break;
+ case FunctionType.MotorCurtain:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/MotorCurtainIcon.png";
+ break;
+ case FunctionType.RollingShutter:
+ btnIcon.UnSelectedImagePath = "FunctionIcon/Curtain/RollingShutterIcon.png";
+ break;
+ }
CurtainFragment();
break;
case FunctionCategory.Music:
btnIcon.UnSelectedImagePath = "FunctionIcon/Music/MusicThinIcon.png";
MusicFragment();
break;
- case FunctionCategory.Scene:
- btnIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
- if ((function as Scene).sceneType == SceneType.MovieScene)
- {
- var movieIcon = new Button()
- {
- X = Application.GetRealWidth(52),
- Y = Application.GetRealHeight(14),
- Width = Application.GetRealWidth(16),
- Height = Application.GetRealWidth(16),
- UnSelectedImagePath = "FunctionIcon/Scene/MovieMark.png",
- };
- bodyDiv.AddChidren(movieIcon);
- btnName.X = Application.GetRealWidth(52 + 16);
- }
- //鍔犺浇鍦烘櫙鎺у埗浜嬩欢
- LoadEvent_ControlScene();
- break;
+
}
}
else
@@ -109,10 +103,12 @@
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);
+ //鍔犺浇寮�鍏虫寜閽簨浠�
+ LoadEvent_SwitchFunction(btnSwitch,function.attributes.Find((obj)=> obj.key == FunctionAttributeKey.FadeTime ));
}
else
{
@@ -124,13 +120,13 @@
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);
+ //鍔犺浇寮�鍏虫寜閽簨浠�
+ LoadEvent_SwitchFunction(btnSwitch);
}
- //鍔犺浇寮�鍏虫寜閽簨浠�
- LoadEvent_SwitchFunction(btnSwitch);
switch (function.functionCategory)
{
@@ -149,7 +145,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:
@@ -159,7 +155,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)
@@ -171,7 +167,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
@@ -232,9 +228,14 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = function.collection
+ IsSelected = function.collect
};
- bodyDiv.AddChidren(btnCollectionIcon);
+ //bodyDiv.AddChidren(btnCollectionIcon);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ bodyDiv.AddChidren(btnCollectionIcon);
+ }
}
/// <summary>
@@ -251,7 +252,7 @@
{
X = Application.GetRealWidth(14),
Y = Application.GetRealHeight(85),
- Width = Application.GetRealWidth(22),
+ Width = Application.GetRealWidth(30),
Height = Application.GetRealHeight(21),
Text = "0%",
TextAlignment = TextAlignment.CenterLeft,
@@ -269,7 +270,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,
@@ -283,7 +284,7 @@
{
X = Application.GetRealWidth(14 + 22+180),
Y = Application.GetRealHeight(85),
- Width = Application.GetRealWidth(35),
+ Width = Application.GetRealWidth(45),
Height = Application.GetRealHeight(21),
Text = "100%",
TextAlignment = TextAlignment.CenterLeft,
@@ -312,7 +313,8 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainCloseIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainCloseOnIcon.png",
- Tag = function.functionType + "_off_" + function.sid
+ IsSelected = function.trait_on_off.curValue.ToString() == "off",
+ Tag = function.sid + "_off"
};
bodyDiv.AddChidren(btnCurtainClose);
@@ -324,6 +326,8 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainStopIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainStopOnIcon.png",
+ Tag = function.sid + "_stop",
+ IsSelected = function.trait_on_off.curValue.ToString() == "stop"
};
bodyDiv.AddChidren(btnCurtainStop);
@@ -335,7 +339,8 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "FunctionIcon/Curtain/CurtainOpenIcon.png",
SelectedImagePath = "FunctionIcon/Curtain/CurtainOpenOnIcon.png",
- Tag = function.functionType + "_on_" + function.sid
+ Tag = function.sid + "_on",
+ IsSelected = function.trait_on_off.curValue.ToString() == "on"
};
bodyDiv.AddChidren(btnCurtainOpen);
LoadEvent_ControlCurtain(btnCurtainStop, btnCurtainOpen, btnCurtainClose, function as Curtain);
@@ -404,7 +409,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