From c1de48884fa145a16a0f8bcee93274dcfaa0ff82 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 07 五月 2020 10:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
index afff6e7..54a7aec 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
@@ -61,8 +61,7 @@
/// <summary>
/// 鏈垎閰嶇晫闈㈢殑璁惧閫夋嫨鎺т欢
/// </summary>
- /// <param name="i_ChidrenYaxis">瀛愭帶浠禮杞村亸绉婚噺(鐪熷疄鍊�,鏈変簺鐣岄潰闇�瑕佽繖绉嶇壒娈婃搷浣�)</param>
- public DeviceRowCommon(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
+ public DeviceRowCommon()
{
this.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
this.Width = Application.GetRealWidth(1022);
@@ -100,11 +99,12 @@
//璁惧鍚嶅瓧
this.btnDeviceName = new NormalViewControl(600, 60, true);
btnDeviceName.X = Application.GetRealWidth(181);
- btnDeviceName.Y = Application.GetRealHeight(16) + this.chidrenYaxis;
+ //褰撴寚瀹氬疄闄呭潗鏍囨椂,杩欓噷闇�瑕佺殑鍋忕Щ閲忎负2鍊�
+ btnDeviceName.Y = Application.GetRealHeight(16) + this.chidrenYaxis * 2;
btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
btnDeviceName.SelectedTextColor = Common.ZigbeeColor.Current.GXCTextSelectedColor;
this.frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEventOnly);
-
+
if (this.hadStatuFunction == false)
{
//娌℃湁鐘舵�佸姛鑳�,鍒欐妸璁惧鍚嶅瓧鎺т欢涓�
@@ -117,7 +117,8 @@
//鐘舵��
this.btnStatu = new NormalViewControl(600, 50, true);
btnStatu.X = Application.GetRealWidth(181);
- btnStatu.Y = Application.GetRealHeight(70) + this.chidrenYaxis;
+ //褰撴寚瀹氬疄闄呭潗鏍囨椂,杩欓噷闇�瑕佺殑鍋忕Щ閲忎负2鍊�
+ btnStatu.Y = Application.GetRealHeight(70) + this.chidrenYaxis * 2;
btnStatu.TextSize = 10;
btnStatu.TextColor = UserCenterColor.Current.TextGrayColor1;
this.frameTable.AddChidren(btnStatu, ChidrenBindMode.BindEventOnly);
@@ -329,7 +330,7 @@
//濡傛灉杩欎釜鍑芥暟琚噸鍐欑殑璇�,鍒欎唬琛ㄨ繖涓澶囨湁寮�鍏冲姛鑳�
this.isHadOpenSwitch = false;
//榛樿鐢ㄥ湪绾跨姸鎬佹潵鍒ゆ柇
- return i_device.IsOnline == 1;
+ return Common.LocalDevice.Current.CheckDeviceIsOnline(i_device);
}
@@ -357,7 +358,7 @@
}
}
else
- {
+ {
//濡傛灉杩欎釜璁惧鏀瑰彉浜嗘埧闂寸殑璇�,鍥炶皟鍗＄墖琚垹闄ょ殑鍑芥暟
var nowRoom = HdlRoomLogic.Current.GetRoomByDevice(device);
if (nowRoom == null || nowRoom.Id != HdlRoomLogic.Current.CurrentRoom.Id)
--
Gitblit v1.8.0