From 07b0239f824ddb5a0cadf93f20ff6247f72baca2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 一月 2022 11:32:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr0114' into wjc
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index ddeb9d9..c660e9e 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -235,6 +235,51 @@
});
#endregion
+ #region 缁勫彿
+ //var grounpView = new FrameLayout()
+ //{
+ // Height = Application.GetRealWidth(50),
+ //};
+ //contentView.AddChidren(grounpView);
+
+ //Button btnGroupTitle = new Button()
+ //{
+ // X = Application.GetRealWidth(16),
+ // //Width = Application.GetRealWidth(90),
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.TextFontSize,
+ // Text = "缁勫彿"
+ //};
+ //grounpView.AddChidren(btnGroupTitle);
+
+ //var etGroup = new EditText()
+ //{
+ // TextAlignment = TextAlignment.CenterRight,
+ // Width = Application.GetRealWidth(350),
+ // Text = scene.group,
+ // TextColor = CSS_Color.PromptingColor1,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ // IsNumberKeyboardType = true
+ //};
+ //grounpView.AddChidren(etGroup);
+ //etGroup.TextChangeEventHandler = (sender, e) => {
+ // scene.group = e;
+ //};
+
+
+ //Button btnGroupLine = new Button()
+ //{
+ // Y = Application.GetRealWidth(49),
+ // Gravity = Gravity.CenterHorizontal,
+ // Height = Application.GetRealHeight(1),
+ // Width = Application.GetRealWidth(343),
+ // BackgroundColor = CSS_Color.DividingLineColor,
+ //};
+ //grounpView.AddChidren(btnGroupLine);
+
+ #endregion
+
#region 鍦烘櫙寤舵椂row
if (DB_ResidenceData.Instance.GatewayType == 1)
{
@@ -391,10 +436,12 @@
var tempScene = sceneList.Find((obj) => obj.userSceneId == scene.userSceneId);
if (tempScene != null)
{
- scene.functions = tempScene.functions;
+ scene = tempScene;
}
Application.RunOnMainThread(() =>
{
+ btnSceneName.Text = scene.name;
+ //etGroup.Text = scene.group;
LoadFunctionRow();
waitPage.Hide();
waitPage.RemoveFromParent();
@@ -513,7 +560,7 @@
EventHandler<MouseEventArgs> skipEvent = (sender, e) =>
{
- var ssf = new SceneFunctionInfoEditPage(scene, scenefunction, refreshFunctionRowAction);
+ var ssf = new SceneFunctionInfoEditPage(scene, scenefunction.localFunction.ConvertSceneFunction(), refreshFunctionRowAction);
MainPage.BasePageView.AddChidren(ssf);
ssf.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0