From 23532fa8ad34c89b6d24b01eaef6475fd0aad898 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 15 四月 2020 18:08:24 +0800
Subject: [PATCH] ???????
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs | 74 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
index e879acf..422c4c5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
@@ -68,7 +68,7 @@
bodyFrameLayout.AddChidren(tabControl);
tabControl.SelectTabEvent += (tabIndex) =>
{
- if (tabIndex == 1)
+ if (tabIndex == 0)
{
//鏄剧ず鍦烘櫙鍒楄〃
this.ShowSceneList();
@@ -79,7 +79,11 @@
this.ShowFunctionList();
}
};
- tabControl.InitControl();
+ var listTitle = new List<string>();
+ //鍦烘櫙,鍔熻兘
+ listTitle.Add(Language.StringByID(R.MyInternationalizationString.uScence));
+ listTitle.Add(Language.StringByID(R.MyInternationalizationString.uFunction));
+ tabControl.InitControl(listTitle);
}
#endregion
@@ -95,18 +99,23 @@
this.frameTable.RemoveAll();
HdlThreadLogic.Current.RunMainInThread(() =>
{
- if (lookRoom.SceneUIList.Count == 0)
+ if (lookRoom.ListSceneId.Count == 0)
{
//杩樻病鏈夋坊鍔犲満鏅摝
this.ShowNotDataImage(frameTable, Language.StringByID(R.MyInternationalizationString.uDoNotHadAddScenceMsg));
return;
}
- var listView = new VerticalFrameControl(29);
+ var listView = new VerticalFrameControl(3);
listView.Height = frameTable.Height;
frameTable.AddChidren(listView);
- foreach (var data in lookRoom.SceneUIList)
+ foreach (var dataId in lookRoom.ListSceneId)
{
+ var data = HdlSceneLogic.Current.GetSceneUIBySceneId(dataId);
+ if (data == null)
+ {
+ continue;
+ }
//鍦烘櫙鎺т欢
var frameContr = new ScenePictrueControl();
listView.AddChidrenFrame(frameContr);
@@ -223,7 +232,7 @@
private Dictionary<int, DeviceRowInfo> GetAllGroupDevice()
{
//鍏ㄩ儴鐨勮澶�
- var listDevice = lookRoom.GetRoomListDevice();
+ var listDevice = HdlRoomLogic.Current.GetRoomListDevice(lookRoom);
var dic = new Dictionary<int, DeviceRowInfo>();
foreach (var device in listDevice)
{
@@ -266,31 +275,36 @@
}
//杩欓噷涓昏鍙槸鑾峰彇鍦ㄧ嚎鐘舵��
var zbway = HdlGatewayLogic.Current.GetLocalGateway(listGwId[i]);
- var result = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, (device) =>
- {
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- if (listView.Parent == null || dicData.ContainsKey(mainkeys) == false || listCheck.Contains(mainkeys) == true)
- {
- return;
- }
- listCheck.Add(mainkeys);
+ int statu = 0;
+ var list = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, ref statu, false, ShowErrorMode.NO);
+ if (statu != -1)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ for (int j = 0; j < list.Count; j++)
+ {
+ string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(list[i]);
+ if (listView.Parent == null || dicData.ContainsKey(mainkeys) == false || listCheck.Contains(mainkeys) == true)
+ {
+ return;
+ }
+ listCheck.Add(mainkeys);
- var localDevice = Common.LocalDevice.Current.GetDevice(mainkeys);
- if (localDevice != null && localDevice.IsOnline != device.IsOnline)
- {
- //鍦ㄧ嚎鐘舵�佷竴鏍风殑璇濓紝涓嶉渶瑕佸埛鏂�
- localDevice.IsOnline = device.IsOnline;
- localDevice.ReSave();
- }
- if (device.IsOnline == 1)
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- dicData[mainkeys].OnlineCount += 1;
- dicData[mainkeys].btnOnline.Text = dicData[mainkeys].OnlineCount + "/" + dicData[mainkeys].listDeviceKeys.Count;
- });
- }
- }, ShowErrorMode.NO);
+ var localDevice = Common.LocalDevice.Current.GetDevice(mainkeys);
+ if (localDevice != null && localDevice.IsOnline != list[i].IsOnline)
+ {
+ //鍦ㄧ嚎鐘舵�佷竴鏍风殑璇濓紝涓嶉渶瑕佸埛鏂�
+ localDevice.IsOnline = list[i].IsOnline;
+ localDevice.ReSave();
+ }
+ if (list[i].IsOnline == 1)
+ {
+ dicData[mainkeys].OnlineCount += 1;
+ dicData[mainkeys].btnOnline.Text = dicData[mainkeys].OnlineCount + "/" + dicData[mainkeys].listDeviceKeys.Count;
+ }
+ }
+ });
+ }
}
});
}
--
Gitblit v1.8.0