From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs
index e09e8f8..7987b3f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs
@@ -28,14 +28,14 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- /// <param name="i_zoonID">闃插尯ID</param>
- public void ShowForm(int i_zoonID)
+ /// <param name="i_zoonID">闃插尯ID</param>
+ public void ShowForm(int i_zoonID)
{
this.zoonID = i_zoonID;
//璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAlarmTargetSettion));
-
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAlarmTargetSettion));
+
//娣诲姞鍥炬爣
var btnAdd = new MostRightIconControl(69, 69);
btnAdd.UnSelectedImagePath = "Item/Add.png";
@@ -45,16 +45,16 @@
{
var form = new AlarmTargetAddMenuForm();
form.AddForm(this.zoonID);
- };
-
- //鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private void InitMiddleFrame()
+ };
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
{
//娓呯┖bodyFrame
this.ClearBodyFrame();
@@ -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,9 +231,9 @@
/// </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);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(resObj.DeviceAddr, resObj.Epoint);
if (device.Type == DeviceType.DimmableLight//璋冨厜鍣�
|| device.Type == DeviceType.ColorDimmableLight)//褰╃伅
{
@@ -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);
@@ -314,11 +320,11 @@
#endregion
- #region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
+ #region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
/// <summary>
/// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�
- /// </summary>
+ /// </summary>
public override int FormActionAgainEvent()
{
//閲嶆柊鍒锋柊鐣岄潰
--
Gitblit v1.8.0