From a251442d9fc088b3d8cf74d20b959f0f6103b095 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 14 九月 2020 17:42:10 +0800
Subject: [PATCH] 20200914
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index fbdf049..d286ada 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -159,7 +159,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = OnAppConfig.Instance.CurFoor,
+ Text = DB_ResidenceData.residenceData.CurFoor,
};
floorChangeView.AddChidren(btnFloor);
@@ -294,17 +294,16 @@
view.AddChidren(btnZone);
- Button btnDelayIcon;
- btnDelayIcon = new Button()
+ Button btnSettingIcon;
+ btnSettingIcon = new Button()
{
X = Application.GetRealWidth(4),
Y = Application.GetRealWidth(4),
Height = Application.GetRealWidth(32),
Width = Application.GetRealWidth(32),
UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
- //UnSelectedImagePath = "FunctionIcon/Scene/DelayIcon.png"
};
- view.AddChidren(btnDelayIcon);
+ view.AddChidren(btnSettingIcon);
Button btnCollection;
btnCollection = new Button()
@@ -323,7 +322,20 @@
function.SaveFunctionData();
};
LoadEvent_ControlScene(btnCoverd,btnName,btnZone, function);
-
+ btnSettingIcon.MouseUpEventHandler = (sender, e) => {
+ Action backAction = () => {
+ LoadSceneFunctionControlZone();
+ };
+ Action refreshAction = () => {
+ btnName.Text = function.name;
+ btnZone.Text = function.GetRoomListName();
+ view.BackgroundImagePath = (function as Scene).ImagePath;
+ };
+ var aep = new SceneEditPage(function as Scene, backAction);
+ MainPage.BasePageView.AddChidren(aep);
+ aep.LoadPage(StringId.EditScene, refreshAction);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
}
catch (Exception ex)
{
@@ -369,7 +381,7 @@
{
string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
new PublicAssmebly().TipMsgAutoClose(msg, true);
- Control.Send(function as Scene);
+ Control.Send(function);
};
btnCoverd.MouseUpEventHandler = eventHandler;
btnName.MouseUpEventHandler = eventHandler;
--
Gitblit v1.8.0