~wjc/HomeApp.git

			@@ -20,7 +20,7 @@
			/// <summary>
			/// 列表控件
			/// </summary>
			private VerticalListControl listview = null;
			private FrameListControl listview = null;
			/// <summary>
			/// 设备的设备类型
			/// </summary>
			@@ -61,7 +61,7 @@
			this.deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listNewDevice);

			//设置标题信息
			base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uDeviceInfo));
			base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uDeviceSettion));

			//初始化右上角菜单
			this.InitTopRightMenu();
			@@ -81,15 +81,19 @@
			//清空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.uInfoEditor), 369, 1368);
			this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1368);

			//图片
			var btnPic = new DeviceInfoIconControl();
			btnPic.Y = Application.GetRealHeight(92);
			btnPic.Gravity = Gravity.CenterHorizontal;
			bodyFrameLayout.AddChidren(btnPic);
			listBackControl.frameTable.AddChidren(btnPic);
			btnPic.InitControl(listNewDevice[0]);

			//设备备注
			@@ -124,16 +128,18 @@
			//划线
			btnType.AddBottomLine();

			//所属区域
			//安装位置
			var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
			listview.AddChidren(rowBeloneArea);
			rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uBelongArea), this.listNewDevice);
			rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uInstallationLocation), this.listNewDevice);
			//底线
			rowBeloneArea.AddBottomLine();

			var listCheck = new List<string>();
			rowBeloneArea.SelectRoomEvent += (roomKeys) =>
			{
			//选择未分配时,清空
			if (roomKeys == string.Empty) { listCheck = new List<string>(); }
			foreach (var device in this.listNewDevice)
			{
			if (device is OTADevice)
			@@ -141,18 +147,24 @@
			//针对单纯只有一个200端点的设备
			continue;
			}
			var room = Room.CurrentRoom.GetRoomByDevice(device);
			if (roomKeys == string.Empty)
			{
			//如果选择的是未分配，则它的全部回路无条件全部清空房间
			HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
			continue;
			}
			var room = HdlRoomLogic.Current.GetRoomByDevice(device);
			string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
			if (room == null)
			{
			//这里有点特殊,如果回路没有设置有区域的时候,才设置
			listCheck.Add(mainKeys);
			Room.CurrentRoom.ChangedRoom(device, roomKeys);
			HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
			}
			else if (listCheck.Contains(mainKeys) == true)
			{
			//如果这个回路之前都还没有区域,在本界面还没有关闭之前,可以无条件随便变更
			Room.CurrentRoom.ChangedRoom(device, roomKeys);
			HdlRoomLogic.Current.ChangedRoom(device, roomKeys);
			}
			}
			//保存设备房间索引
			@@ -163,7 +175,7 @@
			this.AddAllMenuRow();

			//初始化桌布完成
			tableContr.FinishInitControl(bodyFrameLayout, this.listview);
			tableContr.FinishInitControl();
			tableContr = null;

			//保存
			@@ -227,10 +239,19 @@
			this.AddDirectionAndLimitRow();
			//添加【手拉控制】行(开合帘专用)
			this.AddHandPullControlRow();
			//添加【按键设置】行(面板专用)
			this.AddPanelSettionRow();
			//添加【功能设置】行
			this.AddFunctionSettionRow();
			//添加【按键设置】行(方悦专用) --这个有可能和面板重叠
			if (this.AddFangyuePanelSettionRow() == false)
			{
			//添加【按键设置】行(面板专用)
			this.AddPanelSettionRow();
			}

			if (this.IsFangyueFreshaAirPanel() == false)
			{
			//添加【功能设置】行
			this.AddFunctionSettionRow();
			}

			//添加【干接点设置】行
			this.AddDryContactSettionRow();
			}
			@@ -286,7 +307,7 @@
			};
			actionNone = () =>
			{
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock, action);
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock);
			};
			HdlCheckLogic.Current.CheckSecondarySecurity(action, actionNone);
			}
			@@ -307,7 +328,7 @@
			};
			actionNone = () =>
			{
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock, action);
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonLayout.SecurityRequest(doorLock);
			};
			HdlCheckLogic.Current.CheckSecondarySecurity(action, actionNone);

			@@ -452,7 +473,7 @@
			#region ■ 按键设置(面板)_____________________

			/// <summary>
			/// 添加【按键设置】行
			/// 添加【按键设置】行(面板)
			/// </summary>
			private void AddPanelSettionRow()
			{
			@@ -472,26 +493,77 @@
			btnFunction.AddBottomLine();
			btnFunction.ButtonClickEvent += (sender, e) =>
			{
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
			{
			//方悦面板的按键配置
			var form = new DevicePanel.PanelFangyueButtonSettionForm();
			form.AddForm(listNewDevice[0]);
			}
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)
			{
			//方悦环境面板的按键配置
			var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();
			form.AddForm(listNewDevice[0]);
			}
			else
			{
			var form = new DevicePanel.PanelButtonSettionForm();
			form.AddForm(listNewDevice[0]);
			}
			var form = new DevicePanel.PanelButtonSettionForm();
			form.AddForm(listNewDevice[0]);
			};
			}

			#endregion

			#region ■ 按键设置(方悦)_____________________

			/// <summary>
			/// 添加【按键设置】行(方悦)
			/// </summary>
			private bool AddFangyuePanelSettionRow()
			{
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
			{
			//按键设置
			string caption = Language.StringByID(R.MyInternationalizationString.uPanelSettion);
			var btnFunction = new FrameRowControl(listview.rowSpace / 2);
			listview.AddChidren(btnFunction);
			btnFunction.AddLeftCaption(caption, 600);
			//向右图标
			btnFunction.AddRightArrow();
			//底线
			btnFunction.AddBottomLine();
			btnFunction.ButtonClickEvent += (sender, e) =>
			{
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEight)
			{
			//方悦按键面板[单开双控/双开四控/四开八控]配置
			var form = new DevicePanel.PanelFangyueButtonSettionForm();
			form.AddForm(listNewDevice[0]);
			}
			else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)
			{
			//方悦环境面板的按键配置
			var form = new DevicePanel.PanelFangyueEnvironmentButtonSettionForm();
			form.AddForm(listNewDevice[0]);
			}
			else
			{
			//方悦新风面板的按键配置
			var form = new DevicePanel.PanelFangyueFreshAirButtonSettionForm();
			form.AddForm(listNewDevice[0]);
			}
			};
			return true;
			}
			return false;
			}

			#endregion

			#region ■ 按键设置(方悦)_____________________

			/// <summary>
			/// 是否是方悦新风面板
			/// </summary>
			private bool IsFangyueFreshaAirPanel()
			{
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
			{
			return true;
			}
			return false;
			}

			#endregion
			@@ -604,9 +676,25 @@
			{
			return;
			}
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment)
			if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueEnvironment
			\|\| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
			{
			//环境面板没有功能设置
			return;
			}

			//2020.03.06新追加：如果全部都是干接点的话,也不能有这个东西
			int dryContactCount = 0;
			for (int i = 0; i < listNewDevice.Count; i++)
			{
			if (listNewDevice[i].Type == DeviceType.OnOffSwitch)
			{
			dryContactCount++;
			}
			}
			if (listNewDevice.Count == dryContactCount)
			{
			//这个设备全是干接点
			return;
			}

			@@ -720,10 +808,11 @@
			btnSwitch.ButtonClickEvent += async (sender, e) =>
			{
			//切换模式
			var result = await HdlDeviceCurtainLogic.Current.SetHandPullControl(deviceCurtain, !btnSwitch.IsSelected);
			bool statu = !btnSwitch.IsSelected;
			var result = await HdlDeviceCurtainLogic.Current.SetHandPullControl(deviceCurtain, statu);
			if (result == true)
			{
			btnSwitch.IsSelected = !btnSwitch.IsSelected;
			btnSwitch.IsSelected = statu;
			}
			};

			@@ -1099,18 +1188,8 @@
			{
			//检测此回路是否拥有定位功能(拿端点最小的那个回路去定位)
			bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(listNewDevice[0]);
			if (this.deviceEnumInfo.BeloneType == DeviceBeloneType.A智能门锁)
			{
			canTest = false;
			}
			else if (this.deviceEnumInfo.BeloneType == DeviceBeloneType.A传感器
			&& this.deviceEnumInfo.ConcreteType != DeviceConcreteType.Sensor_Pir)
			{
			//传感器除了Pir都没有定位功能
			canTest = false;
			}

			var frame = new TopRightMenuControl(canTest == true ? 2 : 1, 1);

			string deviceMenu = string.Empty;
			if (canTest == true)
			{