From cb1476f1197b8730038b4ef485f8f036e1d93422 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 16:49:32 +0800
Subject: [PATCH] 合并文本缺漏
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
index 4f9c820..111d2f4 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs
@@ -81,7 +81,7 @@
/// </summary>
Action refreshFunctionRowAction;
/// <summary>
- /// 鍥炴帀鏇存柊
+ /// 鍥炶皟鏇存柊
/// </summary>
Action backAction;
public SceneAddPage(Scene s, Action act)
@@ -281,7 +281,9 @@
items.Add("60", "1min");
items.Add("120", "2min");
items.Add("300", "5min");
- new PublicAssmebly().SetSceneDelayDialog(items, action ,scene.delay);
+ new PublicAssmebly().SetSceneDelayDialog( action ,scene.delay);
+
+
};
contentView.AddChidren(new Button()
@@ -369,6 +371,8 @@
LoadEventList();
}
+
+
/// <summary>
/// 鍔犺浇鍔熻兘鍒楄〃
/// </summary>
@@ -457,20 +461,16 @@
};
row.AddChidren(btnFunctionFloorAndRoom);
- btnFunctionName.MouseUpEventHandler = (sender, e) =>
+ EventHandler<MouseEventArgs> skipEvent= (sender, e) =>
{
var ssf = new SceneFunctionInfoEditPage(scene, scenefunction, refreshFunctionRowAction);
MainPage.BasePageView.AddChidren(ssf);
ssf.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- btnFunctionFloorAndRoom.MouseUpEventHandler = (sender, e) =>
- {
- var ssf = new SceneFunctionInfoEditPage(scene, scenefunction, refreshFunctionRowAction);
- MainPage.BasePageView.AddChidren(ssf);
- ssf.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+
+ btnFunctionName.MouseUpEventHandler = skipEvent;
+ btnFunctionFloorAndRoom.MouseUpEventHandler = skipEvent;
Button btnDelSceneFunction = new Button()
{
@@ -804,6 +804,7 @@
}
/// <summary>
+ /// 鍒涘缓鍦烘櫙
/// 瀹屾垚鎸夐挳鐐瑰嚮浜嬩欢
/// </summary>
void LoadEvent_CompleteEvent()
@@ -831,7 +832,7 @@
var waitPage = new Loading();
MainPage.BaseView.AddChidren(waitPage);
waitPage.Start(Language.StringByID(StringId.PleaseWait));
- new System.Threading.Thread(() =>
+ new Thread(() =>
{
try
{
--
Gitblit v1.8.0