From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetExistSettionForm.cs
index 7987b3f..f37f622 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();
@@ -233,7 +233,7 @@
/// <param name="resObj"></param>
private void EditorAlarmTarget(DeviceRoomControl deviceRow, NormalViewControl btnStatu, Safeguard.CatActionResponseObj resObj)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(resObj.DeviceAddr, resObj.Epoint);
+ var device = Common.LocalDevice.Current.GetDevice(resObj.DeviceAddr, resObj.Epoint);
if (device.Type == DeviceType.DimmableLight//璋冨厜鍣�
|| device.Type == DeviceType.ColorDimmableLight)//褰╃伅
{
@@ -320,11 +320,11 @@
#endregion
- #region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
+ #region 鈻� 鐣岄潰閲嶆柊婵�娲讳簨浠禵__________________
/// <summary>
/// 鑷韩鐨勪笂灞傜晫闈㈠叧闂悗,瀹冭嚜韬浜庢渶涓婂眰鏃�,瑙﹀彂鐨勪簨浠�
- /// </summary>
+ /// </summary>
public override int FormActionAgainEvent()
{
//閲嶆柊鍒锋柊鐣岄潰
--
Gitblit v1.8.0