~wjc/HomeApp.git

			@@ -15,7 +15,7 @@
			/// <summary>
			/// 列表控件
			/// </summary>
			private VerticalListControl listview = null;
			private FrameListControl listview = null;
			/// <summary>
			/// 当前选择的设备
			/// </summary>
			@@ -41,9 +41,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

			@@ -77,27 +77,33 @@
			//清空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, 1128);
			this.tableContr = new InformationEditorControl();

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

			//初始化桌布完成
			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);
			@@ -111,44 +117,13 @@
			if (oldName != newName)
			{
			//设备名称修改
			var result = await Common.LocalDevice.Current.ReName(device, newName);
			var result = Common.LocalDevice.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();
			};
			@@ -173,7 +148,7 @@
			listview.AddChidren(btnDeviceName);
			btnDeviceName.InitControl();
			btnDeviceName.AddBottomLine();
			btnDeviceName.txtInput.FinishInputEvent += async () =>
			btnDeviceName.txtInput.FinishInputEvent += () =>
			{
			string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
			if (btnDeviceName.Text.Trim() == string.Empty)
			@@ -184,7 +159,7 @@
			if (oldName != btnDeviceName.Text.Trim())
			{
			//设备名称修改
			var result = await Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
			var result = Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
			if (result == false)
			{
			return;
			@@ -204,11 +179,13 @@
			rowBeloneArea.SelectRoomEvent += (roomKeys) =>
			{
			//变更房间
			Common.Room.CurrentRoom.ChangedRoom(nowSelectDevice, roomKeys);
			HdlRoomLogic.Current.ChangedRoom(nowSelectDevice, roomKeys);
			};

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

			#endregion
			@@ -220,6 +197,11 @@
			/// </summary>
			private void InitTopRightMenu()
			{
			//检测此回路是否拥有定位功能
			if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
			{
			return;
			}
			var btnIcon = new MostRightIconControl(69, 69);
			btnIcon.UnSelectedImagePath = "Item/More.png";
			topFrameLayout.AddChidren(btnIcon);
			@@ -240,11 +222,11 @@
			string deviceMenu = string.Empty;
			//检测此回路是否拥有定位功能
			bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);
			if (canTest == true)
			{
			menuCount = 2;
			}
			var frame = new TopRightMenuControl(menuCount);
			//if (canTest == true)
			//{
			// menuCount = 2;
			//}
			var frame = new TopRightMenuControl(menuCount, 1);
			if (canTest == true)
			{
			//定位
			@@ -257,10 +239,10 @@
			}

			//删除
			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
			@@ -272,83 +254,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 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插座;
			}
			};
			};
			}
			return;
			}
			listview.AddChidren(rowFunction);
			rowFunction.InitControl();
			//底线
			rowFunction.AddBottomLine();
			}

			#endregion
			@@ -358,7 +273,7 @@
			/// <summary>
			/// 初始化设备回路图标
			/// </summary>
			private void InitDeviceEpointIcon()
			private void InitDeviceEpointIcon(VerticalFrameControl listBackControl)
			{
			//获取按组分配的设备
			var listIcon = this.GetAllDeviceGroup();
			@@ -366,11 +281,10 @@
			var frameBorder = new FrameLayout();
			frameBorder.Y = Application.GetRealHeight(147);
			frameBorder.Gravity = Gravity.CenterHorizontal;
			frameBorder.Width = Application.GetMinRealAverage(887);
			frameBorder.Height = Application.GetMinRealAverage(423);
			frameBorder.BorderWidth = 3;
			frameBorder.BorderColor = 0xffd0d0d0;
			bodyFrameLayout.AddChidren(frameBorder);
			frameBorder.Width = this.GetPictrueRealSize(887);
			frameBorder.Height = Application.GetRealHeight(423);
			frameBorder.Radius = (uint)Application.GetRealHeight(6);
			listBackControl.frameTable.AddChidren(frameBorder);

			var frameBack = new FrameLayout();
			frameBack.Height = frameBorder.Height;
			@@ -395,7 +309,7 @@
			{
			var frame = new FrameLayout();
			frame.Width = frameBorder.Width;
			frame.Height = Application.GetMinRealAverage(124);
			frame.Height = this.GetPictrueRealSize(124);
			frameBack.AddChidren(frame);
			//初始化一行设备图标
			this.InitDeviceIconFrame(frame, listIcon[i], ref index);
			@@ -403,19 +317,45 @@
			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
			{
			frame.Y = Application.GetMinRealAverage(58) + (frameBack.ChildrenCount - 1) * (frame.Height + Application.GetMinRealAverage(60));
			frame.Y = this.GetPictrueRealSize(58) + (frameBack.ChildrenCount - 1) * (frame.Height + this.GetPictrueRealSize(60));
			}
			}

			if (listIcon.Count > 2)
			{
			//计算真实高度
			int realHeight = Application.GetMinRealAverage(58 + 58);//上下间距
			realHeight += frameBack.ChildrenCount * Application.GetMinRealAverage(124);//圆圈高度
			realHeight += (frameBack.ChildrenCount-1) * Application.GetMinRealAverage(60);//圆圈间距
			int realHeight = this.GetPictrueRealSize(58 + 58);//上下间距
			realHeight += frameBack.ChildrenCount * this.GetPictrueRealSize(124);//圆圈高度
			realHeight += (frameBack.ChildrenCount - 1) * this.GetPictrueRealSize(60);//圆圈间距
			if (realHeight > frameBack.Height)
			{
			//变更高度
			@@ -435,7 +375,7 @@
			{
			NormalViewControl btnTemp = null;
			//间距
			int space = Application.GetMinRealAverage(84);
			int space = this.GetPictrueRealSize(84);
			int defultXX = (frame.Width - frame.Height * listDevice.Count - (listDevice.Count - 1) * space) / 2;
			for (int i = 0; i < listDevice.Count; i++)
			{
			@@ -444,7 +384,7 @@
			btnIcon.Name = "btn" + listDevice[i].DeviceEpoint;
			btnIcon.X = defultXX + i * (frame.Height + space);
			btnIcon.Radius = (uint)frame.Height / 2;
			btnIcon.BorderWidth = (uint)Application.GetMinRealAverage(6);
			btnIcon.BorderWidth = 2;
			btnIcon.BorderColor = 0xff979797;
			btnIcon.TextAlignment = TextAlignment.Center;
			btnIcon.TextColor = UserCenterColor.Current.TextGrayColor3;
			@@ -487,6 +427,18 @@
			//只要同一种类型的
			continue;
			}

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

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

			#endregion

			#region ■ 回路选择___________________________