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/PanelFangyueFunctionSettionForm.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs
index c883ab2..056522a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs
@@ -98,18 +98,18 @@
dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();
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)
{
return;
@@ -130,7 +130,7 @@
//鍥炶矾澶囨敞
string caption = Language.StringByID(R.MyInternationalizationString.uDeviceEpointNote);
- 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;
@@ -191,7 +191,7 @@
private void InitTopRightMenu()
{
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
- if (HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
+ if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
{
return;
}
@@ -214,7 +214,7 @@
int menuCount = 1;
string deviceMenu = string.Empty;
//妫�娴嬫鍥炶矾鏄惁鎷ユ湁瀹氫綅鍔熻兘
- bool canTest = HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(nowSelectDevice);
+ bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);
//if (canTest == true)
//{
// menuCount = 2;
@@ -227,7 +227,7 @@
frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
{
//鍙戦�佸畾浣嶅姛鑳�
- HdlDeviceCommonLogic.Current.SetFixedPositionCommand(nowSelectDevice);
+ Common.LocalDevice.Current.SetFixedPositionCommand(nowSelectDevice);
});
}
@@ -268,7 +268,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 listSort = new List<CommonDevice>();
foreach (var device in listDevice)
{
@@ -309,13 +309,13 @@
frameBorder.AddChidren(btnPic);
- if (deviceEnum.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
+ if (deviceEnum.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueEight)
{
//鍥涘紑鍏帶闈㈡澘
btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueEightButtonTable.png";
this.InitEightButtonPanelIcon(frameBorder, listSort);
}
- else if (deviceEnum.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour)
+ else if (deviceEnum.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFour)
{
//鍙屽紑鍥涙帶闈㈡澘
btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueFourButtonTable.png";
@@ -532,7 +532,7 @@
nowContr.TextColor = 0xfffb744a;
nowSelectControl = nowContr;
- nowSelectDevice = HdlDeviceCommonLogic.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Text.Replace("CHANNEL", string.Empty)));
+ nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Text.Replace("CHANNEL", string.Empty)));
//閲嶆柊鍒濆鍖栬彍鍗曡
this.InitMenuRow();
--
Gitblit v1.8.0