From c8dfa6df784741900a4c06918929d3db3c876234 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 16 七月 2021 10:40:56 +0800
Subject: [PATCH] Merge branch 'hxb-test' into wxr7-ez
---
HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockAlwaysOnManagerPage.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockAlwaysOnManagerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockAlwaysOnManagerPage.cs
index f1b4371..3db55fd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockAlwaysOnManagerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/DoorLock/DoorLockAlwaysOnManagerPage.cs
@@ -313,13 +313,14 @@
{
var form = new UI2.Intelligence.Automation.InputPushText();
MainPage.BasePageView.AddChidren(form);
- form.Show(this.automationInfo.PushSettion);
+ //form.Show(this.automationInfo.PushSettion);
+ form.Show();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- form.action += (pushInfo) =>
- {
- //璧嬪��
- this.automationInfo.PushSettion = pushInfo;
- };
+ //form.action += (pushInfo) =>
+ //{
+ // //璧嬪��
+ // this.automationInfo.PushSettion = pushInfo;
+ //};
};
}
--
Gitblit v1.8.0