From c47c3ec2488961b3a006aaebcb03dba582f8b19b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 12 三月 2020 17:08:42 +0800
Subject: [PATCH] 2020-03-12-1
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
index 3d6dcec..9a6ce1c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs
@@ -74,28 +74,23 @@
public void InitControl()
{
var listDevice = Common.LocalDevice.Current.GetDevicesByMac(this.deviceMac);
+ if (listDevice.Count == 0)
+ {
+ //閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
+ listDevice.Add(Common.LocalDevice.Current.GetOTADevice(this.deviceMac));
+ }
//鍥炬爣
btnIcon = frameTable.AddLeftIcon(81);
- Common.LocalDevice.Current.SetDeviceBeloneIconToControl(btnIcon, listDevice);
+ Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
//璁惧
string deviceName = Common.LocalDevice.Current.GetDeviceMacName(listDevice[0]);
- btnDeviceName = frameTable.AddLeftCaption(deviceName, 800, 60, true);
- btnDeviceName.TextSize = 15;
- //杩欎釜鍧愭爣鏈夌偣鐗规畩
- btnDeviceName.Y = Application.GetRealHeight(12) + this.chidrenYaxis;
- btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceObjectText(listDevice);
+ btnDeviceName = frameTable.AddTopView(deviceName, 800);
frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEventOnly);
//鎴块棿
string roomName = Common.LocalDevice.Current.GeteRealDeviceRoomName(listDevice[0]);
- btnDeviceRoom = frameTable.AddLeftCaption(roomName, 800, 49, true);
- //杩欎釜鍧愭爣鏈夌偣鐗规畩
- btnDeviceRoom.Y = Application.GetRealHeight(72) + this.chidrenYaxis;
- btnDeviceRoom.TextSize = 12;
- btnDeviceRoom.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnDeviceRoom.Text = Common.LocalDevice.Current.GetDeviceMacName(listDevice[0]);
- frameTable.AddChidren(btnDeviceRoom, ChidrenBindMode.BindEventOnly);
+ btnDeviceRoom = frameTable.AddBottomView(roomName, 800);
//搴曠嚎
frameTable.AddBottomLine();
@@ -137,8 +132,13 @@
hadRefresh = true;
var listDevice = Common.LocalDevice.Current.GetDevicesByMac(this.deviceMac);
+ if (listDevice.Count == 0)
+ {
+ //閽堝鍗曠函鍙湁涓�涓�200绔偣鐨勮澶�
+ listDevice.Add(Common.LocalDevice.Current.GetOTADevice(this.deviceMac));
+ }
//鍥炬爣
- Common.LocalDevice.Current.SetDeviceBeloneIconToControl(btnIcon, listDevice);
+ Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);
//璁惧
btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceMacName(listDevice[0]);
//璁惧鎴块棿
--
Gitblit v1.8.0