~wjc/HomeApp.git

			@@ -29,13 +29,17 @@
			/// </summary>
			private FrameCaptionInputControl btnDeviceName = null;
			/// <summary>
			/// 设备Mac地址
			/// 设备的某一回路
			/// </summary>
			private string deviceMac = string.Empty;
			private CommonDevice deviceObj = null;
			/// <summary>
			/// 设备需要保存的设备名字
			/// </summary>
			private Dictionary<int, string> dicDeviceSaveName = new Dictionary<int, string>();
			/// <summary>
			/// 设备需要保存的设备功能
			/// </summary>
			private Dictionary<int, DeviceFunctionType> dicDeviceFuncType = new Dictionary<int, DeviceFunctionType>();

			#endregion

			@@ -44,10 +48,10 @@
			/// <summary>
			/// 画面显示(底层会固定调用此方法，借以完成画面创建)
			/// </summary>
			/// <param name="i_deviceMac">设备Mac地址</param>
			public void ShowForm(string i_deviceMac)
			/// <param name="i_device">设备的某一回路</param>
			public void ShowForm(CommonDevice i_device)
			{
			this.deviceMac = i_deviceMac;
			this.deviceObj = i_device;

			//设置头部信息
			base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uFunctionSettingUp));
			@@ -70,7 +74,7 @@
			//初始化桌布
			var tableContr = new InformationEditorControl();
			this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 708, 1028);


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

			@@ -90,7 +94,7 @@
			this.ShowProgressBar();
			foreach (var epoint in dicDeviceSaveName.Keys)
			{
			var device = Common.LocalDevice.Current.GetDevice(deviceMac, epoint);
			var device = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, epoint);
			if (device == null \|\| dicDeviceSaveName[epoint] == string.Empty)
			{
			//不能允许空白名字
			@@ -109,6 +113,34 @@
			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();
			//关闭自身
			@@ -171,18 +203,6 @@

			//添加功能类型行
			this.AddFunctionTypeRow();

			//借用Y轴坐标
			var btnTemp = new BottomClickButton();
			var realHeight = listview.GetChildren(0).Height * listview.ChildrenCount;
			if (bodyFrameLayout.Height - btnTemp.Yaxis + realHeight > listview.Height)
			{
			//促使被挡住的菜单能够向上滑动
			var frameTemp = new FrameLayout();
			frameTemp.Height = bodyFrameLayout.Height - btnTemp.Yaxis + Application.GetRealHeight(115);
			listview.AddChidren(frameTemp);
			}
			btnTemp = null;
			}

			#endregion
			@@ -218,7 +238,7 @@
			{
			menuCount = 2;
			}
			var frame = new TopRightMenuControl(this, menuCount);
			var frame = new TopRightMenuControl(menuCount);
			if (canTest == true)
			{
			//定位
			@@ -252,32 +272,31 @@
			{
			//功能类型
			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 (nowSelectDevice.DfunctionType == DeviceFunctionType.A灯光)
			if (DfunctionType == DeviceFunctionType.A灯光)
			{
			strType = Language.StringByID(R.MyInternationalizationString.uLight);
			nowSelectNo = 1;
			}
			else if (nowSelectDevice.DfunctionType == DeviceFunctionType.A开关)
			else if (DfunctionType == DeviceFunctionType.A开关)
			{
			strType = Language.StringByID(R.MyInternationalizationString.uSwitch);
			nowSelectNo = 0;
			}
			else if (nowSelectDevice.DfunctionType == DeviceFunctionType.A插座)
			else if (DfunctionType == DeviceFunctionType.A插座)
			{
			strType = Language.StringByID(R.MyInternationalizationString.uSocket1);
			nowSelectNo = 2;
			}
			else
			{
			//默认灯光
			strType = Language.StringByID(R.MyInternationalizationString.uLight);
			nowSelectDevice.DfunctionType = DeviceFunctionType.A灯光;
			nowSelectDevice.ReSave();
			}

			var btnFunction = new FrameCaptionViewControl(caption, strType, listview.rowSpace / 2);
			btnFunction.UseClickStatu = false;
			listview.AddChidren(btnFunction);
			@@ -301,25 +320,25 @@
			//标题:选择功能类型
			var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);

			var form = new BottomDialogSelectForm();
			var form = new BottomItemSelectForm();
			form.AddForm(title, listText, nowSelectNo);
			form.FinishSelectEvent += (selectNo) =>
			{
			btnFunction.Text = listText[selectNo];
			nowSelectNo = selectNo;
			//记录起当前选择的功能类型
			if (selectNo == 0)
			{
			nowSelectDevice.DfunctionType = DeviceFunctionType.A开关;
			dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A开关;
			}
			else if (selectNo == 1)
			{
			nowSelectDevice.DfunctionType = DeviceFunctionType.A灯光;
			dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A灯光;
			}
			else
			{
			nowSelectDevice.DfunctionType = DeviceFunctionType.A插座;
			dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A插座;
			}
			nowSelectDevice.ReSave();
			};
			};
			}
			@@ -335,7 +354,8 @@
			/// </summary>
			private void InitDeviceEpointIcon()
			{
			var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
			bool hadDevice = false;
			var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceObj.DeviceAddr);
			var listSort = new List<CommonDevice>();
			foreach (var device in listDevice)
			{
			@@ -344,6 +364,11 @@
			\|\| device.Type == DeviceType.ColorDimmableLight)
			{
			listSort.Add(device);
			if (device.DeviceEpoint == deviceObj.DeviceEpoint)
			{
			//能够匹配得到这个回路
			hadDevice = true;
			}
			}
			}
			//排序
			@@ -355,6 +380,11 @@
			}
			return -1;
			});
			if (hadDevice == false)
			{
			//如果匹配不到这个回路,则默认第一个
			this.deviceObj = listSort[0];
			}

			var frameBorder = new FrameLayout();
			frameBorder.Y = Application.GetRealHeight(150);
			@@ -389,9 +419,8 @@
			/// </summary>
			/// <param name="frame">扩大点击区域的容器</param>
			/// <param name="device">设备对象</param>
			/// <param name="isFirst">是否是第一个</param>
			/// <returns></returns>
			private void InitDeviceIcon(FrameLayoutControl frame, CommonDevice device, bool isFirst)
			private void InitDeviceIcon(FrameLayoutControl frame, CommonDevice device)
			{
			//不使用点击特效
			frame.UseClickStatu = false;
			@@ -399,7 +428,7 @@
			var btnIcon = new NormalViewControl(Application.GetMinRealAverage(52), Application.GetMinRealAverage(52), false);
			btnIcon.Name = "btn" + device.DeviceEpoint;
			btnIcon.Gravity = Gravity.Center;
			btnIcon.Radius = (uint)Application.GetMinRealAverage(6);
			btnIcon.Radius = 6;
			btnIcon.BorderWidth = 2;
			btnIcon.BorderColor = 0xff979797;
			frame.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
			@@ -410,7 +439,7 @@
			this.DeviceEpointSelectEvent(btnIcon, null);
			};

			if (isFirst == true)
			if (device.DeviceEpoint == deviceObj.DeviceEpoint)
			{
			//初始化菜单行
			this.DeviceEpointSelectEvent(btnIcon, null);
			@@ -436,7 +465,7 @@
			frame1.Gravity = Gravity.CenterHorizontal;
			frameBack.AddChidren(frame1);
			//初始化设备图标
			this.InitDeviceIcon(frame1, listDevice[0], true);
			this.InitDeviceIcon(frame1, listDevice[0]);

			//按键2
			var frame2 = new FrameLayoutControl();
			@@ -446,7 +475,7 @@
			frame2.Gravity = Gravity.CenterHorizontal;
			frameBack.AddChidren(frame2);
			//初始化设备图标
			this.InitDeviceIcon(frame2, listDevice[1], false);
			this.InitDeviceIcon(frame2, listDevice[1]);
			}

			#endregion
			@@ -468,7 +497,7 @@
			frame1.Gravity = Gravity.CenterHorizontal;
			frameBack.AddChidren(frame1);
			//初始化设备图标
			this.InitDeviceIcon(frame1, listDevice[0], true);
			this.InitDeviceIcon(frame1, listDevice[0]);

			//按键2
			var frame2 = new FrameLayoutControl();
			@@ -478,7 +507,7 @@
			frame2.Y = Application.GetMinRealAverage(245);
			frameBack.AddChidren(frame2);
			//初始化设备图标
			this.InitDeviceIcon(frame2, listDevice[1], false);
			this.InitDeviceIcon(frame2, listDevice[1]);

			//按键3
			var frame3 = new FrameLayoutControl();
			@@ -488,7 +517,7 @@
			frame3.Y = Application.GetMinRealAverage(245);
			frameBack.AddChidren(frame3);
			//初始化设备图标
			this.InitDeviceIcon(frame3, listDevice[2], false);
			this.InitDeviceIcon(frame3, listDevice[2]);
			}

			#endregion
			@@ -510,7 +539,7 @@
			frame1.Y = Application.GetMinRealAverage(63);
			frameBack.AddChidren(frame1);
			//初始化设备图标
			this.InitDeviceIcon(frame1, listDevice[0], true);
			this.InitDeviceIcon(frame1, listDevice[0]);

			//按键2
			var frame2 = new FrameLayoutControl();
			@@ -520,7 +549,7 @@
			frame2.Y = Application.GetMinRealAverage(63);
			frameBack.AddChidren(frame2);
			//初始化设备图标
			this.InitDeviceIcon(frame2, listDevice[1], false);
			this.InitDeviceIcon(frame2, listDevice[1]);

			//按键3
			var frame3 = new FrameLayoutControl();
			@@ -530,7 +559,7 @@
			frame3.Y = Application.GetMinRealAverage(245);
			frameBack.AddChidren(frame3);
			//初始化设备图标
			this.InitDeviceIcon(frame3, listDevice[2], false);
			this.InitDeviceIcon(frame3, listDevice[2]);

			//按键4
			var frame4 = new FrameLayoutControl();
			@@ -540,7 +569,7 @@
			frame4.Y = Application.GetMinRealAverage(245);
			frameBack.AddChidren(frame4);
			//初始化设备图标
			this.InitDeviceIcon(frame4, listDevice[3], false);
			this.InitDeviceIcon(frame4, listDevice[3]);
			}

			#endregion
			@@ -575,7 +604,7 @@
			nowContr.TextColor = UserCenterColor.Current.TextColor1;

			nowSelectControl = nowContr;
			nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceMac, Convert.ToInt32(nowContr.Name.Replace("btn", string.Empty)));
			nowSelectDevice = Common.LocalDevice.Current.GetDevice(deviceObj.DeviceAddr, Convert.ToInt32(nowContr.Name.Replace("btn", string.Empty)));

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