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/Device/Bind/PaneTargetsBaseForm.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
index 37af8dc..ad5d45e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/PaneTargetsBaseForm.cs
@@ -302,8 +302,8 @@
btnFinifh = new Button()
{
- Width = Application.GetRealWidth(907),
- Height = Application.GetRealHeight(127),
+ Width = Application.GetRealWidth(907),
+ Height = Application.GetRealHeight(127),
Y = Application.GetRealHeight(49 + 35),
Gravity = Gravity.CenterHorizontal,
Radius = (uint)Application.GetRealHeight(127) / 2,
@@ -556,13 +556,13 @@
{
line2.Visible = false;
}
- if (Common.LocalDevice.Current.CheckDeviceIsOnline(device) == true)
- {
- btnBindName.TextColor = Shared.Common.ZigbeeColor.Current.TextBlack;
- }
- else
- {
- btnBindName.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
+ if (Common.LocalDevice.Current.CheckDeviceIsOnline(device) == true)
+ {
+ btnBindName.TextColor = Shared.Common.ZigbeeColor.Current.TextBlack;
+ }
+ else
+ {
+ btnBindName.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
}
switch (curDeviceBindType)
{
@@ -844,10 +844,10 @@
{
curControlDev.currentSelectRoomId = tempDevRoom.Id;
curControlDev.currentSelectFloorId = tempDevRoom.FloorId;
- }
- else
- {
- curControlDev.currentSelectRoomId = "UndistributedId";
+ }
+ else
+ {
+ curControlDev.currentSelectRoomId = "UndistributedId";
}
}
--
Gitblit v1.8.0