From 6d3ba9484472d090532434e53667c096652149ce Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 25 九月 2020 09:56:14 +0800
Subject: [PATCH] 202009251
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 106 +++++++++++++++++++++++++++--------------------------
1 files changed, 54 insertions(+), 52 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
similarity index 91%
rename from HDL_ON/UI/UI2/3-Intelligence/SceneEditPage.cs
rename to HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index a5b5edd..1693fc8 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -239,57 +239,59 @@
#endregion
#region 鍦烘櫙寤舵椂row
- FrameLayout sceneDelayRow = new FrameLayout()
+ if (DB_ResidenceData.residenceData.GatewayType == 1)
{
- Y = sceneNameView.Bottom,
- Height = Application.GetRealWidth(50),
- };
- contentView.AddChidren(sceneDelayRow);
+ FrameLayout sceneDelayRow = new FrameLayout()
+ {
+ Y = sceneNameView.Bottom,
+ Height = Application.GetRealWidth(50),
+ };
+ contentView.AddChidren(sceneDelayRow);
- Button btnSceneDelayRight = new Button()
- {
- X = Application.GetRealWidth(339),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
- sceneDelayRow.AddChidren(btnSceneDelayRight);
+ Button btnSceneDelayRight = new Button()
+ {
+ X = Application.GetRealWidth(339),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ sceneDelayRow.AddChidren(btnSceneDelayRight);
- var btnSceneDelayInfo = new Button()
- {
- Width = Application.GetRealWidth(327),
- TextAlignment = TextAlignment.CenterRight,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = scene.delayText
- };
- sceneDelayRow.AddChidren(btnSceneDelayInfo);
+ var btnSceneDelayInfo = new Button()
+ {
+ Width = Application.GetRealWidth(327),
+ TextAlignment = TextAlignment.CenterRight,
+ TextColor = CSS_Color.PromptingColor1,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = scene.delayText
+ };
+ sceneDelayRow.AddChidren(btnSceneDelayInfo);
- Button btnSceneDelayTitle = new Button()
- {
- X = Application.GetRealWidth(16),
- //Width = Application.GetRealWidth(90),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.SceneDelay,
- };
- sceneDelayRow.AddChidren(btnSceneDelayTitle);
+ Button btnSceneDelayTitle = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ //Width = Application.GetRealWidth(90),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextID = StringId.SceneDelay,
+ };
+ sceneDelayRow.AddChidren(btnSceneDelayTitle);
- btnSceneDelayTitle.MouseUpEventHandler = (sender, e) => {
- new PublicAssmebly().SetSceneDelayDialog(scene, btnSceneDelayInfo);
- };
+ btnSceneDelayTitle.MouseUpEventHandler = (sender, e) =>
+ {
+ new PublicAssmebly().SetSceneDelayDialog(scene, btnSceneDelayInfo);
+ };
- contentView.AddChidren(new Button()
- {
- Y = sceneDelayRow.Bottom,
- Height = Application.GetRealHeight(8),
- BackgroundColor = CSS_Color.DividingLineColor,
- });
-
-
+ contentView.AddChidren(new Button()
+ {
+ Y = sceneDelayRow.Bottom,
+ Height = Application.GetRealHeight(8),
+ BackgroundColor = CSS_Color.DividingLineColor,
+ });
+ }
#endregion
#region 娣诲姞鍔熻兘row
@@ -331,7 +333,7 @@
Button btnLine1 = new Button()
{
- Y = sceneDelayRow.Bottom,
+ //Y = sceneDelayRow.Bottom,
Height = Application.GetRealHeight(8),
BackgroundColor = CSS_Color.DividingLineColor,
};
@@ -340,7 +342,7 @@
Button btnLine2 = new Button()
{
- Y = sceneDelayRow.Bottom,
+ //Y = sceneDelayRow.Bottom,
Height = Application.GetRealHeight(228),
BackgroundColor = CSS_Color.DividingLineColor,
};
@@ -510,15 +512,15 @@
switch (sceneFunction.functionType)
{
case FunctionType.AC:
- var addAC = sceneFunction as AC;
- sceneFunctionInfo += addAC.trait_mode.GetCurValueText();
- sceneFunctionInfo += " " + addAC.trait_temp.value.ToString() + addAC.tempUnitString;
- sceneFunctionInfo += " " + addAC.trait_fan.GetCurValueText();
+ sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.name == "mode").GetCurValueText();
+ sceneFunctionInfo += " " + sceneFunction.function.Find((obj) => obj.name == "set_temperature").value.ToString() +
+ sceneFunction.function.Find((obj) => obj.name == "set_temperature").uintString;
+ sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.name == "fan").GetCurValueText();
break;
case FunctionType.FloorHeating:
sceneFunctionInfo += sceneFunction.function.Find((obj) => obj.name == "mode").GetCurValueText();
- sceneFunctionInfo += " " + sceneFunction.function.Find((obj) => obj.name == "temperature").value.ToString() +
- sceneFunction.function.Find((obj) => obj.name == "temperature").uintString;
+ sceneFunctionInfo += " " + sceneFunction.function.Find((obj) => obj.name == "set_temperature").value.ToString() +
+ sceneFunction.function.Find((obj) => obj.name == "set_temperature").uintString;
break;
case FunctionType.Dimmer:
perTrait = sceneFunction.function.Find((obj) => obj.name == "brightness");
--
Gitblit v1.8.0