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 | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
index 068bec2..ac74863 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs
@@ -78,7 +78,7 @@
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;
@@ -87,7 +87,7 @@
//閲囩敤鍚庡鎿嶄綔 -> 鏂板缓涓�涓复鏃舵埧闂村璞″嚭鏉�
if (HdlRoomLogic.Current.GetRoomByDevice(device) == null)
{
- tempRoom.ListDevice.Add(Common.LocalDevice.Current.GetDeviceMainKeys(device));
+ tempRoom.ListDevice.Add(HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device));
}
}
@@ -123,6 +123,11 @@
//鐣岄潰鍏抽棴
this.CloseForm();
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ btnOk.CanClick = false;
+ }
}
else
{
@@ -242,7 +247,7 @@
var listDevice = new List<ZigBee.Device.CommonDevice>();
foreach (var deviceKeys in room.ListDevice)
{
- var device = Common.LocalDevice.Current.GetDevice(deviceKeys);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
//妫�娴嬭澶�
if (this.CheckCanShowDevice(device) == true)
{
@@ -253,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);
@@ -288,6 +293,11 @@
listEsixtDevice.Remove(mainKey);
}
};
+ //鏌ョ湅妯℃澘鏃�,涓嶅厑璁哥紪杈�
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ rowDevice.CanClick = false;
+ }
}
listDevice = null;
//璋冩暣鎺т欢鐪熷疄楂樺害
@@ -326,7 +336,7 @@
foreach (var deviceKeys in room.ListDevice)
{
//妫�娴嬭璁惧鑳藉惁鏄剧ず
- var device = Common.LocalDevice.Current.GetDevice(deviceKeys);
+ var device = HdlDeviceCommonLogic.Current.GetDevice(deviceKeys);
if (this.CheckCanShowDevice(device) == false)
{
continue;
@@ -350,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