From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 31 十二月 2020 19:29:43 +0800 Subject: [PATCH] 合并了代码 --- ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs index 7070988..324a976 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueButtonSettionForm.cs @@ -95,18 +95,18 @@ this.ShowProgressBar(); foreach (var epoint in dicDeviceSaveName.Keys) { - var device = HdlDeviceCommonLogic.Current.GetDevice(deviceObj.DeviceAddr, epoint); + var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint); if (device == null || dicDeviceSaveName[epoint] == string.Empty) { //涓嶈兘鍏佽绌虹櫧鍚嶅瓧 continue; } string newName = dicDeviceSaveName[epoint]; - string oldName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device); + string oldName = Common.LocalDevice.Current.GetDeviceEpointName(device); if (oldName != newName) { //璁惧鍚嶇О淇敼 - var result = HdlDeviceCommonLogic.Current.ReName(device, newName); + var result = Common.LocalDevice.Current.ReName(device, newName); if (result == false) { //鍏抽棴 @@ -128,7 +128,7 @@ { this.listview.RemoveAll(); - string nameValue = HdlDeviceCommonLogic.Current.GetDeviceEpointName(nowSelectDevice); + string nameValue = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice); if (dicDeviceSaveName.ContainsKey(nowSelectDevice.DeviceEpoint) == true) { nameValue = dicDeviceSaveName[nowSelectDevice.DeviceEpoint]; @@ -143,7 +143,7 @@ btnDeviceName.AddBottomLine(); btnDeviceName.txtInput.FinishInputEvent += () => { - string oldName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(nowSelectDevice); + string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice); if (btnDeviceName.Text.Trim() == string.Empty) { //灏嗗悕瀛楄繕鍘� @@ -152,7 +152,7 @@ if (oldName != btnDeviceName.Text.Trim()) { //璁惧鍚嶇О淇敼 - var result = HdlDeviceCommonLogic.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim()); + var result = Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim()); if (result == false) { return; @@ -194,7 +194,7 @@ private void InitTopRightMenu() { //妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘 - if (HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false) + if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false) { return; } @@ -220,7 +220,7 @@ frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () => { //鍙戦�佸畾浣嶅姛鑳� - HdlDeviceCommonLogic.Current.SetFixedPositionCommand(nowSelectDevice); + Common.LocalDevice.Current.SetFixedPositionCommand(nowSelectDevice); }); } @@ -264,7 +264,7 @@ private void AddBackLightRow() { //娌充笢璁惧鎵嶄細寮�鍚閫夐」 - if (HdlDeviceCommonLogic.Current.IsHdlDevice(nowSelectDevice) == true) + if (Common.LocalDevice.Current.IsHdlDevice(nowSelectDevice) == true) { //鑳屽厜鐏� string caption = Language.StringByID(R.MyInternationalizationString.uBackLight); @@ -279,7 +279,7 @@ { List<CommonDevice> listNewDevice = new List<CommonDevice> { }; listNewDevice.Add((Panel)nowSelectDevice); - var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listNewDevice); + var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listNewDevice); //濡傛灉璁惧鏄柟鎮﹀紑鎺ц澶囷紝鑳屽厜鐏〉闇�瑕佹粦鍔ㄤ笖鏈夋帴杩戞劅搴斿姛鑳� if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo || deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour @@ -308,7 +308,7 @@ private void InitDeviceEpointIcon(VerticalFrameControl listBackControl) { bool hadDevice = false; - var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceObj.DeviceAddr); + var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr); var listOffSwitch = new List<CommonDevice>(); foreach (var device in listDevice) { @@ -590,7 +590,7 @@ nowContr.TextColor = 0xfffb744a; nowSelectControl = nowContr; - nowSelectDevice = HdlDeviceCommonLogic.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Text.Replace("BUTTON", string.Empty))); + nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Text.Replace("BUTTON", string.Empty))); //閲嶆柊鍒濆鍖栬彍鍗曡 this.InitMenuRow(); -- Gitblit v1.8.0