From 4a9318077bd095fbc7c57c593e5ca8185603dac4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
index 3485bdd..e77d419 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs
@@ -11,6 +11,7 @@
FrameLayout bodyView;
VerticalScrolViewLayout contentView;
Button btnOnText;
+ Button btnBrightnessText;
Scene scene;
@@ -122,6 +123,15 @@
btnConfrim.MouseUpEventHandler = (sender, e) =>
{
var temp = scene.functions.Find((obj) => obj.sid == sceneFunction.sid);
+ if (sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Brightness) != null)
+ {
+ try
+ {
+ //涓�绔彛涓嶆敮鎸佸紑鍏冲�间笌浜害鍊间竴璧峰鐞嗭紝闇�瑕佸皢寮�鍏冲�肩Щ闄ゆ帀
+ sceneFunction.status.Remove(sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff));
+ }
+ catch { }
+ }
if (temp != null)
{
temp = sceneFunction;
@@ -142,6 +152,11 @@
{
DAL.Server.IMessageCommon.Current.ShowErrorInfoAlter(result);
}
+ }
+ else
+ {
+ refreshAction();
+ this.RemoveFromParent();
}
};
}
@@ -165,7 +180,7 @@
{
row.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
}
- Button btnBrightnessRight = new Button()
+ Button btnRight = new Button()
{
X = Application.GetRealWidth(339),
Gravity = Gravity.CenterVertical,
@@ -173,7 +188,7 @@
Height = Application.GetMinRealAverage(16),
UnSelectedImagePath = "Public/Right.png",
};
- row.AddChidren(btnBrightnessRight);
+ row.AddChidren(btnRight);
var btnFunctionText = new Button()
{
@@ -185,7 +200,13 @@
};
row.AddChidren(btnFunctionText);
if (sceneStatus.key == FunctionAttributeKey.OnOff)
+ {
btnOnText = btnFunctionText;
+ }
+ else if (sceneStatus.key == FunctionAttributeKey.Brightness)
+ {
+ btnBrightnessText = btnFunctionText;
+ }
var btnFunctionName = new Button()
{
@@ -390,12 +411,32 @@
trait.value = "on";
sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff).value = "on";
btn.Text = FunctionList.List.GetValueText(trait.key, trait.value) + FunctionList.List.GetUintString(trait.key);
+
+ var temp = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Brightness);
+ if (temp != null)
+ {
+ if (temp.value == "0")
+ {
+ temp.value = "100";
+ }
+ btnBrightnessText.Text = FunctionList.List.GetValueText(temp.key, temp.value);
+ }
};
btnOff.MouseUpEventHandler = (sender,e) =>{
dialog.Close();
trait.value = "off";
sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.OnOff).value = "off";
btn.Text= FunctionList.List.GetValueText(trait.key,trait.value) + FunctionList.List.GetUintString(trait.key);
+
+ var temp = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Brightness);
+ if (temp != null)
+ {
+ if (temp.value != "0")
+ {
+ temp.value = "0";
+ }
+ btnBrightnessText.Text = FunctionList.List.GetValueText(temp.key, temp.value);
+ }
};
}
--
Gitblit v1.8.0