From e172a0f48fdd01733e04bda2370846b9f36b840f Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期五, 15 十月 2021 14:44:03 +0800 Subject: [PATCH] 2021-10-15 1.修改乐橙推送字段,psk参数取值不能取cname和deviceName --- HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs | 9 ++++++--- 1 files changed, 6 insertions(+), 3 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..67f47d5 100644 --- a/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs +++ b/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs @@ -289,7 +289,7 @@ 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 +331,7 @@ functionListView = new VerticalScrolViewLayout() { Height = 0, + ScrollEnabled = false, }; contentView.AddChidren(functionListView); @@ -372,8 +373,10 @@ BackgroundColor = CSS_Color.MainBackgroundColor, //IsBold = true }; - bodyView.AddChidren(btnComplete); - + if (scene.can_delete) + { + bodyView.AddChidren(btnComplete); + } LoadEventList(); var waitPage = new Loading(); -- Gitblit v1.8.0