From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
index 422c4c5..dc07bcb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
@@ -118,7 +118,7 @@
}
//鍦烘櫙鎺т欢
var frameContr = new ScenePictrueControl();
- listView.AddChidrenFrame(frameContr);
+ listView.AddChidren(frameContr);
frameContr.InitControl(data);
}
});
@@ -179,8 +179,12 @@
}
}
listView.AdjustRealHeight(Application.GetRealHeight(23));
- //寮�鍚澶囧湪绾跨洃娴�
- this.StartCheckDeviceOnline(listView, listGwId, dicData);
+ //濡傛灉涓嶆槸铏氭嫙浣忓畢
+ if (Common.Config.Instance.Home.IsVirtually == false)
+ {
+ //寮�鍚澶囧湪绾跨洃娴�
+ this.StartCheckDeviceOnline(listView, listGwId, dicData);
+ }
});
}
@@ -244,7 +248,7 @@
string path1 = string.Empty;
string path2 = string.Empty;
//鑾峰彇鍥剧墖
- Common.LocalDevice.Current.GetDeviceObjectIcon(typeInfo.ConcreteType, ref path1, ref path2);
+ Common.LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref path1, ref path2);
dic[typeInfo.BeloneTextId].IconPath = path1;
}
dic[typeInfo.BeloneTextId].listDeviceKeys.Add(Common.LocalDevice.Current.GetDeviceMainKeys(device));
@@ -283,7 +287,7 @@
{
for (int j = 0; j < list.Count; j++)
{
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(list[i]);
+ string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(list[j]);
if (listView.Parent == null || dicData.ContainsKey(mainkeys) == false || listCheck.Contains(mainkeys) == true)
{
return;
@@ -291,13 +295,13 @@
listCheck.Add(mainkeys);
var localDevice = Common.LocalDevice.Current.GetDevice(mainkeys);
- if (localDevice != null && localDevice.IsOnline != list[i].IsOnline)
+ if (localDevice != null && localDevice.IsOnline != list[j].IsOnline)
{
//鍦ㄧ嚎鐘舵�佷竴鏍风殑璇濓紝涓嶉渶瑕佸埛鏂�
- localDevice.IsOnline = list[i].IsOnline;
+ localDevice.IsOnline = list[j].IsOnline;
localDevice.ReSave();
}
- if (list[i].IsOnline == 1)
+ if (Common.LocalDevice.Current.CheckDeviceIsOnline(list[j]) == true)
{
dicData[mainkeys].OnlineCount += 1;
dicData[mainkeys].btnOnline.Text = dicData[mainkeys].OnlineCount + "/" + dicData[mainkeys].listDeviceKeys.Count;
--
Gitblit v1.8.0