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/UI0-Public/PublicAssmebly.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
index de994f8..33dacc8 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs
@@ -513,7 +513,11 @@
if (showedTime.AddSeconds(30) > DateTime.Now)
{
thread.Abort();
- waitPage.RemoveFromParent();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
}
};
thread.Start();
@@ -586,7 +590,7 @@
BottomTimeSelectControl timeControl = new BottomTimeSelectControl(mRange, sRange, 5, Language.StringByID(StringId.SceneDelay));
timeControl.RowHeight = Application.GetRealHeight(50);
timeControl.InitControl(0, 0, 262, false);
- timeControl.ChangePickerEvent2();
+ //timeControl.ChangePickerEvent2();
timeControl.FinishEvent = (type, hours, min) =>
{
if(type == 1)
--
Gitblit v1.8.0