From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期三, 16 十二月 2020 13:09:08 +0800 Subject: [PATCH] 新云端代码Ver1.2 --- ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorTargetSelectForm.cs index 3bf2b16..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)); } } @@ -247,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) { @@ -258,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); @@ -336,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; @@ -360,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