~wjc/HomeApp.git

			@@ -27,7 +27,7 @@
			/// <summary>
			/// 设备备注的控件
			/// </summary>
			private FrameCaptionInputControl btnDeviceName = null;
			private FrameCaptionInputControl frameDeviceName = null;
			/// <summary>
			/// 设备的某一回路
			/// </summary>
			@@ -40,10 +40,6 @@
			/// 设备需要保存的设备名字
			/// </summary>
			private Dictionary<int, string> dicDeviceSaveName = new Dictionary<int, string>();
			/// <summary>
			/// 设备需要保存的设备功能
			/// </summary>
			private Dictionary<int, DeviceFunctionType> dicDeviceFuncType = new Dictionary<int, DeviceFunctionType>();
			/// <summary>
			/// 信息编辑控件
			/// </summary>
			@@ -87,7 +83,15 @@

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

			if (this.deviceObj.Type == DeviceType.FreshAir \|\| this.deviceObj.Type == DeviceType.PMSensor)
			{
			this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);
			}
			else
			{
			this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1128);
			}

			//初始化设备回路图标
			this.InitDeviceEpointIcon(listBackControl);
			@@ -96,70 +100,38 @@
			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();
			dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = frameDeviceName.Text.Trim();
			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";
			}
			else
			{
			device.IconPath = "Device/RelayEpoint.png";
			}
			device.ReSave();
			}
			this.CloseProgressBar();
			//关闭自身
			this.CloseForm();
			};
			//如果当前是展示模板,则不能编辑
			if (Common.Config.Instance.Home.IsShowTemplate == true)
			{
			btnFinish.CanClick = false;
			}
			}

			/// <summary>
			@@ -171,37 +143,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);
			listview.AddChidren(btnDeviceName);
			btnDeviceName.InitControl();
			btnDeviceName.AddBottomLine();
			btnDeviceName.txtInput.FinishInputEvent += async () =>
			this.frameDeviceName = new FrameCaptionInputControl(caption, nameValue, listview.rowSpace / 2);
			this.frameDeviceName.txtInput.MaxByte = 48;//限制只能输入48个字节
			listview.AddChidren(frameDeviceName);
			frameDeviceName.InitControl();
			frameDeviceName.AddBottomLine();
			//如果当前是展示模板,则需要处理
			if (Common.Config.Instance.Home.IsShowTemplate == false)
			{
			string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
			if (btnDeviceName.Text.Trim() == string.Empty)
			frameDeviceName.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 (frameDeviceName.Text.Trim() == string.Empty)
			{
			return;
			//将名字还原
			frameDeviceName.Text = oldName;
			}
			//回路备注修改成功!
			string msg = Language.StringByID(R.MyInternationalizationString.uDeviceEpointReNoteSuccess);
			this.ShowMassage(ShowMsgType.Tip, msg);
			}
			};
			if (oldName != frameDeviceName.Text.Trim())
			{
			//设备名称修改
			var result = HdlDeviceCommonLogic.Current.ReName(nowSelectDevice, frameDeviceName.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);
			@@ -231,7 +208,8 @@
			private void InitTopRightMenu()
			{
			//检测此回路是否拥有定位功能
			if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
			if (HdlDeviceCommonLogic.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false
			\|\| Common.Config.Instance.Home.IsShowTemplate == true)
			{
			return;
			}
			@@ -254,7 +232,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;
			@@ -267,7 +245,7 @@
			frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
			{
			//发送定位功能
			Common.LocalDevice.Current.SetFixedPositionCommand(nowSelectDevice);
			HdlDeviceCommonLogic.Current.SetFixedPositionCommand(nowSelectDevice);
			});
			}

			@@ -287,96 +265,16 @@
			/// </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 == false)
			{
			//功能类型
			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();
			//底线
			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 BottomItemSelectForm();
			form.CancelCallEvent = true;//允许取消
			form.AddForm(title, listText, nowSelectNo);
			form.FinishSelectEvent += (selectNo) =>
			{
			if (selectNo == -1)
			{
			//取消选择
			btnFunction.Text = string.Empty;
			}
			else
			{
			btnFunction.Text = listText[selectNo];
			}
			nowSelectNo = selectNo;
			//记录起当前选择的功能类型
			if (selectNo == 0)
			{
			dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A开关;
			}
			else if (selectNo == 1)
			{
			dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A灯光;
			}
			else if (selectNo == 2)
			{
			dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A插座;
			}
			else
			{
			dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A未定义;
			}
			};
			};
			}
			return;
			}
			listview.AddChidren(rowFunction);
			rowFunction.InitControl();
			//底线
			rowFunction.AddBottomLine();
			}

			#endregion
			@@ -430,6 +328,32 @@
			if (listIcon.Count == 1)
			{
			frame.Gravity = Gravity.CenterVertical;

			//如果是新风
			if (deviceObj.Type == DeviceType.FreshAir)
			{
			frame.RemoveFromParent();
			frameBorder.Y = Application.GetRealHeight(0);
			frameBorder.Height = Application.GetRealHeight(709);
			frameBack.BackgroundImagePath = "FreshAir/FreshAirRealDevicePic.png";
			frameBack.Width = this.GetPictrueRealSize(878);
			frameBack.Height = this.GetPictrueRealSize(354);
			frameBack.Y = Application.GetRealHeight(153);
			frameBack.Gravity = Gravity.Center;
			}

			//如果是PM2.5
			if (deviceObj.Type == DeviceType.PMSensor)
			{
			frame.RemoveFromParent();
			frameBorder.Y = Application.GetRealHeight(0);
			frameBorder.Height = Application.GetRealHeight(708);
			frameBack.BackgroundImagePath = "RealDevice/SensorPMTwoPointFive.png";
			frameBack.Width = this.GetPictrueRealSize(418);
			frameBack.Height = this.GetPictrueRealSize(403);
			frameBack.Y = Application.GetRealHeight(153);
			frameBack.Gravity = Gravity.Center;
			}
			}
			else
			{
			@@ -442,7 +366,7 @@
			//计算真实高度
			int realHeight = this.GetPictrueRealSize(58 + 58);//上下间距
			realHeight += frameBack.ChildrenCount * this.GetPictrueRealSize(124);//圆圈高度
			realHeight += (frameBack.ChildrenCount-1) * this.GetPictrueRealSize(60);//圆圈间距
			realHeight += (frameBack.ChildrenCount - 1) * this.GetPictrueRealSize(60);//圆圈间距
			if (realHeight > frameBack.Height)
			{
			//变更高度
			@@ -500,7 +424,7 @@
			private List<List<CommonDevice>> GetAllDeviceGroup()
			{
			bool hadDevice = false;
			var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);
			var listDevice = HdlDeviceCommonLogic.Current.GetDevicesByMac(deviceObj.DeviceAddr);
			var listRelay = new List<CommonDevice>();
			foreach (var device in listDevice)
			{
			@@ -514,6 +438,18 @@
			//只要同一种类型的
			continue;
			}

			//获取设备属于【简约多功能面板】
			var deviceEnumInfo = HdlDeviceCommonLogic.Current.GetMyDeviceEnumInfo(listDevice);
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
			{
			if (device.Type == DeviceType.TemperatureSensor && device.DeviceEpoint == 1)
			{
			//简约多功能面板第1回路是一个绑定温湿度传感器第类型，不是真的温湿度的传感器，需要屏蔽掉
			continue;
			}
			}

			listRelay.Add(device);
			if (device.DeviceEpoint == deviceObj.DeviceEpoint)
			{
			@@ -554,7 +490,6 @@
			}
			return listIcon;
			}

			#endregion

			#region ■ 回路选择___________________________
			@@ -579,7 +514,7 @@
			nowSelectControl.TextSize = 13;
			nowSelectControl.TextColor = UserCenterColor.Current.TextGrayColor3;
			//记录它的名字
			dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();
			dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = frameDeviceName.Text.Trim();
			}
			//选择状态
			nowContr.BorderColor = 0xfffb744a;
			@@ -587,7 +522,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();