~wjc/HomeApp.git

			@@ -33,13 +33,13 @@
			/// </summary>
			private CommonDevice deviceObj = null;
			/// <summary>
			/// 设备的类型
			/// </summary>
			private DeviceEnumInfo deviceEnum = null;
			/// <summary>
			/// 设备需要保存的设备名字
			/// </summary>
			private Dictionary<int, string> dicDeviceSaveName = new Dictionary<int, string>();
			/// <summary>
			/// 设备需要保存的设备功能
			/// </summary>
			private Dictionary<int, DeviceFunctionType> dicDeviceFuncType = new Dictionary<int, DeviceFunctionType>();
			/// <summary>
			/// 信息编辑控件
			/// </summary>
			@@ -53,9 +53,11 @@
			/// 画面显示(底层会固定调用此方法，借以完成画面创建)
			/// </summary>
			/// <param name="i_device">设备的某一回路</param>
			public void ShowForm(CommonDevice i_device)
			/// <param name="i_deviceEnum">设备的类型</param>
			public void ShowForm(CommonDevice i_device, DeviceEnumInfo i_deviceEnum)
			{
			this.deviceObj = i_device;
			this.deviceEnum = i_deviceEnum;

			//设置头部信息
			base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp));
			@@ -90,12 +92,10 @@
			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);
			@@ -109,48 +109,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";
			}
			else
			{
			device.IconPath = "Device/RelayEpoint.png";
			}
			device.ReSave();
			}
			this.CloseProgressBar();
			//关闭自身
			this.CloseForm();
			};
			@@ -175,7 +140,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)
			@@ -186,7 +151,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;
			@@ -281,95 +246,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 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未定义;
			}
			};
			};
			}
			rowFunction.AddBottomLine();
			}
			}

			@@ -387,9 +271,8 @@
			var listSort = new List<CommonDevice>();
			foreach (var device in listDevice)
			{
			//如果是继电器和调光器的话
			if (device.Type == DeviceType.OnOffOutput \|\| device.Type == DeviceType.DimmableLight
			\|\| device.Type == DeviceType.ColorDimmableLight)
			//如果是继电器
			if (device.Type == DeviceType.OnOffOutput)
			{
			listSort.Add(device);
			if (device.DeviceEpoint == deviceObj.DeviceEpoint)
			@@ -425,21 +308,21 @@

			frameBorder.AddChidren(btnPic);

			if (listSort.Count == 8)
			if (deviceEnum.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueEight)
			{
			//八按键面板
			//四开八控面板
			btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueEightButtonTable.png";
			this.InitEightButtonPanelIcon(frameBorder, listSort);
			}
			else if (listSort.Count == 4)
			else if (deviceEnum.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFour)
			{
			//四按键面板
			//双开四控面板
			btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueFourButtonTable.png";
			this.InitFourButtonPanelIcon(frameBorder, listSort);
			}
			else
			{
			//二按键面板
			//单开双控面板
			btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueTwoButtonTable.png";
			this.InitTwoButtonPanelIcon(frameBorder, listSort);
			}
			@@ -454,12 +337,13 @@
			private NormalViewControl InitDeviceButtonControl(FrameLayout frame, CommonDevice device)
			{
			var btnIcon = new NormalViewControl(this.GetPictrueRealSize(52), this.GetPictrueRealSize(52), false);
			btnIcon.Text = "Button" + device.DeviceEpoint;
			btnIcon.Text = "CHANNEL" + device.DeviceEpoint;
			btnIcon.TextAlignment = TextAlignment.Center;
			btnIcon.TextColor = UserCenterColor.Current.TextGrayColor1;
			btnIcon.IsBold = true;
			if (frame is FrameLayoutStatuControl)
			{
			((FrameLayoutStatuControl)frame).AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
			((FrameLayoutStatuControl)frame).AddChidren(btnIcon, ChidrenBindMode.BindEvent);
			((FrameLayoutStatuControl)frame).ButtonClickEvent += (sender, e) =>
			{
			//按键点击
			@@ -490,7 +374,7 @@
			#region ■ 初始化二按键图标___________________

			/// <summary>
			/// 初始化二按键面板的图标
			/// 初始化单开双控面板的图标
			/// </summary>
			/// <param name="frameBack">容器</param>
			/// <param name="listDevice">设备列表</param>
			@@ -516,7 +400,7 @@
			#region ■ 初始化四按键图标___________________

			/// <summary>
			/// 初始化四按键面板的图标
			/// 初始化双开四控键面板的图标
			/// </summary>
			/// <param name="frameBack">容器</param>
			/// <param name="listDevice">设备列表</param>
			@@ -524,7 +408,7 @@
			{
			//按键1
			var btnButton1 = this.InitDeviceButtonControl(frameBack, listDevice[0]);
			btnButton1.TextSize = 12;
			btnButton1.TextSize = 8;
			btnButton1.Height = this.GetPictrueRealSize(175);
			btnButton1.Width = this.GetPictrueRealSize(183);
			btnButton1.X = this.GetPictrueRealSize(34);
			@@ -532,7 +416,7 @@

			//按键2
			var btnButton2 = this.InitDeviceButtonControl(frameBack, listDevice[1]);
			btnButton2.TextSize = 12;
			btnButton2.TextSize = 8;
			btnButton2.Height = this.GetPictrueRealSize(175);
			btnButton2.Width = this.GetPictrueRealSize(183);
			btnButton2.X = btnButton1.Right;
			@@ -540,7 +424,7 @@

			//按键3
			var btnButton3 = this.InitDeviceButtonControl(frameBack, listDevice[2]);
			btnButton3.TextSize = 12;
			btnButton3.TextSize = 8;
			btnButton3.Height = this.GetPictrueRealSize(175);
			btnButton3.Width = this.GetPictrueRealSize(183);
			btnButton3.X = btnButton1.X;
			@@ -548,7 +432,7 @@

			//按键4
			var btnButton4 = this.InitDeviceButtonControl(frameBack, listDevice[3]);
			btnButton4.TextSize = 12;
			btnButton4.TextSize = 8;
			btnButton4.Height = this.GetPictrueRealSize(175);
			btnButton4.Width = this.GetPictrueRealSize(183);
			btnButton4.X = btnButton2.X;
			@@ -560,7 +444,7 @@
			#region ■ 初始化八按键图标___________________

			/// <summary>
			/// 初始化八按键面板的图标
			/// 初始化四开八控面板的图标
			/// </summary>
			/// <param name="frameBack">容器</param>
			/// <param name="listDevice">设备列表</param>
			@@ -583,24 +467,6 @@
			frame2.Width = frame1.Width;
			frameBack.AddChidren(frame2);
			this.InitEightButtonPanelIcon(frame2, listDevice[2], listDevice[3]);

			//按键5～按键6
			var frame3 = new FrameLayout();
			frame3.X = frame1.X;
			frame3.Y = frame1.Bottom + this.GetPictrueRealSize(4);
			frame3.Height = frame1.Height;
			frame3.Width = frame1.Width;
			frameBack.AddChidren(frame3);
			this.InitEightButtonPanelIcon(frame3, listDevice[4], listDevice[5]);

			//按键7～按键8
			var frame4 = new FrameLayout();
			frame4.X = frame1.Right;
			frame4.Y = frame1.Bottom + this.GetPictrueRealSize(4);
			frame4.Height = frame1.Height;
			frame4.Width = frame1.Width;
			frameBack.AddChidren(frame4);
			this.InitEightButtonPanelIcon(frame4, listDevice[6], listDevice[7]);
			}

			/// <summary>
			@@ -618,7 +484,7 @@
			frameButton1.Width = this.GetPictrueRealSize(183);
			frameBack.AddChidren(frameButton1);
			var btnButton1 = this.InitDeviceButtonControl(frameButton1, device1);
			btnButton1.TextSize = 10;
			btnButton1.TextSize = 8;
			btnButton1.Height = this.GetPictrueRealSize(35);
			btnButton1.Width = this.GetPictrueRealSize(183);
			btnButton1.Y = this.GetPictrueRealSize(37);
			@@ -631,7 +497,7 @@
			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 = this.GetPictrueRealSize(20);
			@@ -665,7 +531,7 @@
			nowContr.TextColor = 0xfffb744a;

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

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