~wjc/HomeApp.git

			@@ -1,4 +1,5 @@
			using System;
			using Shared.Common;
			using System;
			using System.Collections.Generic;
			using System.Text;
			using ZigBee.Device;
			@@ -15,7 +16,7 @@
			/// <summary>
			/// 列表控件
			/// </summary>
			private VerticalListControl listview = null;
			private FrameListControl listview = null;
			/// <summary>
			/// 当前选择的设备
			/// </summary>
			@@ -71,18 +72,22 @@
			//清空bodyFrame
			this.ClearBodyFrame();

			var listBackControl = new VerticalFrameControl();
			listBackControl.Height = bodyFrameLayout.Height;
			bodyFrameLayout.AddChidren(listBackControl);

			//初始化桌布
			this.tableContr = new InformationEditorControl();
			this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 708, 1028);
			this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);

			//初始化设备回路图标
			this.InitDeviceEpointIcon();
			this.InitDeviceEpointIcon(listBackControl);

			//保存
			var btnFinish = new BottomClickButton();
			btnFinish.TextID = R.MyInternationalizationString.uSave;
			bodyFrameLayout.AddChidren(btnFinish);
			btnFinish.ButtonClickEvent += async (sender, e) =>
			btnFinish.ButtonClickEvent += (sender, e) =>
			{
			//记录起当前正在操作的回路名字
			dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();
			@@ -90,18 +95,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 = await Common.LocalDevice.Current.ReName(device, newName);
			var result = HdlDeviceCommonLogic.Current.ReName(device, newName);
			if (result == false)
			{
			//关闭
			@@ -123,7 +128,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];
			@@ -132,12 +137,13 @@
			//按键备注
			string caption = Language.StringByID(R.MyInternationalizationString.uPanelButtonNote);
			this.btnDeviceName = new FrameCaptionInputControl(caption, nameValue, listview.rowSpace / 2);
			this.btnDeviceName.txtInput.MaxByte = 48;//限制只能输入48个字节
			listview.AddChidren(btnDeviceName);
			btnDeviceName.InitControl();
			btnDeviceName.AddBottomLine();
			btnDeviceName.txtInput.FinishInputEvent += async () =>
			btnDeviceName.txtInput.FinishInputEvent += () =>
			{
			string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
			string oldName = HdlDeviceCommonLogic.Current.GetDeviceEpointName(nowSelectDevice);
			if (btnDeviceName.Text.Trim() == string.Empty)
			{
			//将名字还原
			@@ -146,7 +152,7 @@
			if (oldName != btnDeviceName.Text.Trim())
			{
			//设备名称修改
			var result = await Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
			var result = HdlDeviceCommonLogic.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
			if (result == false)
			{
			return;
			@@ -173,11 +179,9 @@
			this.AddBindRow();
			//添加背光灯行
			this.AddBackLightRow();
			//添加接近感应行
			this.AddProximityInductionRow();

			//初始化桌布完成
			tableContr.FinishInitControl(bodyFrameLayout, this.listview);
			tableContr.FinishInitControl();
			}

			#endregion
			@@ -190,7 +194,7 @@
			private void InitTopRightMenu()
			{
			//检测此回路是否拥有定位功能
			if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
			if (HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
			{
			return;
			}
			@@ -216,7 +220,7 @@
			frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
			{
			//发送定位功能
			Common.LocalDevice.Current.SetFixedPositionCommand(nowSelectDevice);
			HdlDeviceCommonLogic.Current.SetFixedPositionCommand(nowSelectDevice);
			});
			}

			@@ -260,7 +264,7 @@
			private void AddBackLightRow()
			{
			//河东设备才会开启此选项
			if (Common.LocalDevice.Current.IsHdlDevice(nowSelectDevice) == true)
			if (HdlDeviceCommonLogic.Current.IsHdlDevice(nowSelectDevice) == true)
			{
			//背光灯
			string caption = Language.StringByID(R.MyInternationalizationString.uBackLight);
			@@ -273,34 +277,25 @@
			btnLight.AddRightArrow();
			btnLight.ButtonClickEvent += (sender, e) =>
			{
			var form = new PanelBackLightSettionForm();
			form.AddForm((Panel)nowSelectDevice);
			List<CommonDevice> listNewDevice = new List<CommonDevice> { };
			listNewDevice.Add((Panel)nowSelectDevice);
			var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listNewDevice);
			//如果设备是方悦开控设备，背光灯页需要滑动且有接近感应功能
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
			{
			var form = new PanelBackLighWithSensorForm();
			form.AddForm((Panel)nowSelectDevice);
			}
			else
			{
			//不带接近感应的
			var form = new PanelBackLightSettionForm();
			form.AddForm((Panel)nowSelectDevice);
			}
			};
			}
			}

			#endregion

			#region ■ 接近感应___________________________

			/// <summary>
			/// 添加接近感应行
			/// </summary>
			private void AddProximityInductionRow()
			{
			//接近感应
			var rowContr = new FrameRowControl(listview.rowSpace / 2);
			rowContr.UseClickStatu = false;
			listview.AddChidren(rowContr);
			rowContr.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uProximityInduction), 600);
			//底线
			rowContr.AddBottomLine();
			//开关
			var btnSwitch = rowContr.AddMostRightSwitchIcon();
			btnSwitch.ButtonClickEvent += (sender, e) =>
			{
			btnSwitch.IsSelected = !btnSwitch.IsSelected;
			};
			}

			#endregion
			@@ -310,10 +305,10 @@
			/// <summary>
			/// 初始化设备回路图标
			/// </summary>
			private void InitDeviceEpointIcon()
			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)
			{
			@@ -346,9 +341,9 @@
			var frameBorder = new FrameLayout();
			frameBorder.Y = Application.GetRealHeight(150);
			frameBorder.Gravity = Gravity.CenterHorizontal;
			frameBorder.Width = Application.GetMinRealAverage(426);
			frameBorder.Height = Application.GetMinRealAverage(426);
			bodyFrameLayout.AddChidren(frameBorder);
			frameBorder.Width = this.GetPictrueRealSize(426);
			frameBorder.Height = this.GetPictrueRealSize(426);
			listBackControl.frameTable.AddChidren(frameBorder);

			var btnPic = new PicViewControl(frameBorder.Width, frameBorder.Height, false);

			@@ -357,19 +352,19 @@
			if (listOffSwitch.Count == 8)
			{
			//八按键面板
			btnPic.UnSelectedImagePath = "Device/PanelFangyueEightButtonTable.png";
			btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueEightButtonTable.png";
			this.InitEightButtonPanelIcon(frameBorder, listOffSwitch);
			}
			else if (listOffSwitch.Count == 4)
			{
			//四按键面板
			btnPic.UnSelectedImagePath = "Device/PanelFangyueFourButtonTable.png";
			btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueFourButtonTable.png";
			this.InitFourButtonPanelIcon(frameBorder, listOffSwitch);
			}
			else
			{
			//二按键面板
			btnPic.UnSelectedImagePath = "Device/PanelFangyueTwoButtonTable.png";
			btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueTwoButtonTable.png";
			this.InitTwoButtonPanelIcon(frameBorder, listOffSwitch);
			}
			}
			@@ -382,14 +377,15 @@
			/// <returns></returns>
			private NormalViewControl InitDeviceButtonControl(FrameLayout frame, CommonDevice device)
			{
			var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);
			btnIcon.Text = "Button" + device.DeviceEpoint;
			var btnIcon = new NormalViewControl(this.GetPictrueRealSize(52), this.GetPictrueRealSize(52), false);
			btnIcon.Text = "BUTTON" + device.DeviceEpoint;
			btnIcon.TextAlignment = TextAlignment.Center;
			btnIcon.TextColor = UserCenterColor.Current.TextGrayColor1;
			if (frame is FrameLayoutControl)
			btnIcon.IsBold = true;
			if (frame is FrameLayoutStatuControl)
			{
			((FrameLayoutControl)frame).AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
			((FrameLayoutControl)frame).ButtonClickEvent += (sender, e) =>
			((FrameLayoutStatuControl)frame).AddChidren(btnIcon, ChidrenBindMode.BindEvent);
			((FrameLayoutStatuControl)frame).ButtonClickEvent += (sender, e) =>
			{
			//按键点击
			this.DeviceEpointSelectEvent(btnIcon, null);
			@@ -427,15 +423,15 @@
			{
			//按键1
			var btnButton1 = this.InitDeviceButtonControl(frameBack, listDevice[0]);
			btnButton1.Height = Application.GetMinRealAverage(175);
			btnButton1.Width = Application.GetMinRealAverage(361);
			btnButton1.Y = Application.GetMinRealAverage(39);
			btnButton1.Height = this.GetPictrueRealSize(175);
			btnButton1.Width = this.GetPictrueRealSize(361);
			btnButton1.Y = this.GetPictrueRealSize(39);
			btnButton1.Gravity = Gravity.CenterHorizontal;

			//按键2
			var btnButton2 = this.InitDeviceButtonControl(frameBack, listDevice[1]);
			btnButton2.Height = Application.GetMinRealAverage(175);
			btnButton2.Width = Application.GetMinRealAverage(361);
			btnButton2.Height = this.GetPictrueRealSize(175);
			btnButton2.Width = this.GetPictrueRealSize(361);
			btnButton2.Y = btnButton1.Bottom;
			btnButton2.Gravity = Gravity.CenterHorizontal;
			}
			@@ -453,33 +449,33 @@
			{
			//按键1
			var btnButton1 = this.InitDeviceButtonControl(frameBack, listDevice[0]);
			btnButton1.TextSize = 12;
			btnButton1.Height = Application.GetMinRealAverage(175);
			btnButton1.Width = Application.GetMinRealAverage(183);
			btnButton1.X = Application.GetMinRealAverage(34);
			btnButton1.Y = Application.GetMinRealAverage(30);
			btnButton1.TextSize = 10;
			btnButton1.Height = this.GetPictrueRealSize(175);
			btnButton1.Width = this.GetPictrueRealSize(183);
			btnButton1.X = this.GetPictrueRealSize(34);
			btnButton1.Y = this.GetPictrueRealSize(30);

			//按键2
			var btnButton2 = this.InitDeviceButtonControl(frameBack, listDevice[1]);
			btnButton2.TextSize = 12;
			btnButton2.Height = Application.GetMinRealAverage(175);
			btnButton2.Width = Application.GetMinRealAverage(183);
			btnButton2.TextSize = 10;
			btnButton2.Height = this.GetPictrueRealSize(175);
			btnButton2.Width = this.GetPictrueRealSize(183);
			btnButton2.X = btnButton1.Right;
			btnButton2.Y = btnButton1.Y;

			//按键3
			var btnButton3 = this.InitDeviceButtonControl(frameBack, listDevice[2]);
			btnButton3.TextSize = 12;
			btnButton3.Height = Application.GetMinRealAverage(175);
			btnButton3.Width = Application.GetMinRealAverage(183);
			btnButton3.TextSize = 10;
			btnButton3.Height = this.GetPictrueRealSize(175);
			btnButton3.Width = this.GetPictrueRealSize(183);
			btnButton3.X = btnButton1.X;
			btnButton3.Y = btnButton1.Bottom + Application.GetMinRealAverage(4);
			btnButton3.Y = btnButton1.Bottom + this.GetPictrueRealSize(4);

			//按键4
			var btnButton4 = this.InitDeviceButtonControl(frameBack, listDevice[3]);
			btnButton4.TextSize = 12;
			btnButton4.Height = Application.GetMinRealAverage(175);
			btnButton4.Width = Application.GetMinRealAverage(183);
			btnButton4.TextSize = 10;
			btnButton4.Height = this.GetPictrueRealSize(175);
			btnButton4.Width = this.GetPictrueRealSize(183);
			btnButton4.X = btnButton2.X;
			btnButton4.Y = btnButton3.Y;
			}
			@@ -497,10 +493,10 @@
			{
			//按键1～按键2
			var frame1 = new FrameLayout();
			frame1.X = Application.GetMinRealAverage(34);
			frame1.Y = Application.GetMinRealAverage(30);
			frame1.Height = Application.GetMinRealAverage(183);
			frame1.Width = Application.GetMinRealAverage(183);
			frame1.X = this.GetPictrueRealSize(34);
			frame1.Y = this.GetPictrueRealSize(30);
			frame1.Height = this.GetPictrueRealSize(183);
			frame1.Width = this.GetPictrueRealSize(183);
			frameBack.AddChidren(frame1);
			this.InitEightButtonPanelIcon(frame1, listDevice[0], listDevice[1]);

			@@ -516,7 +512,7 @@
			//按键5～按键6
			var frame3 = new FrameLayout();
			frame3.X = frame1.X;
			frame3.Y = frame1.Bottom + Application.GetMinRealAverage(4);
			frame3.Y = frame1.Bottom + this.GetPictrueRealSize(4);
			frame3.Height = frame1.Height;
			frame3.Width = frame1.Width;
			frameBack.AddChidren(frame3);
			@@ -525,7 +521,7 @@
			//按键7～按键8
			var frame4 = new FrameLayout();
			frame4.X = frame1.Right;
			frame4.Y = frame1.Bottom + Application.GetMinRealAverage(4);
			frame4.Y = frame1.Bottom + this.GetPictrueRealSize(4);
			frame4.Height = frame1.Height;
			frame4.Width = frame1.Width;
			frameBack.AddChidren(frame4);
			@@ -541,29 +537,29 @@
			private void InitEightButtonPanelIcon(FrameLayout frameBack, CommonDevice device1, CommonDevice device2)
			{
			//按键1
			var frameButton1 = new FrameLayoutControl();
			var frameButton1 = new FrameLayoutStatuControl();
			frameButton1.UseClickStatu = false;
			frameButton1.Height = Application.GetMinRealAverage(92);
			frameButton1.Width = Application.GetMinRealAverage(183);
			frameButton1.Height = this.GetPictrueRealSize(92);
			frameButton1.Width = this.GetPictrueRealSize(183);
			frameBack.AddChidren(frameButton1);
			var btnButton1 = this.InitDeviceButtonControl(frameButton1, device1);
			btnButton1.TextSize = 10;
			btnButton1.Height = Application.GetMinRealAverage(35);
			btnButton1.Width = Application.GetMinRealAverage(183);
			btnButton1.Y = Application.GetMinRealAverage(37);
			btnButton1.TextSize = 8;
			btnButton1.Height = this.GetPictrueRealSize(35);
			btnButton1.Width = this.GetPictrueRealSize(183);
			btnButton1.Y = this.GetPictrueRealSize(37);

			//按键2
			var frameButton2 = new FrameLayoutControl();
			var frameButton2 = new FrameLayoutStatuControl();
			frameButton2.UseClickStatu = false;
			frameButton2.Height = frameButton1.Height;
			frameButton2.Width = frameButton1.Width;
			frameButton2.Y = frameButton1.Bottom;
			frameBack.AddChidren(frameButton2);
			var btnButton2 = this.InitDeviceButtonControl(frameButton2, device2);
			btnButton2.TextSize = 10;
			btnButton2.TextSize = 8;
			btnButton2.Height = btnButton1.Height;
			btnButton2.Width = btnButton1.Width;
			btnButton2.Y = Application.GetMinRealAverage(20);
			btnButton2.Y = this.GetPictrueRealSize(20);
			}

			#endregion
			@@ -594,7 +590,7 @@
			nowContr.TextColor = 0xfffb744a;

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

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