From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 09:01:53 +0800
Subject: [PATCH] 更新
---
HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
index 59f0947..ddeb9d9 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs
@@ -284,12 +284,7 @@
btnSceneDelayInfo.Text = scene.GetDelayText();
scene.EditScene();
};
- 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);
+ new PublicAssmebly().SetSceneDelayDialog(action,scene.delay);
};
contentView.AddChidren(new Button()
@@ -331,6 +326,7 @@
functionListView = new VerticalScrolViewLayout() {
Height = 0,
+ ScrollEnabled = false,
};
contentView.AddChidren(functionListView);
@@ -372,8 +368,10 @@
BackgroundColor = CSS_Color.MainBackgroundColor,
//IsBold = true
};
- bodyView.AddChidren(btnComplete);
-
+ if (scene.can_delete)
+ {
+ bodyView.AddChidren(btnComplete);
+ }
LoadEventList();
var waitPage = new Loading();
@@ -481,7 +479,7 @@
};
row.AddChidren(btnFunctionDelayInfo);
- if (Convert.ToInt32( scenefunction.delay) > 0)
+ if (!string.IsNullOrEmpty(scenefunction.delay) && Convert.ToInt32( scenefunction.delay) > 0)
{
btnFunctionDelayInfo.Text = Language.StringByID(StringId.Delay) + " " + new Scene() { delay = scenefunction.delay }.GetDelayText();
}
--
Gitblit v1.8.0