~wxr/HDL_APP_Project.git

			@@ -14,10 +14,15 @@
			/// <summary>
			/// 默认选中是房间时：全部区域
			/// </summary>
			private Entity.Room selectedRoom = new Entity.Room { sid = Language.StringByID(StringId.allAreas) };

			public void Show()
			private Entity.Room selectedRoom = new Entity.Room { roomId ="6688" };
			/// <summary>
			/// 表示是(条件/目标)
			/// </summary>
			private string if_type;
			public void Show(string str)
			{

			if_type = str;
			this.BackgroundColor = CSS.CSS_Color.viewMiddle;
			LogicView.TopView topView = new LogicView.TopView();
			this.AddChidren(topView.FLayoutView());
			@@ -58,7 +63,7 @@
			Y = Application.GetRealHeight(103),
			Width = Application.GetRealWidth(160),
			Height = Application.GetRealHeight(21 + 44),
			BackgroundImagePath = "LogicIcon/bjicon.png",
			//BackgroundImagePath = "LogicIcon/bjicon.png",
			};
			fLayout.AddChidren(bghFrameLyout);

			@@ -76,12 +81,13 @@
			Width = Application.GetRealWidth(144),
			Height = Application.GetRealHeight(44 * 5),
			};
			var roomList = LogicMethod.GetGatewayRoomList(Language.StringByID(StringId.allAreas));
			var roomList = LogicMethod.CurrLogicMethod.GetGatewayRoomList(Language.StringByID(StringId.allAreas));

			if (roomList.Count > 5)
			{
			bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * 5);
			bghFrameLyout.AddChidren(vvBgh);

			bghFrameLyout.BackgroundImagePath = "LogicIcon/bjicon5.png";
			}
			else
			{
			@@ -89,6 +95,7 @@
			bghFrameLyout.AddChidren(areaBgh);
			bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * roomList.Count);
			areaBgh.Height = Application.GetRealHeight(44 * roomList.Count);
			bghFrameLyout.BackgroundImagePath = $"LogicIcon/bjicon{roomList.Count}.png";
			}
			#endregion

			@@ -105,27 +112,39 @@
			areaView.frameLayout.Y = Application.GetRealHeight(i * 44);
			areaBgh.AddChidren(areaView.FLayoutView());
			}
			areaView.btnRoomName.Text = room.name;
			areaView.btnRoomName.Text = room.roomName;
			areaView.btnClick.Tag = room;
			areaView.btnClick.MouseUpEventHandler += (sender2, e2) =>
			{
			fLayout.RemoveFromParent();
			funAllAreaView.btnText1.Text = (areaView.btnClick.Tag as Entity.Room).name;
			funAllAreaView.btnText1.Text = (areaView.btnClick.Tag as Entity.Room).roomName;
			///切换房间默认功能类型全部;
			funAllAreaView.btnText2.Text = Language.StringByID(StringId.allFun);
			selectedRoom = (areaView.btnClick.Tag as Entity.Room);
			///获取显示设备列表
			var list = LogicMethod.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room,LogicMethod.condition_if);
			var list = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room,if_type);

			DeviceListView(vv, list);
			};

			if (roomList.Count-1==i) {
			///改变最后那条一个线的颜色,界面显示效果作用;
			areaView.btnLine.BackgroundColor = CSS.CSS_Color.view;
			}
			}
			};
			funAllAreaView.btnText1.MouseUpEventHandler += roomClick;
			funAllAreaView.btnIcon1.MouseUpEventHandler += roomClick;
			//功能点击事件
			EventHandler<MouseEventArgs> funClick = (sender3, e3) =>{

			//获取最终显示列表
			var functionList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(selectedRoom, if_type);
			//获取设备列表的类型（例如：灯光类，窗帘类。。。）
			var deviceTypeList = LogicMethod.CurrLogicMethod.GetDeviceTypeList(functionList);
			if (deviceTypeList.Count==0) {
			//没有类型直接返回去;
			return;
			}
			#region 区域弹框界面
			FrameLayout fLayout = new FrameLayout
			{
			@@ -139,11 +158,11 @@

			FrameLayout bghFrameLyout = new FrameLayout
			{
			X = Application.GetRealWidth(10),
			X = Application.GetRealWidth(118),
			Y = Application.GetRealHeight(103),
			Width = Application.GetRealWidth(160),
			Height = Application.GetRealHeight(21 + 44),
			BackgroundImagePath = "LogicIcon/bjicon.png",
			//BackgroundImagePath = "LogicIcon/bjicon5.png",
			};
			fLayout.AddChidren(bghFrameLyout);

			@@ -162,23 +181,21 @@
			Height = Application.GetRealHeight(44 * 5),
			};

			//获取最终显示列表
			var functionList = LogicMethod.GetFunctionDeviceList(selectedRoom, LogicMethod.condition_if);
			//获取设备列表的类型（例如：灯光类，窗帘类。。。）
			var deviceTypeList = LogicMethod.GetDeviceTypeList(functionList);



			if (deviceTypeList.Count > 5)
			{
			bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * 5);
			bghFrameLyout.AddChidren(vvBgh);

			bghFrameLyout.BackgroundImagePath = "LogicIcon/bjicon5.png";
			}
			else
			{
			bghFrameLyout.AddChidren(areaBgh);
			bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * deviceTypeList.Count);
			areaBgh.Height = Application.GetRealHeight(44 * deviceTypeList.Count);
			bghFrameLyout.BackgroundImagePath = $"LogicIcon/bjicon{deviceTypeList.Count}.png";
			}
			#endregion

			@@ -202,18 +219,22 @@
			fLayout.RemoveFromParent();
			funAllAreaView.btnText2.Text = areaView.btnClick.Tag.ToString();
			///获取单个类型（例如：灯光类。。）设备FunctionType列表
			var typeFunctionList = LogicMethod.GetDeviceTypeFunctionList(areaView.btnClick.Tag.ToString());
			///获取单个类型（例如：灯光类。。）显示设备列表
			var lists = LogicMethod.GetShowDeviceList(typeFunctionList, functionList);
			var typeFunctionList = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(areaView.btnClick.Tag.ToString());
			///获取单个灯光类型（例如：灯光1,灯光2。。）显示设备列表
			var lists = LogicMethod.CurrLogicMethod.GetShowDeviceList(typeFunctionList, functionList);
			DeviceListView(vv, lists);
			};

			if (deviceTypeList.Count - 1 == i)
			{
			///改变最后那条一个线的颜色,界面显示效果作用;
			areaView.btnLine.BackgroundColor = CSS.CSS_Color.view;
			}
			}
			};
			funAllAreaView.btnText2.MouseUpEventHandler += funClick;
			funAllAreaView.btnIcon2.MouseUpEventHandler += funClick;
			///获取显示设备列表
			var deviceList = LogicMethod.GetFunctionDeviceList(selectedRoom, LogicMethod.condition_if);
			var deviceList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(selectedRoom, if_type);
			DeviceListView(vv, deviceList);

			}
			@@ -234,14 +255,22 @@
			funView.btnLine.X = Application.GetRealWidth(16);
			funView.btnLine.Width = Application.GetRealWidth(343);
			verticalScrolView.AddChidren(funView.FLayoutView());
			funView.btnIcon.UnSelectedImagePath = LogicMethod.GetIconPath(dev.functionType);
			funView.btnIcon.UnSelectedImagePath = LogicMethod.CurrLogicMethod.GetIconPath(dev.spk);
			funView.btnDeviceName.Text = dev.name;
			funView.btnRoomName.Text = dev.GetRoomListName();
			funView.btnClick.MouseUpEventHandler += (sen,e) => {
			DeviceFunList deviceFunList = new DeviceFunList();
			MainPage.BasePageView.AddChidren(deviceFunList);
			deviceFunList.Show(dev,0,false);
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			if (if_type == LogicMethod.condition_if) {
			ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
			MainPage.BasePageView.AddChidren(conditionDeviceFunList);
			conditionDeviceFunList.Show(dev, 0, false);
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			} else {
			TargetDeviceFunList targetDeviceFunList = new TargetDeviceFunList();
			MainPage.BasePageView.AddChidren(targetDeviceFunList);
			targetDeviceFunList.Show(dev, 0, false);
			MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
			}

			};
			}
			}