From 6eb21769c74cfcd10084f73ff3f212355849a3c7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 17 五月 2021 15:00:13 +0800
Subject: [PATCH] 2021-5-17-2
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index 2116491..406ef9f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -261,7 +261,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = FunctionList.List.GetDelayText( scene.delay)
+ Text = scene.GetDelayText()
};
sceneDelayRow.AddChidren(btnSceneDelayInfo);
@@ -281,10 +281,15 @@
{
Action<string> action = (obj) => {
scene.delay = obj;
- btnSceneDelayInfo.Text = FunctionList.List.GetDelayText(obj);
+ btnSceneDelayInfo.Text = scene.GetDelayText();
scene.EditScene();
};
- new PublicAssmebly().SetSceneDelayDialog(action,scene.delay);
+ Dictionary<string, string> items = new Dictionary<string, string>();
+ items.Add("30", "30s");
+ items.Add("60", "1min");
+ items.Add("120", "2min");
+ items.Add("300", "5min");
+ new PublicAssmebly().SetSceneDelayDialog(items,action,scene.delay);
};
contentView.AddChidren(new Button()
@@ -394,6 +399,7 @@
{
LoadFunctionRow();
waitPage.Hide();
+ waitPage.RemoveFromParent();
});
}
else
@@ -407,6 +413,7 @@
Application.RunOnMainThread(() =>
{
waitPage.Hide();
+ waitPage.RemoveFromParent();
});
}
}).Start();
@@ -476,7 +483,7 @@
if (Convert.ToInt32( scenefunction.delay) > 0)
{
- btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + FunctionList.List.GetDelayText(scenefunction.delay);
+ btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + new Scene() { delay = scenefunction.delay }.GetDelayText();
}
else
{
@@ -560,16 +567,16 @@
var fanState = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.FanSpeed);
if (modeState != null)
{
- sceneFunctionInfo += FunctionList.List.GetValueText(modeState.key, modeState.value) + " ";
+ sceneFunctionInfo += modeState.GetValueText() + " ";
}
if (tempState != null)
{
- sceneFunctionInfo += FunctionList.List.GetValueText(tempState.key, tempState.value) + " ";
- sceneFunctionInfo += FunctionList.List.GetUintString(tempState.key);
+ sceneFunctionInfo += tempState.GetValueText() + " ";
+ sceneFunctionInfo += tempState.GetUintString();
}
if (fanState != null)
{
- sceneFunctionInfo += FunctionList.List.GetValueText(fanState.key, fanState.value) + " ";
+ sceneFunctionInfo += fanState.GetValueText() + " ";
}
var briState = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Brightness);
if (briState != null)
--
Gitblit v1.8.0