From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
index 53f7d21..ac74863 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
@@ -22,7 +22,7 @@
/// <summary>
/// 妗屽竷鎺т欢
/// </summary>
- private FrameLayout frameTable = null;
+ private NormalFrameLayout frameTable = null;
/// <summary>
/// 鎴块棿瀵硅薄
/// </summary>
@@ -68,7 +68,7 @@
bodyFrameLayout.AddChidren(frameBack);
//妗屽竷鎺т欢
- this.frameTable = new FrameLayout();
+ this.frameTable = new NormalFrameLayout();
frameTable.Y = frameBack.Bottom;
frameTable.Height = bodyFrameLayout.Height - frameBack.Height;
bodyFrameLayout.AddChidren(frameTable);
@@ -78,16 +78,16 @@
tempRoom.Name = Language.StringByID(R.MyInternationalizationString.uOther);
foreach (var mainKeys in this.listEsixtDevice)
{
- var device = Common.LocalDevice.Current.GetDevice(mainKeys);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(mainKeys);
if (device == null)
{
continue;
}
//杩欎釜鎵嬫満寮勫紕,閭ｄ釜鎵嬫満寮勫紕鐨勬儏鍐典笅,
//閲囩敤鍚庡鎿嶄綔 -> 鏂板缓涓�涓复鏃舵埧闂村璞″嚭鏉�
- if (Common.Room.CurrentRoom.GetRoomByDevice(device) == null)
+ if (HdlRoomLogic.Current.GetRoomByDevice(device) == null)
{
- tempRoom.DeviceUIList.Add(Common.LocalDevice.Current.GetDeviceUI(device));
+ tempRoom.ListDevice.Add(HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device));
}
}
@@ -98,7 +98,7 @@
//鍒濆鍖栨埧闂存帶浠�
var listRoom = new List<Common.Room>();
listRoom.AddRange(dicRoom[nowSelectFloorId]);
- if (tempRoom.DeviceUIList.Count > 0)
+ if (tempRoom.ListDevice.Count > 0)
{
//鏄剧ず鏂板缓鐨勪复鏃舵埧闂村璞�
listRoom.Add(tempRoom);
@@ -123,6 +123,11 @@
//鐣岄潰鍏抽棴
this.CloseForm();
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnOk.CanClick = false;
+ }
}
else
{
@@ -142,7 +147,8 @@
private void InitTopRightMenuControl()
{
//鎴块棿鍒嗙粍
- foreach (var room in Common.Room.Lists)
+ var listRoom = HdlRoomLogic.Current.GetAllListRooms();
+ foreach (var room in listRoom)
{
//妫�娴嬭鎴块棿鑳藉惁鏄剧ず
if (this.CheckCanShowRow(room) == false)
@@ -162,7 +168,7 @@
}
//鑾峰彇妤煎眰
- var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
if (dicFloor.Count == 0)
{
return;
@@ -239,9 +245,9 @@
frameTable.AddChidren(listView);
var listDevice = new List<ZigBee.Device.CommonDevice>();
- foreach (var deviceUi in room.DeviceUIList)
+ foreach (var deviceKeys in room.ListDevice)
{
- var device = deviceUi.CommonDevice;
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
//妫�娴嬭澶�
if (this.CheckCanShowDevice(device) == true)
{
@@ -252,15 +258,15 @@
for (int i = 0; i < listDevice.Count; i++)
{
var device = listDevice[i];
- string mainKey = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainKey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
var rowDevice = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(rowDevice);
//鍥炬爣
var btnIcon = rowDevice.AddLeftIcon(81);
- Common.LocalDevice.Current.SetDeviceIconToControl(btnIcon, device);
+ HdlDeviceCommonLogic.Current.SetDeviceIconToControl(btnIcon, device);
//璁惧鍚嶇О
- var btnName = rowDevice.AddLeftCaption(Common.LocalDevice.Current.GetDeviceEpointName(device), 700);
+ var btnName = rowDevice.AddLeftCaption(HdlDeviceCommonLogic.Current.GetDeviceEpointName(device), 700);
btnName.TextSize = 15;
//閫夋嫨
var btnSelect = rowDevice.AddMostRightEmptyIcon(58, 58);
@@ -287,6 +293,11 @@
listEsixtDevice.Remove(mainKey);
}
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ rowDevice.CanClick = false;
+ }
}
listDevice = null;
//璋冩暣鎺т欢鐪熷疄楂樺害
@@ -314,7 +325,7 @@
/// <returns></returns>
private bool CheckCanShowRow(Common.Room room)
{
- if (room.DeviceUIList.Count == 0)
+ if (room.ListDevice.Count == 0)
{
return false;
}
@@ -322,10 +333,11 @@
{
return false;
}
- foreach (var deviceUi in room.DeviceUIList)
+ foreach (var deviceKeys in room.ListDevice)
{
//妫�娴嬭璁惧鑳藉惁鏄剧ず
- if (this.CheckCanShowDevice(deviceUi.CommonDevice) == false)
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
+ if (this.CheckCanShowDevice(device) == false)
{
continue;
}
@@ -348,7 +360,7 @@
return false;
}
//濡傛灉鏄紶鎰熷櫒锛屾垨鑰呮槸娌℃湁寮�鍏崇皣鐨勮瘽(杩欓噷鍒ゆ柇鐨勬槸杈撳叆绨�)
- if ((device.Type == ZigBee.Device.DeviceType.IASZone) || Common.LocalDevice.Current.InDeviceIsCanOnOff(device) == false)
+ if ((device.Type == ZigBee.Device.DeviceType.IASZone) || HdlDeviceCommonLogic.Current.InDeviceIsCanOnOff(device) == false)
{
return false;
}
--
Gitblit v1.8.0