From 3272ca5b51e19f7f8a827b0f68400570a547fe60 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 四月 2020 15:02:44 +0800
Subject: [PATCH] 2020-04-28-1
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs | 68 ++++++++++++++++-----------------
1 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
index 99766b2..de24e88 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -1,29 +1,38 @@
锘縰sing System;
using System.Collections.Generic;
using Shared.Common;
+using Shared.Phone.UserView;
using ZigBee.Device;
namespace Shared.Phone.UserCenter.DoorLock
{
- public class FunctionSetting : DoorLockCommonLayout, ZigBee.Common.IStatus
+ public class FunctionSetting : DoorLockCommonLayout
{
#region 鏋勯�犲嚱鏁�
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="doorLock"></param>
- public FunctionSetting(ZigBee.Device.DoorLock doorLock)
+ public FunctionSetting(Room room, CommonDevice doorLock)
{
- //闂��
- this.doorLock = doorLock;
+ this.doorLock = doorLock as ZigBee.Device.DoorLock;
+ currentRoom = room;
+ deviceUI = doorLock;
listNewDevice.Add(doorLock);
BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
- ZigBee.Device.ZbGateway.StatusList.Add(this);
}
#endregion
#region 鍙橀噺鐢虫槑
public ZigBee.Device.DoorLock doorLock = null;
+ /// <summary>
+ /// 褰撳墠鎴块棿
+ /// </summary>
+ Room currentRoom;
+ /// <summary>
+ /// 璁惧UI瀵硅薄
+ /// </summary>
+ CommonDevice deviceUI;
/// <summary>
/// 璁惧闇�瑕佷繚瀛樼殑璁惧鍚嶅瓧
/// </summary>
@@ -64,6 +73,11 @@
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
{
RemoveFromParent();
+
+ var userDoorLockPage = new UserDoorLockPage(currentRoom, deviceUI);
+ HomePage.Instance.AddChidren(userDoorLockPage);
+ HomePage.Instance.PageIndex += 1;
+ userDoorLockPage.Show();
};
this.btnBack.MouseUpEventHandler += eHandlerBack;
this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
@@ -172,8 +186,16 @@
var listCheck = new List<string>();
rowBeloneArea.SelectRoomEvent += (roomKeys) =>
{
+ //閫夋嫨鏈垎閰嶆椂,娓呯┖
+ if (roomKeys == string.Empty) { listCheck = new List<string>(); }
foreach (var device in this.listNewDevice)
- {
+ {
+ if (roomKeys == string.Empty)
+ {
+ //濡傛灉閫夋嫨鐨勬槸鏈垎閰嶏紝鍒欏畠鐨勫叏閮ㄥ洖璺棤鏉′欢鍏ㄩ儴娓呯┖鎴块棿
+ HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
+ continue;
+ }
var room = HdlRoomLogic.Current.GetRoomByDevice(device);
string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
if (room == null)
@@ -280,7 +302,7 @@
};
actionNone = async () =>
{
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock, action);
+ Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock);
};
HdlCheckLogic.Current.CheckSecondarySecurity(action, actionNone);
};
@@ -466,37 +488,13 @@
}
#endregion
- #region 鎺ュ彛瀹炵幇
+ #region 绉婚櫎鏂规硶
/// <summary>
- /// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
+ /// 閲嶅啓绉婚櫎鏂规硶
/// </summary>
- /// <returns>The changed.</returns>
- /// <param name="common">Common.</param>
- public void Changed(CommonDevice common)
+ public override void RemoveFromParent()
{
-
- }
- /// <summary>
- /// 澶勭悊鍙樺寲浜嬩欢
- /// </summary>
- /// <param name="common"></param>
- /// <param name="typeTag"></param>
- public void DeviceInfoChange(CommonDevice common, string typeTag)
- {
- }
- /// <summary>
- /// Changeds the IL ogic status.
- /// </summary>
- /// <param name="logic">Logic.</param>
- public void ChangedILogicStatus(ZigBee.Device.Logic logic)
- {
- }
- /// <summary>
- /// Changeds the IS cene status.
- /// </summary>
- /// <param name="scene">Scene.</param>
- public void ChangedISceneStatus(Scene scene)
- {
+ base.RemoveFromParent();
}
#endregion
}
--
Gitblit v1.8.0