From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
index 194c955..2aadc19 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
@@ -19,7 +19,7 @@
/// <summary>
/// 妗屽竷鎺т欢
/// </summary>
- private FrameLayout frameTable = null;
+ private NormalFrameLayout frameTable = null;
#endregion
@@ -49,7 +49,7 @@
this.ClearBodyFrame();
//鍒濆鍖栨甯冩帶浠�
- this.frameTable = new FrameLayout();
+ this.frameTable = new NormalFrameLayout();
frameTable.Y = Application.GetRealHeight(187);
frameTable.Height = bodyFrameLayout.Height - Application.GetRealHeight(187);
bodyFrameLayout.AddChidren(frameTable);
@@ -118,7 +118,7 @@
}
//鍦烘櫙鎺т欢
var frameContr = new ScenePictrueControl();
- listView.AddChidrenFrame(frameContr);
+ listView.AddChidren(frameContr);
frameContr.InitControl(data);
}
});
@@ -248,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));
@@ -287,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;
@@ -295,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