~wjc/HomeApp.git

			@@ -102,18 +102,18 @@
			this.ShowProgressBar();
			foreach (var epoint in dicDeviceSaveName.Keys)
			{
			var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint);
			var device = HdlDeviceCommonLogic.Current.GetDevice(deviceObj.DeviceAddr, epoint);
			if (device == null \|\| dicDeviceSaveName[epoint] == string.Empty)
			{
			//不能允许空白名字
			continue;
			}
			string newName = dicDeviceSaveName[epoint];
			string oldName = Common.LocalDevice.Current.GetDeviceEpointName(device);
			string oldName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(device);
			if (oldName != newName)
			{
			//设备名称修改
			var result = Common.LocalDevice.Current.ReName(device, newName);
			var result = HdlDeviceCommonLogic.Current.ReName(device, newName);
			if (result == false)
			{
			//关闭
			@@ -126,6 +126,11 @@
			//关闭自身
			this.CloseForm();
			};
			//如果当前是展示模板,则不能编辑
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			btnFinish.CanClick = false;
			}
			}

			/// <summary>
			@@ -135,7 +140,7 @@
			{
			this.listview.RemoveAll();

			string nameValue = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
			string nameValue = HdlDeviceCommonLogic.Current.GetDeviceEpointName(nowSelectDevice);
			if (dicDeviceSaveName.ContainsKey(nowSelectDevice.DeviceEpoint) == true)
			{
			nameValue = dicDeviceSaveName[nowSelectDevice.DeviceEpoint];
			@@ -144,30 +149,35 @@
			//按键备注
			string caption = Language.StringByID(R.MyInternationalizationString.uPanelButtonNote);
			this.btnDeviceName = new FrameCaptionInputControl(caption, nameValue, listview.rowSpace / 2);
			btnDeviceName.txtInput.MaxByte = 48;//限制只能输入48个字节
			listview.AddChidren(btnDeviceName);
			btnDeviceName.InitControl();
			btnDeviceName.AddBottomLine();
			btnDeviceName.txtInput.FinishInputEvent += () =>
			//如果当前是展示模板,则不能编辑
			if (Common.Config.Instance.Home.IsShowTemplate == false)
			{
			string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
			if (btnDeviceName.Text.Trim() == string.Empty)
			btnDeviceName.txtInput.FinishInputEvent += () =>
			{
			//将名字还原
			btnDeviceName.Text = oldName;
			}
			if (oldName != btnDeviceName.Text.Trim())
			{
			//设备名称修改
			var result = Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
			if (result == false)
			string oldName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(nowSelectDevice);
			if (btnDeviceName.Text.Trim() == string.Empty)
			{
			return;
			//将名字还原
			btnDeviceName.Text = oldName;
			}
			//按键备注修改成功!
			string msg = Language.StringByID(R.MyInternationalizationString.uPanelButtonReNoteSuccess);
			this.ShowMassage(ShowMsgType.Tip, msg);
			}
			};
			if (oldName != btnDeviceName.Text.Trim())
			{
			//设备名称修改
			var result = HdlDeviceCommonLogic.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
			if (result == false)
			{
			return;
			}
			//按键备注修改成功!
			string msg = Language.StringByID(R.MyInternationalizationString.uPanelButtonReNoteSuccess);
			this.ShowMassage(ShowMsgType.Tip, msg);
			}
			};
			}

			//所属区域
			var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
			@@ -202,7 +212,8 @@
			private void InitTopRightMenu()
			{
			//检测此回路是否拥有定位功能
			if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
			if (HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false
			\|\| Common.Config.Instance.Home.IsShowTemplate == true)
			{
			return;
			}
			@@ -225,7 +236,7 @@
			int menuCount = 1;
			string deviceMenu = string.Empty;
			//检测此回路是否拥有定位功能
			bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);
			bool canTest = HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(nowSelectDevice);
			//if (canTest == true)
			//{
			// menuCount = 2;
			@@ -238,7 +249,7 @@
			frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
			{
			//发送定位功能
			Common.LocalDevice.Current.SetFixedPositionCommand(nowSelectDevice);
			HdlDeviceCommonLogic.Current.SetFixedPositionCommand(nowSelectDevice);
			});
			}

			@@ -289,7 +300,7 @@
			private void AddBackLightRow()
			{
			//河东设备才会开启此选项
			if (Common.LocalDevice.Current.IsHdlDevice(nowSelectDevice) == true)
			if (HdlDeviceCommonLogic.Current.IsHdlDevice(nowSelectDevice) == true)
			{
			//背光灯
			string caption = Language.StringByID(R.MyInternationalizationString.uBackLight);
			@@ -317,14 +328,14 @@
			/// </summary>
			private void AddVibrationFeedbackRow()
			{
			var listDevice = Common.LocalDevice.Current.GetDevicesByMac(nowSelectDevice.DeviceAddr, false);
			var myType = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
			var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(nowSelectDevice.DeviceAddr, false);
			var myType = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listDevice);
			//只有简约面板才会有这个菜单
			if (myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleTwo
			\|\| myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleThree
			\|\| myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleFour
			\|\| myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FourButtonScene
			\|\| myType.ConcreteType == Common.DeviceConcreteType.ButtonPanel_TwoButtonCurtain)
			if (myType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleTwo
			\|\| myType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleThree
			\|\| myType.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleFour
			\|\| myType.ConcreteType == DeviceConcreteType.ButtonPanel_FourButtonScene
			\|\| myType.ConcreteType == DeviceConcreteType.ButtonPanel_TwoButtonCurtain)
			{
			//震动反馈
			var rowContr = new FrameRowControl(listview.rowSpace / 2);
			@@ -373,6 +384,11 @@
			btnSwitch.CanClick = true;
			});
			};
			//如果当前是展示模板,则不能编辑
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			btnSwitch.CanClick = false;
			}
			if (hadReadVibrationInfo == true)
			{
			//不再读取
			@@ -405,7 +421,7 @@
			private void InitDeviceEpointIcon(VerticalFrameControl listBackControl)
			{
			bool hadDevice = false;
			var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);
			var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceObj.DeviceAddr);
			var listOffSwitch = new List<CommonDevice>();
			foreach (var device in listDevice)
			{
			@@ -650,7 +666,7 @@
			nowContr.BorderColor = 0xfffb744a;

			nowSelectControl = nowContr;
			nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Name.Replace("btn", string.Empty)));
			nowSelectDevice = HdlDeviceCommonLogic.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Name.Replace("btn", string.Empty)));

			//重新初始化菜单行
			this.InitMenuRow();