From a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 06 三月 2020 15:31:36 +0800
Subject: [PATCH] 删除了郭雪城的 DeviceUi 这个类
---
ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
index 6a87aa5..f0fe357 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs
@@ -105,12 +105,13 @@
Y = Application.GetRealHeight(92),
UnSelectedImagePath = "ZigeeLogic/drop-down.png",
};
- topRowLayout.AddChidren(dropdown);
-
+ topRowLayout.AddChidren(dropdown);
+
#endregion
-
+
///娌℃湁鎴块棿鐩存帴杩斿洖鍘伙紱
- if (Common.Room.Lists.Count == 0)
+ var listAllRoom = UserCenter.HdlRoomLogic.Current.GetAllListRooms();
+ if (listAllRoom.Count == 0)
{
return;
}
@@ -264,7 +265,7 @@
dropdown.Visible = false;
if (Config.Instance.Home.FloorDics.Count == 0)
{
- roomlists.AddRange(Common.Room.Lists);
+ roomlists.AddRange(listAllRoom);
}
else
{
@@ -330,14 +331,15 @@
roomTextButton = roomnameBtn;
roomnameBtn.IsSelected = true;
- var list = new List<DeviceUI>();
- foreach (var device in room.DeviceUIList)
+ var list = new List<CommonDevice>();
+ foreach (var deviceKeys in room.ListDevice)
{
- if (device.CommonDevice == null)
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device == null)
{
continue;
}
- if (!deviceTypeList.Contains(device.CommonDevice.Type))
+ if (!deviceTypeList.Contains(device.Type))
{
continue;
}
@@ -371,14 +373,15 @@
roomTextButton = roomnameBtn;
roomnameBtn.IsSelected = true;
- var list = new List<DeviceUI>();
- foreach (var device in room.DeviceUIList)
- {
- if (device.CommonDevice == null)
+ var list = new List<CommonDevice>();
+ foreach (var deviceKeys in room.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device == null)
{
continue;
}
- if (!deviceTypeList.Contains(device.CommonDevice.Type))
+ if (!deviceTypeList.Contains(device.Type))
{
continue;
}
@@ -409,34 +412,34 @@
/// 鍔犺浇璇ュ尯鍩熸墍鏈夎澶囪鍥炬柟娉�
/// </summary>0
/// <param name="devicelist">Devicelist.</param>
- void AllDeviceTypeView(List<DeviceUI> devicelist, HorizontalScrolViewLayout devicetypehorizontalScrol)
+ void AllDeviceTypeView(List<CommonDevice> devicelist, HorizontalScrolViewLayout devicetypehorizontalScrol)
{
List<string> devicetypelist = new List<string>();
devicetypelist.Clear();
#region ------鎺掑垪璁惧绫诲瀷------
///鏆傛椂闅愯棌鐏厜鍜岀獥甯樿澶�
- var lightjosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.ColorDimmableLight || device.CommonDevice.Type == DeviceType.OnOffOutput);
+ var lightjosn = devicelist.Find((device) => device.Type == DeviceType.ColorDimmableLight || device.Type == DeviceType.OnOffOutput);
if (lightjosn != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.Lights));
}
- var curtainjosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.WindowCoveringDevice);
+ var curtainjosn = devicelist.Find((device) => device.Type == DeviceType.WindowCoveringDevice);
if (curtainjosn != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.Curtains));
}
- var iASZonejosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.IASZone || device.CommonDevice.Type == DeviceType.TemperatureSensor);
+ var iASZonejosn = devicelist.Find((device) => device.Type == DeviceType.IASZone || device.Type == DeviceType.TemperatureSensor);
if (iASZonejosn != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.sensor));
}
- var onOffSwitchjson = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.OnOffSwitch);
+ var onOffSwitchjson = devicelist.Find((device) => device.Type == DeviceType.OnOffSwitch);
if (onOffSwitchjson != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.OnOffSwitch));
}
- var doorLock = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.DoorLock);
+ var doorLock = devicelist.Find((device) => device.Type == DeviceType.DoorLock);
if (doorLock != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.doorLock));
@@ -571,14 +574,14 @@
/// </summary>
/// <param name="deviceTypelist">Device typelist.</param>
/// <param name="devicelist">璁惧鍒楄〃</param>
- void ConditionDeviceView(List<DeviceType> deviceTypelist, List<DeviceUI> devicelist)
+ void ConditionDeviceView(List<DeviceType> deviceTypelist, List<CommonDevice> devicelist)
{
middle.RemoveAll();
foreach (var common in devicelist)
{
- if (deviceTypelist.Count != 0 && !deviceTypelist.Contains(common.CommonDevice.Type))
+ if (deviceTypelist.Count != 0 && !deviceTypelist.Contains(common.Type))
{
continue;
}
@@ -623,14 +626,14 @@
var devicename = new Button
{
- Text = common.CommonDevice.DeviceEpointName,
+ Text = common.DeviceEpointName,
TextAlignment = TextAlignment.CenterLeft,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
TextSize = 14,
};
deviceRow.AddChidren(devicename);
- switch (common.CommonDevice.Type)
+ switch (common.Type)
{
case DeviceType.OnOffOutput:
{
@@ -640,7 +643,7 @@
break;
case DeviceType.IASZone:
{
- var iASZonedevice = common.CommonDevice as IASZone;
+ var iASZonedevice = common as IASZone;
if (iASZonedevice.DeviceID != 1026)
{
break;
@@ -653,7 +656,7 @@
break;
case DeviceType.TemperatureSensor:
{
- var temperatureSensor = common.CommonDevice as TemperatureSensor;
+ var temperatureSensor = common as TemperatureSensor;
if (temperatureSensor.SensorDiv == 1)
{
deviceIconBtn.UnSelectedImagePath = $"ZigeeLogic/temperature.png";
@@ -693,7 +696,7 @@
devicename.IsSelected = true;
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
- CurrentDeviceView(flMain, common.CommonDevice, false);
+ CurrentDeviceView(flMain, common, false);
};
deviceFramelayout.MouseUpEventHandler += devicclick;
bjFramelayout.MouseUpEventHandler += devicclick;
--
Gitblit v1.8.0