From 99253403b560f761d5f9af8b4f5140496996433a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十一月 2020 16:49:50 +0800
Subject: [PATCH] 新云端的代码Ver1.0
---
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index 999cd5d..34bcb47 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -21,7 +21,7 @@
/// <param name="device">Device.</param>
public static void RoomNmae(Button button, CommonDevice device)
{
- button.Text = UserCenter.HdlRoomLogic.Current.GetRoomNameByDevice(device);
+ button.Text = HdlRoomLogic.Current.GetRoomNameByDevice(device);
}
/// <summary>
/// 杩斿洖妤煎眰鎵�鏈夌殑鎴块棿鐨勫垪琛�
@@ -32,7 +32,7 @@
public static List<Common.Room> GetRoomList(string type, string floorId = null)
{
var list = new List<Common.Room>();
- var listAllRoom = UserCenter.HdlRoomLogic.Current.GetAllListRooms();
+ var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
for (int i = 0; i < listAllRoom.Count; i++)
{
if (type == "action_logicscene" || type == "action_lockscene")
@@ -75,7 +75,7 @@
var deviceUIlist = new List<CommonDevice>();
foreach (var deviceKey in room.ListDevice)
{
- var device = LocalDevice.Current.GetDevice(deviceKey);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKey);
if (device == null)
{
continue;
@@ -84,15 +84,15 @@
{
//杩囨护鎺変笉鏀寔鐨勮澶�
continue;
- }
- if (device.Type == DeviceType.DoorLock)
- {
- var myInfo = LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
- if (myInfo.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
- {
- //鏆傛椂涓嶆敮鎸丼-one闂ㄩ攣;
- //杩囨护鎺変笉鏀寔S-one闂ㄩ攣璁惧;
- continue;
+ }
+ if (device.Type == DeviceType.DoorLock)
+ {
+ var myInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ if (myInfo.ConcreteType == DeviceConcreteType.IntelligentLocks_Sone)
+ {
+ //鏆傛椂涓嶆敮鎸丼-one闂ㄩ攣;
+ //杩囨护鎺変笉鏀寔S-one闂ㄩ攣璁惧;
+ continue;
}
}
if (type == "condition_mould")
@@ -764,7 +764,7 @@
if (CurrentLogic.Conditions.Count == 0 || CurrentLogic.Actions.Count == 0)
{
- var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
+ var alert = new ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.addnull),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -773,7 +773,7 @@
if (string.IsNullOrEmpty(name))
{
- var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
+ var alert = new ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.PleaseEnterLogicName),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
--
Gitblit v1.8.0