From c47c3ec2488961b3a006aaebcb03dba582f8b19b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 12 三月 2020 17:08:42 +0800
Subject: [PATCH] 2020-03-12-1
---
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
old mode 100644
new mode 100755
index 7aecfbb..db4d658
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -21,8 +21,7 @@
/// <param name="device">Device.</param>
public static void RoomNmae(Button button, CommonDevice device)
{
- var room = new Common.Room();
- button.Text = room.GetRoomNameByDevice(device);
+ button.Text = UserCenter.HdlRoomLogic.Current.GetRoomNameByDevice(device);
}
/// <summary>
/// 杩斿洖妤煎眰鎵�鏈夌殑鎴块棿鐨勫垪琛�
@@ -33,11 +32,12 @@
public static List<Common.Room> GetRoomList(string type, string floorId = null)
{
var list = new List<Common.Room>();
- for (int i = 0; i < Common.Room.Lists.Count; i++)
+ var listAllRoom = UserCenter.HdlRoomLogic.Current.GetAllListRooms();
+ for (int i = 0; i < listAllRoom.Count; i++)
{
if (type == "action_logicscene" || type == "action_lockscene")
{
- if (Common.Room.Lists[i].SceneUIList.Count == 0)
+ if (listAllRoom[i].ListSceneId.Count == 0)
{ ///杩囨护鎺夋病鏈夊満鏅殑鎴块棿
continue;
}
@@ -46,14 +46,14 @@
{
///鍖哄垎鍑鸿緭鍏ユ潯浠跺拰杈撳嚭鐩爣璁惧
var listdevicetype = GetDevice(type);
- var listdevice = GetDeviceUIList(Common.Room.Lists[i], listdevicetype);
+ var listdevice = GetDeviceUIList(listAllRoom[i], listdevicetype);
if (listdevice.Count == 0)
{
///杩囨护鎺夋病鏈夎澶囩殑鎴块棿
continue;
}
}
- list.Add(Common.Room.Lists[i]);
+ list.Add(listAllRoom[i]);
}
if (string.IsNullOrEmpty(floorId))
{
@@ -69,16 +69,17 @@
/// <param name="room">褰撳墠鎴块棿</param>
/// <param name="deviceTypelist">璁惧绫诲瀷</param>
/// <returns></returns>
- public static List<DeviceUI> GetDeviceUIList(Common.Room room, List<DeviceType> deviceTypelist)
+ public static List<CommonDevice> GetDeviceUIList(Common.Room room, List<DeviceType> deviceTypelist)
{
- var deviceUIlist = new List<DeviceUI>();
- foreach (var device in room.DeviceUIList)
+ var deviceUIlist = new List<CommonDevice>();
+ foreach (var deviceKey in room.ListDevice)
{
- if (device.CommonDevice == null)
+ var device = LocalDevice.Current.GetDevice(deviceKey);
+ if (device == null)
{
continue;
}
- if (!deviceTypelist.Contains(device.CommonDevice.Type))
+ if (!deviceTypelist.Contains(device.Type))
{
//杩囨护鎺変笉鏀寔鐨勮澶�
continue;
@@ -93,41 +94,41 @@
/// <param name="type">鍒ゆ柇瀛楃涓�</param>
/// <param name="devicelist">璁惧鍒楄〃</param>
/// <returns></returns>
- public static List<string> GetDeviceTypeList(string type, List<DeviceUI> devicelist)
+ public static List<string> GetDeviceTypeList(string type, List<CommonDevice> devicelist)
{
List<string> devicetypelist = new List<string>();
devicetypelist.Clear();
- 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 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));
}
- 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));
@@ -224,11 +225,11 @@
/// </summary>
/// <param name="device">璁惧瀵硅薄</param>
/// <param name="button">鏄剧ず鍥炬爣鐨勬帶浠�</param>
- public static void GetDeviceIcon(DeviceUI device, Button button)
+ public static void GetDeviceIcon(CommonDevice device, Button button)
{
string patm = "";
string selectedpatm = "";
- switch (device.CommonDevice.Type)
+ switch (device.Type)
{
case DeviceType.OnOffOutput:
{
@@ -238,7 +239,7 @@
break;
case DeviceType.IASZone:
{
- var iASZonedevice = device.CommonDevice as IASZone;
+ var iASZonedevice = device as IASZone;
if (iASZonedevice.DeviceID != 1026)
{
break;
@@ -249,7 +250,7 @@
break;
case DeviceType.TemperatureSensor:
{
- var temperatureSensor = device.CommonDevice as TemperatureSensor;
+ var temperatureSensor = device as TemperatureSensor;
if (temperatureSensor.SensorDiv == 1)
{
patm = $"ZigeeLogic/temperature.png";
--
Gitblit v1.8.0