From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs
index e09e8f8..f37f622 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs
@@ -119,7 +119,7 @@
var btnStatu = row.frameTable.AddMostRightView("", 400);
if (data.TaskList.Count > 0)
{
- btnStatu.Text = HdlSafeguardLogic.Current.GetLightAlarmStatuText(data.TaskList);
+ btnStatu.Text = HdlSafeguardLogic.Current.GetAdjustTargetStatuText(data.TaskList);
}
else
{
@@ -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