~wjc/HomeApp.git

			@@ -15,7 +15,7 @@
			/// <summary>
			/// 列表控件
			/// </summary>
			private VerticalListControl listview = null;
			private FrameListControl listview = null;
			/// <summary>
			/// 当前选择的设备
			/// </summary>
			@@ -36,6 +36,18 @@
			/// 设备需要保存的设备名字
			/// </summary>
			private Dictionary<int, string> dicDeviceSaveName = new Dictionary<int, string>();
			/// <summary>
			/// 简约面板的震动数据
			/// </summary>
			private HdlDevicePanelLogic.PanelVibrationInfo vibrationInfo = null;
			/// <summary>
			/// 是否已经读取了震动数据
			/// </summary>
			private bool hadReadVibrationInfo = false;
			/// <summary>
			/// 信息编辑控件
			/// </summary>
			private InformationEditorControl tableContr = null;

			#endregion

			@@ -67,22 +79,22 @@
			//清空bodyFrame
			this.ClearBodyFrame();

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

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

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

			//初始化桌布完成
			tableContr.FinishInitControl(bodyFrameLayout, this.listview);
			tableContr = null;
			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 +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 = await Common.LocalDevice.Current.ReName(device, newName);
			var result = HdlDeviceCommonLogic.Current.ReName(device, newName);
			if (result == false)
			{
			//关闭
			@@ -114,6 +126,11 @@
			//关闭自身
			this.CloseForm();
			};
			//如果当前是展示模板,则不能编辑
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			btnFinish.CanClick = false;
			}
			}

			/// <summary>
			@@ -123,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];
			@@ -132,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 += async () =>
			//如果当前是展示模板,则不能编辑
			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 = await 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);
			@@ -166,13 +188,18 @@
			rowBeloneArea.SelectRoomEvent += (roomKeys) =>
			{
			//变更房间
			Common.Room.CurrentRoom.ChangedRoom(nowSelectDevice, roomKeys);
			HdlRoomLogic.Current.ChangedRoom(nowSelectDevice, roomKeys);
			};

			//添加绑定目标行
			this.AddBindRow();
			//添加背光灯行
			this.AddBackLightRow();
			//添加震动反馈行
			this.AddVibrationFeedbackRow();

			//初始化桌布完成
			tableContr.FinishInitControl();
			}

			#endregion
			@@ -185,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;
			}
			@@ -208,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;
			@@ -221,7 +249,7 @@
			frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
			{
			//发送定位功能
			Common.LocalDevice.Current.SetFixedPositionCommand(nowSelectDevice);
			HdlDeviceCommonLogic.Current.SetFixedPositionCommand(nowSelectDevice);
			});
			}

			@@ -272,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);
			@@ -293,15 +321,107 @@

			#endregion

			#region ■ 震动反馈___________________________

			/// <summary>
			/// 添加震动反馈行
			/// </summary>
			private void AddVibrationFeedbackRow()
			{
			var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(nowSelectDevice.DeviceAddr, false);
			var myType = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listDevice);
			//只有简约面板才会有这个菜单
			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);
			rowContr.UseClickStatu = false;
			listview.AddChidren(rowContr);
			rowContr.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uVibrationFeedback), 600);
			//底线
			rowContr.AddBottomLine();
			//右箭头
			var btnSwitch = rowContr.AddMostRightSwitchIcon();
			if (vibrationInfo != null)
			{
			btnSwitch.IsSelected = vibrationInfo.A震动使能;
			}

			btnSwitch.ButtonClickEvent += (sender, e) =>
			{
			if (vibrationInfo == null)
			{
			//获取数据失败时,给他玩,但是没效果
			btnSwitch.IsSelected = !btnSwitch.IsSelected;
			return;
			}
			//点击一次之后,不能再次点击
			btnSwitch.CanClick = false;
			bool statu = !btnSwitch.IsSelected;

			HdlThreadLogic.Current.RunThread(() =>
			{
			vibrationInfo.A震动使能 = statu;
			//设置简约面板震动功能的信息
			var result = HdlDevicePanelLogic.Current.SetPanelVibrationData(nowSelectDevice, vibrationInfo);
			if (result == true)
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			btnSwitch.IsSelected = statu;
			});
			}
			else
			{
			//失败时,数据还原
			vibrationInfo.A震动使能 = !vibrationInfo.A震动使能;
			}
			//允许下一次点击
			btnSwitch.CanClick = true;
			});
			};
			//如果当前是展示模板,则不能编辑
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			btnSwitch.CanClick = false;
			}
			if (hadReadVibrationInfo == true)
			{
			//不再读取
			return;
			}
			this.hadReadVibrationInfo = true;

			HdlThreadLogic.Current.RunThread(() =>
			{
			//获取简约面板震动功能的信息(null表示出错)
			vibrationInfo = HdlDevicePanelLogic.Current.GetPanelVibrationData(nowSelectDevice);
			if (vibrationInfo != null)
			{
			HdlThreadLogic.Current.RunMain(() =>
			{
			btnSwitch.IsSelected = vibrationInfo.A震动使能;
			});
			}
			});
			}
			}

			#endregion

			#region ■ 初始化设备回路图标_________________

			/// <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)
			{
			@@ -334,12 +454,12 @@
			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);
			btnPic.UnSelectedImagePath = "Device/PanelTable.png";
			btnPic.UnSelectedImagePath = "DeviceItem/PanelTable.png";
			frameBorder.AddChidren(btnPic);

			if (listOffSwitch.Count == 4)
			@@ -366,18 +486,18 @@
			/// <param name="device">设备对象</param>
			/// <param name="isFirst">是否是第一个</param>
			/// <returns></returns>
			private void InitDeviceIcon(FrameLayoutControl frame, CommonDevice device)
			private void InitDeviceIcon(FrameLayoutStatuControl frame, CommonDevice device)
			{
			//不使用点击特效
			frame.UseClickStatu = false;

			var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);
			var btnIcon = new NormalViewControl(this.GetPictrueRealSize(52), this.GetPictrueRealSize(52), false);
			btnIcon.Name = "btn" + device.DeviceEpoint;
			btnIcon.Gravity = Gravity.Center;
			btnIcon.RadiusEx = 16;
			btnIcon.BorderWidth = 2;
			btnIcon.BorderColor = 0xff979797;
			frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
			frame.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
			//点击事件
			frame.ButtonClickEvent += (sender, e) =>
			{
			@@ -404,20 +524,20 @@
			private void InitTwoButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)
			{
			//按键1
			var frame1 = new FrameLayoutControl();
			frame1.Height = Application.GetMinRealAverage(110);
			frame1.Width = Application.GetMinRealAverage(110);
			frame1.Y = Application.GetMinRealAverage(63);
			var frame1 = new FrameLayoutStatuControl();
			frame1.Height = this.GetPictrueRealSize(110);
			frame1.Width = this.GetPictrueRealSize(110);
			frame1.Y = this.GetPictrueRealSize(63);
			frame1.Gravity = Gravity.CenterHorizontal;
			frameBack.AddChidren(frame1);
			//初始化设备图标
			this.InitDeviceIcon(frame1, listDevice[0]);

			//按键2
			var frame2 = new FrameLayoutControl();
			frame2.Height = Application.GetMinRealAverage(110);
			frame2.Width = Application.GetMinRealAverage(110);
			frame2.Y = Application.GetMinRealAverage(245);
			var frame2 = new FrameLayoutStatuControl();
			frame2.Height = this.GetPictrueRealSize(110);
			frame2.Width = this.GetPictrueRealSize(110);
			frame2.Y = this.GetPictrueRealSize(245);
			frame2.Gravity = Gravity.CenterHorizontal;
			frameBack.AddChidren(frame2);
			//初始化设备图标
			@@ -436,31 +556,31 @@
			private void InitThreeButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)
			{
			//按键1
			var frame1 = new FrameLayoutControl();
			frame1.Height = Application.GetMinRealAverage(110);
			frame1.Width = Application.GetMinRealAverage(110);
			frame1.Y = Application.GetMinRealAverage(63);
			var frame1 = new FrameLayoutStatuControl();
			frame1.Height = this.GetPictrueRealSize(110);
			frame1.Width = this.GetPictrueRealSize(110);
			frame1.Y = this.GetPictrueRealSize(63);
			frame1.Gravity = Gravity.CenterHorizontal;
			frameBack.AddChidren(frame1);
			//初始化设备图标
			this.InitDeviceIcon(frame1, listDevice[0]);

			//按键2
			var frame2 = new FrameLayoutControl();
			frame2.Height = Application.GetMinRealAverage(110);
			frame2.Width = Application.GetMinRealAverage(110);
			frame2.X = Application.GetMinRealAverage(63);
			frame2.Y = Application.GetMinRealAverage(245);
			var frame2 = new FrameLayoutStatuControl();
			frame2.Height = this.GetPictrueRealSize(110);
			frame2.Width = this.GetPictrueRealSize(110);
			frame2.X = this.GetPictrueRealSize(63);
			frame2.Y = this.GetPictrueRealSize(245);
			frameBack.AddChidren(frame2);
			//初始化设备图标
			this.InitDeviceIcon(frame2, listDevice[1]);

			//按键3
			var frame3 = new FrameLayoutControl();
			frame3.Height = Application.GetMinRealAverage(110);
			frame3.Width = Application.GetMinRealAverage(110);
			frame3.X = Application.GetMinRealAverage(245);
			frame3.Y = Application.GetMinRealAverage(245);
			var frame3 = new FrameLayoutStatuControl();
			frame3.Height = this.GetPictrueRealSize(110);
			frame3.Width = this.GetPictrueRealSize(110);
			frame3.X = this.GetPictrueRealSize(245);
			frame3.Y = this.GetPictrueRealSize(245);
			frameBack.AddChidren(frame3);
			//初始化设备图标
			this.InitDeviceIcon(frame3, listDevice[2]);
			@@ -478,41 +598,41 @@
			private void InitFourButtonPanelIcon(FrameLayout frameBack, List<CommonDevice> listDevice)
			{
			//按键1
			var frame1 = new FrameLayoutControl();
			frame1.Height = Application.GetMinRealAverage(110);
			frame1.Width = Application.GetMinRealAverage(110);
			frame1.X = Application.GetMinRealAverage(63);
			frame1.Y = Application.GetMinRealAverage(63);
			var frame1 = new FrameLayoutStatuControl();
			frame1.Height = this.GetPictrueRealSize(110);
			frame1.Width = this.GetPictrueRealSize(110);
			frame1.X = this.GetPictrueRealSize(63);
			frame1.Y = this.GetPictrueRealSize(63);
			frameBack.AddChidren(frame1);
			//初始化设备图标
			this.InitDeviceIcon(frame1, listDevice[0]);

			//按键2
			var frame2 = new FrameLayoutControl();
			frame2.Height = Application.GetMinRealAverage(110);
			frame2.Width = Application.GetMinRealAverage(110);
			frame2.X = Application.GetMinRealAverage(245);
			frame2.Y = Application.GetMinRealAverage(63);
			var frame2 = new FrameLayoutStatuControl();
			frame2.Height = this.GetPictrueRealSize(110);
			frame2.Width = this.GetPictrueRealSize(110);
			frame2.X = this.GetPictrueRealSize(245);
			frame2.Y = this.GetPictrueRealSize(63);
			frameBack.AddChidren(frame2);
			//初始化设备图标
			this.InitDeviceIcon(frame2, listDevice[1]);

			//按键3
			var frame3 = new FrameLayoutControl();
			frame3.Height = Application.GetMinRealAverage(110);
			frame3.Width = Application.GetMinRealAverage(110);
			frame3.X = Application.GetMinRealAverage(63);
			frame3.Y = Application.GetMinRealAverage(245);
			var frame3 = new FrameLayoutStatuControl();
			frame3.Height = this.GetPictrueRealSize(110);
			frame3.Width = this.GetPictrueRealSize(110);
			frame3.X = this.GetPictrueRealSize(63);
			frame3.Y = this.GetPictrueRealSize(245);
			frameBack.AddChidren(frame3);
			//初始化设备图标
			this.InitDeviceIcon(frame3, listDevice[2]);

			//按键4
			var frame4 = new FrameLayoutControl();
			frame4.Height = Application.GetMinRealAverage(110);
			frame4.Width = Application.GetMinRealAverage(110);
			frame4.X = Application.GetMinRealAverage(245);
			frame4.Y = Application.GetMinRealAverage(245);
			var frame4 = new FrameLayoutStatuControl();
			frame4.Height = this.GetPictrueRealSize(110);
			frame4.Width = this.GetPictrueRealSize(110);
			frame4.X = this.GetPictrueRealSize(245);
			frame4.Y = this.GetPictrueRealSize(245);
			frameBack.AddChidren(frame4);
			//初始化设备图标
			this.InitDeviceIcon(frame4, listDevice[3]);
			@@ -546,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();