From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentTargetForm.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentTargetForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentTargetForm.cs
index 134412c..1cd89a4 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentTargetForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueEnvironmentTargetForm.cs
@@ -86,7 +86,7 @@
HdlThreadLogic.Current.RunThread(() =>
{
- var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(this.nowSelectFloorId, false);
+ var listRoom = HdlRoomLogic.Current.GetFloorSortRoom(this.nowSelectFloorId, false);
var listDataRoom = new List<Common.Room>();
for (int i = 0; i < listRoom.Count; i++)
{
@@ -120,7 +120,7 @@
private void InitTopRightMenuControl()
{
//鑾峰彇妤煎眰
- var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
if (dicFloor.Count == 0)
{
return;
@@ -221,7 +221,7 @@
var listDevice = this.dicShowDevice[roomId];
for (int i = 0; i < listDevice.Count; i++)
{
- string mainKey = Common.LocalDevice.Current.GetDeviceMainKeys(listDevice[i]);
+ string mainKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(listDevice[i]);
var contr = new DeviceSimpleSelectControl(listDevice[i], false, this.listView.rowSpace / 2);
listView.AddChidren(contr);
contr.InitControl();
@@ -288,9 +288,9 @@
//鍏堟竻绌�
this.dicShowDevice[room.Id] = new List<CommonDevice>();
- foreach (var deviceUi in room.DeviceUIList)
+ foreach (var deviceKeys in room.ListDevice)
{
- var device = deviceUi.CommonDevice;
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
if (device != null)
{
canShow = true;
--
Gitblit v1.8.0