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/DoorLockLogic/LockAddDevice.cs | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
index 1344c2a..e48fe6c 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs
@@ -107,7 +107,8 @@
///娌℃湁鎴块棿鐩存帴杩斿洖鍘伙紱
- if (Common.Room.Lists.Count == 0)
+ var listAllRoom = UserCenter.HdlRoomLogic.Current.GetAllListRooms();
+ if (listAllRoom.Count == 0)
{
return;
}
@@ -266,7 +267,7 @@
dropdown.Visible = false;
if (Config.Instance.Home.FloorDics.Count == 0)
{
- roomlists.AddRange(Common.Room.Lists);
+ roomlists.AddRange(listAllRoom);
}
else
{
@@ -331,14 +332,15 @@
roomTextButton.IsSelected = false;
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;
}
@@ -370,14 +372,15 @@
roomTextButton.IsSelected = false;
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;
}
@@ -408,29 +411,29 @@
/// <summary>
///鍔犺浇璇ュ尯鍩熸墍鏈夎澶囩殑瑙嗗浘鏂规硶
/// </summary>
- 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.DimmableLight || device.CommonDevice.Type == DeviceType.OnOffOutput);
+ var lightjosn = devicelist.Find((device) => device.Type == DeviceType.DimmableLight || 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 ac = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.Thermostat);
+ var ac = devicelist.Find((device) => device.Type == DeviceType.Thermostat);
if (ac != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.AC));
}
- var airSwitch = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.AirSwitch);
+ var airSwitch = devicelist.Find((device) => device.Type == DeviceType.AirSwitch);
if (airSwitch != null)
{
devicetypelist.Add(Language.StringByID(MyInternationalizationString.Airswitch));
@@ -553,13 +556,13 @@
/// 鍔犺浇璇ョ被鍨嬭澶囪鍥炬柟娉�
/// </summary>
/// <param name="devicelist">璁惧鍒楄〃</param>
- void ActionDeviceView(List<DeviceType> deviceTypelist, List<DeviceUI> devicelist)
+ void ActionDeviceView(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;
}
@@ -603,14 +606,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:
@@ -660,7 +663,7 @@
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
- CurrentDeviceStateView(flMain, common.CommonDevice, false);
+ CurrentDeviceStateView(flMain, common, false);
};
deviceFramelayout.MouseUpEventHandler += devicclick;
bjFramelayout.MouseUpEventHandler += devicclick;
--
Gitblit v1.8.0