~wjc/HomeApp.git

			@@ -15,7 +15,7 @@
			/// <summary>
			/// 列表控件
			/// </summary>
			private VerticalListControl listview = null;
			private FrameListControl listview = null;
			/// <summary>
			/// 当前选择的设备
			/// </summary>
			@@ -37,9 +37,9 @@
			/// </summary>
			private Dictionary<int, string> dicDeviceSaveName = new Dictionary<int, string>();
			/// <summary>
			/// 设备需要保存的设备功能
			/// 信息编辑控件
			/// </summary>
			private Dictionary<int, DeviceFunctionType> dicDeviceFuncType = new Dictionary<int, DeviceFunctionType>();
			private InformationEditorControl tableContr = null;

			#endregion

			@@ -71,81 +71,53 @@
			//清空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();
			//开启进度条
			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)
			{
			//关闭
			this.CloseProgressBar();
			return;
			}
			}
			}
			foreach (var epoint in dicDeviceFuncType.Keys)
			{
			var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint);
			if (device == null)
			{
			continue;
			}
			//设置功能类型
			device.DfunctionType = dicDeviceFuncType[epoint];
			if (device.IsCustomizeImage == true)
			{
			continue;
			}
			//重新设置图片
			if (device.DfunctionType == DeviceFunctionType.A开关)
			{
			device.IconPath = "Device/Switch.png";
			}
			else if (device.DfunctionType == DeviceFunctionType.A插座)
			{
			device.IconPath = "Device/Socket1.png";
			}
			else if (device.DfunctionType == DeviceFunctionType.A灯光)
			{
			device.IconPath = "Device/Light.png";
			}
			device.ReSave();
			}
			this.CloseProgressBar();
			//关闭自身
			this.CloseForm();
			};
			//如果当前是展示模板,则不能编辑
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			btnFinish.CanClick = false;
			}
			}

			/// <summary>
			@@ -157,37 +129,42 @@

			//回路备注
			string caption = Language.StringByID(R.MyInternationalizationString.uDeviceEpointNote);
			string nameValue = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
			string nameValue = HdlDeviceCommonLogic.Current.GetDeviceEpointName(nowSelectDevice);
			if (dicDeviceSaveName.ContainsKey(nowSelectDevice.DeviceEpoint) == true)
			{
			nameValue = dicDeviceSaveName[nowSelectDevice.DeviceEpoint];
			}

			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 () =>
			//如果当前是展示模板,则不能编辑
			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.uDeviceEpointReNoteSuccess);
			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.uDeviceEpointReNoteSuccess);
			this.ShowMassage(ShowMsgType.Tip, msg);
			}
			};
			}

			//所属区域
			var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
			@@ -198,11 +175,13 @@
			rowBeloneArea.SelectRoomEvent += (roomKeys) =>
			{
			//变更房间
			Common.Room.CurrentRoom.ChangedRoom(nowSelectDevice, roomKeys);
			HdlRoomLogic.Current.ChangedRoom(nowSelectDevice, roomKeys);
			};

			//添加功能类型行
			this.AddFunctionTypeRow();
			//初始化桌布完成
			tableContr.FinishInitControl();
			}

			#endregion
			@@ -214,6 +193,12 @@
			/// </summary>
			private void InitTopRightMenu()
			{
			//检测此回路是否拥有定位功能
			if (HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false
			\|\| Common.Config.Instance.Home.IsShowTemplate == true)
			{
			return;
			}
			var btnIcon = new MostRightIconControl(69, 69);
			btnIcon.UnSelectedImagePath = "Item/More.png";
			topFrameLayout.AddChidren(btnIcon);
			@@ -233,12 +218,12 @@
			int menuCount = 1;
			string deviceMenu = string.Empty;
			//检测此回路是否拥有定位功能
			bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);
			if (canTest == true)
			{
			menuCount = 2;
			}
			var frame = new TopRightMenuControl(menuCount);
			bool canTest = HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(nowSelectDevice);
			//if (canTest == true)
			//{
			// menuCount = 2;
			//}
			var frame = new TopRightMenuControl(menuCount, 1);
			if (canTest == true)
			{
			//定位
			@@ -246,15 +231,15 @@
			frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
			{
			//发送定位功能
			Common.LocalDevice.Current.SetFixedPositionCommand(nowSelectDevice);
			HdlDeviceCommonLogic.Current.SetFixedPositionCommand(nowSelectDevice);
			});
			}

			//删除
			deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
			frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
			{
			});
			//deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
			//frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
			//{
			//});
			}

			#endregion
			@@ -266,82 +251,14 @@
			/// </summary>
			private void AddFunctionTypeRow()
			{
			//如果是继电器和调光器的话
			if (nowSelectDevice.Type == DeviceType.OnOffOutput \|\| nowSelectDevice.Type == DeviceType.DimmableLight
			\|\| nowSelectDevice.Type == DeviceType.ColorDimmableLight)
			//自定义功能类型控件
			var rowFunction = new DeviceFunctionTypeRowControl(nowSelectDevice, listview.rowSpace / 2);
			if (rowFunction.CanShowRow == true)
			{
			//功能类型
			string caption = Language.StringByID(R.MyInternationalizationString.uFunctionType);
			var DfunctionType = nowSelectDevice.DfunctionType;
			if (this.dicDeviceFuncType.ContainsKey(nowSelectDevice.DeviceEpoint) == true)
			{
			DfunctionType = this.dicDeviceFuncType[nowSelectDevice.DeviceEpoint];
			}

			//功能类型的翻译名字
			int nowSelectNo = 1;
			string strType = string.Empty;
			if (DfunctionType == DeviceFunctionType.A灯光)
			{
			strType = Language.StringByID(R.MyInternationalizationString.uLight);
			nowSelectNo = 1;
			}
			else if (DfunctionType == DeviceFunctionType.A开关)
			{
			strType = Language.StringByID(R.MyInternationalizationString.uSwitch);
			nowSelectNo = 0;
			}
			else if (DfunctionType == DeviceFunctionType.A插座)
			{
			strType = Language.StringByID(R.MyInternationalizationString.uSocket1);
			nowSelectNo = 2;
			}

			var btnFunction = new FrameCaptionViewControl(caption, strType, listview.rowSpace / 2);
			btnFunction.UseClickStatu = false;
			listview.AddChidren(btnFunction);
			btnFunction.InitControl();
			listview.AddChidren(rowFunction);
			rowFunction.InitControl();
			//底线
			btnFunction.AddBottomLine();

			//如果是继电器才能够更改这个功能类型
			if (nowSelectDevice.Type == DeviceType.OnOffOutput)
			{
			btnFunction.UseClickStatu = true;
			//右箭头
			btnFunction.AddRightArrow();
			btnFunction.ButtonClickEvent += (sender, e) =>
			{
			//显示列表
			var listText = new List<string>();
			listText.Add(Language.StringByID(R.MyInternationalizationString.uSwitch));//开关
			listText.Add(Language.StringByID(R.MyInternationalizationString.uLight));//灯光
			listText.Add(Language.StringByID(R.MyInternationalizationString.uSocket1));//插座
			//标题:选择功能类型
			var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);

			var form = new BottomDialogSelectForm();
			form.AddForm(title, listText, nowSelectNo);
			form.FinishSelectEvent += (selectNo) =>
			{
			btnFunction.Text = listText[selectNo];
			nowSelectNo = selectNo;
			//记录起当前选择的功能类型
			if (selectNo == 0)
			{
			dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A开关;
			}
			else if (selectNo == 1)
			{
			dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A灯光;
			}
			else
			{
			dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A插座;
			}
			};
			};
			}
			rowFunction.AddBottomLine();
			}
			}

			@@ -352,10 +269,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 listSort = new List<CommonDevice>();
			foreach (var device in listDevice)
			{
			@@ -389,12 +306,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 (listSort.Count == 4)
			@@ -420,18 +337,18 @@
			/// <param name="frame">扩大点击区域的容器</param>
			/// <param name="device">设备对象</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.Radius = (uint)Application.GetMinRealAverage(6);
			btnIcon.RadiusEx = 16;
			btnIcon.BorderWidth = 2;
			btnIcon.BorderColor = 0xff979797;
			frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
			frame.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
			//点击事件
			frame.ButtonClickEvent += (sender, e) =>
			{
			@@ -458,20 +375,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);
			//初始化设备图标
			@@ -490,31 +407,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]);
			@@ -532,41 +449,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]);
			@@ -604,7 +521,7 @@
			nowContr.TextColor = UserCenterColor.Current.TextColor1;

			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();