From bba578c2f0acf2eca747edcb69426771e0cadd32 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 23 三月 2020 18:20:50 +0800
Subject: [PATCH] 2020-03-23-3
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs
index e09e8f8..7ae5aec 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs
@@ -134,7 +134,7 @@
btnEditor.ButtonClickEvent += (sender, e) =>
{
//缂栬緫鎶ヨ鐩爣
- this.EditorAlarmTarget(btnStatu, data);
+ this.EditorAlarmTarget(row, btnStatu, data);
};
}
@@ -231,7 +231,7 @@
/// </summary>
/// <param name="btnStatu"></param>
/// <param name="resObj"></param>
- private void EditorAlarmTarget(NormalViewControl btnStatu, Safeguard.CatActionResponseObj resObj)
+ private void EditorAlarmTarget(DeviceRoomControl deviceRow, NormalViewControl btnStatu, Safeguard.CatActionResponseObj resObj)
{
var device = Common.LocalDevice.Current.GetDevice(resObj.DeviceAddr, resObj.Epoint);
if (device.Type == DeviceType.DimmableLight//璋冨厜鍣�
@@ -241,6 +241,8 @@
form.AddForm(device, resObj.TaskList);
form.FinishSelectEvent += (statuText, listInfo) =>
{
+ //杩樺師宸﹀彸鑿滃崟
+ deviceRow?.HideMenu();
btnStatu.Text = statuText;
//淇濆瓨缂栬緫鐨勬姤璀︾洰鏍�
this.SaveEditorAlarmTarget(resObj, listInfo);
@@ -252,6 +254,8 @@
form.AddForm(device, resObj.TaskList);
form.FinishSelectEvent += (statuText, listInfo) =>
{
+ //杩樺師宸﹀彸鑿滃崟
+ deviceRow?.HideMenu();
btnStatu.Text = statuText;
//淇濆瓨缂栬緫鐨勬姤璀︾洰鏍�
this.SaveEditorAlarmTarget(resObj, listInfo);
@@ -264,6 +268,8 @@
form.AddForm(device, resObj.TaskList);
form.FinishSelectEvent += (statuText, listInfo) =>
{
+ //杩樺師宸﹀彸鑿滃崟
+ deviceRow?.HideMenu();
btnStatu.Text = statuText;
//淇濆瓨缂栬緫鐨勬姤璀︾洰鏍�
this.SaveEditorAlarmTarget(resObj, listInfo);
--
Gitblit v1.8.0