From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001 From: xm <1271024303@qq.com> Date: 星期五, 11 九月 2020 09:16:59 +0800 Subject: [PATCH] 优化多功能面板:绑定温湿度传感器目标,和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节 --- ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceDoorLockRowControl.cs | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceDoorLockRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceDoorLockRowControl.cs index 69d12e9..c1afa2a 100755 --- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceDoorLockRowControl.cs +++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceDoorLockRowControl.cs @@ -15,8 +15,7 @@ /// <summary> /// 鍒嗙被鐣岄潰鐨勯棬閿佽澶囪鎺т欢 /// </summary> - /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param> - public DeviceDoorLockRowControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis) + public DeviceDoorLockRowControl() { //闂ㄩ攣鏆傛椂娌℃湁鐘舵�佸姛鑳� this.hadStatuFunction = false; @@ -26,9 +25,9 @@ /// 鍒濆鍖栨帶浠� /// </summary> /// <param name="i_device"></param> - public override void InitControl(CommonDevice i_device) + public override void InitControl(CommonDevice i_device, Common.Room i_nowSelectRoom) { - base.InitControl(i_device); + base.InitControl(i_device, i_nowSelectRoom); //濡傛灉浣忓畢涓鸿櫄鎷熶綇瀹�,姝ゅ姛鑳芥棤鏁� if (Common.Config.Instance.Home.IsVirtually == false) @@ -50,7 +49,7 @@ //娣卞害鍗$墖淇℃伅 this.frameTable.ButtonClickEvent += (sender, e) => { - var userDoorLockPage = new UserCenter.DoorLock.UserDoorLockPage(UserCenter.HdlRoomLogic.Current.CurrentRoom, i_device); + var userDoorLockPage = new UserCenter.DoorLock.UserDoorLockPage(this.nowSelectRoom, i_device); UserView.HomePage.Instance.AddChidren(userDoorLockPage); UserView.HomePage.Instance.PageIndex += 1; userDoorLockPage.Show(); -- Gitblit v1.8.0