From 3aa397ab145382935492b11c1f18c9634e69910b Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 10 十二月 2020 16:45:00 +0800
Subject: [PATCH] 请合并，门锁和晾衣架第一版代码
---
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 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
old mode 100755
new mode 100644
index 8966fec..4867f2d
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/Base/DeviceRowCommon.cs
@@ -115,11 +115,20 @@
}
btnDeviceName.X = Application.GetRealWidth(181);
//褰撴寚瀹氬疄闄呭潗鏍囨椂,杩欓噷闇�瑕佺殑鍋忕Щ閲忎负2鍊�
- btnDeviceName.Y = Application.GetRealHeight(16) + this.chidrenYaxis * 2;
- btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
+ btnDeviceName.Y = Application.GetRealHeight(16) + this.chidrenYaxis * 2;
+
+ //鏅捐。鏋舵樉绀烘ā鍧楀悕瀛楋紙Mac鍚嶅瓧锛�
+ if (this.device.Type == DeviceType.Airer)
+ {
+ btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceMacName(i_device);
+ }
+ else
+ {
+ btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
+ }
btnDeviceName.SelectedTextColor = Common.ZigbeeColor.Current.GXCTextSelectedColor;
- this.frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);
-
+ this.frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);
+
if (this.hadStatuFunction == false)
{
//娌℃湁鐘舵�佸姛鑳�,鍒欐妸璁惧鍚嶅瓧鎺т欢涓�
@@ -224,6 +233,8 @@
//鍥炶皟鎺т欢琚Щ闄ょ殑浜嬩欢
this.RowNeedRemoveEvent?.Invoke();
this.RemoveFromParent();
+ //涓婁紶绌洪棿鍖哄煙淇℃伅
+ HdlRoomLogic.Current.SetRoomInfoToGateway();
};
};
}
@@ -262,7 +273,15 @@
//璁惧鍥炬爣涔熷埛鏂�
Common.LocalDevice.Current.SetDeviceIconToControl(btnDeviceIcon, i_device);
//璁惧鍚嶅瓧
- this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
+ //鏅捐。鏋舵樉绀烘ā鍧楀悕瀛楋紙Mac鍚嶅瓧锛�
+ if (this.device.Type == DeviceType.Airer)
+ {
+ this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceMacName(i_device);
+ }
+ else
+ {
+ this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
+ }
//妫�娴嬭澶囨槸鍚︽槸鎵撳紑鐘舵��
bool isOpen = this.CheckIsOpenStatu(i_device);
if (this.isHadOpenSwitch == true && i_device.HadReadDeviceStatu == false)
@@ -380,8 +399,8 @@
}
}
else
- {
- //濡傛灉杩欎釜璁惧鏀瑰彉浜嗘埧闂寸殑璇�,鍥炶皟鍗＄墖琚垹闄ょ殑鍑芥暟
+ {
+ //濡傛灉杩欎釜璁惧鏀瑰彉浜嗘埧闂寸殑璇�,鍥炶皟鍗＄墖琚垹闄ょ殑鍑芥暟
var nowRoom = HdlRoomLogic.Current.GetRoomByDevice(device);
if (nowRoom == null || nowRoom.Id != this.nowSelectRoom.Id)
{
--
Gitblit v1.8.0