~wjc/HomeApp.git

			@@ -20,25 +20,9 @@
			/// </summary>
			public string RoomKey = string.Empty;
			/// <summary>
			/// 当前选择的楼层主键(没必要公开出去)
			/// 显示文本
			/// </summary>
			private string FloorKey = string.Empty;
			/// <summary>
			/// 楼层列表名字
			/// </summary>
			private List<string> listFloorName = new List<string>();
			/// <summary>
			/// 楼层列表主键
			/// </summary>
			private List<string> listFloorKeys = new List<string>();
			/// <summary>
			/// 房间名字
			/// </summary>
			private List<List<string>> listRoomName = new List<List<string>>();
			/// <summary>
			/// 房间主键
			/// </summary>
			private List<List<string>> listRoomKeys = new List<List<string>>();
			private NormalViewControl btnTextView = null;

			#endregion

			@@ -47,11 +31,31 @@
			/// <summary>
			/// 所属区域的控件
			/// </summary>
			/// <param name="i_ChidrenYaxis">子控件Y轴偏移量(真实值,有些界面需要这种特殊操作)</param>
			/// <param name="i_ChidrenYaxis">子控件Y轴偏移量(【列表控件的rowSpace/2】即可,不懂默认为0即可)</param>
			public BelongAreaControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
			{
			//初始化数据
			this.InitData();
			}

			/// <summary>
			/// 初始化控件(针对的是场景)
			/// </summary>
			/// <param name="i_caption">标题文本</param>
			/// <param name="i_roomId">房间ID</param>
			public void InitControl(string i_caption, string i_roomId)
			{
			var room = HdlRoomLogic.Current.GetRoomById(i_roomId);
			this.DoInitControl(i_caption, room);
			}

			/// <summary>
			/// 初始化控件(针对的是网关)
			/// </summary>
			/// <param name="i_caption">标题文本</param>
			/// <param name="i_gateway">网关对象</param>
			public void InitControl(string i_caption, ZigBee.Device.ZbGateway i_gateway)
			{
			var room = HdlGatewayLogic.Current.GetRoomByGateway(i_gateway);
			this.DoInitControl(i_caption, room);
			}

			/// <summary>
			@@ -61,8 +65,8 @@
			/// <param name="i_device">设备对象</param>
			public void InitControl(string i_caption, ZigBee.Device.CommonDevice i_device)
			{
			var room = Common.Room.CurrentRoom.GetRoomByDevice(i_device);
			this.InitControl(i_caption, room);
			var room = HdlRoomLogic.Current.GetRoomByDevice(i_device);
			this.DoInitControl(i_caption, room);
			}

			/// <summary>
			@@ -72,8 +76,8 @@
			/// <param name="i_listDevice">设备对象</param>
			public void InitControl(string i_caption, List<ZigBee.Device.CommonDevice> i_listDevice)
			{
			var room = Common.Room.CurrentRoom.GetRoomById(i_listDevice[0].DeviceRoomId);
			this.InitControl(i_caption, room);
			var room = Common.LocalDevice.Current.GeteRealDeviceRoom(i_listDevice[0]);
			this.DoInitControl(i_caption, room);
			}

			/// <summary>
			@@ -81,7 +85,7 @@
			/// </summary>
			/// <param name="i_caption"></param>
			/// <param name="i_Room"></param>
			private void InitControl(string i_caption, Common.Room i_Room)
			private void DoInitControl(string i_caption, Common.Room i_Room)
			{
			if (i_Room == null)
			{
			@@ -92,7 +96,6 @@
			{
			string roomName = i_Room.Name;
			this.RoomKey = i_Room.Id;
			this.FloorKey = i_Room.FloorId;
			if (Common.Config.Instance.Home.FloorDics.ContainsKey(i_Room.FloorId) == true)
			{
			//楼层+房间
			@@ -115,20 +118,20 @@
			btnCaption.X = ControlCommonResourse.XXLeft;
			btnCaption.Gravity = Gravity.CenterVertical;
			btnCaption.Text = i_caption + "：";
			this.AddChidren(btnCaption, ChidrenBindMode.BindEventOnly);
			this.AddChidren(btnCaption, ChidrenBindMode.BindEvent);

			//显示框
			var txtView = new NormalViewControl(700, true);
			txtView.X = Application.GetRealWidth(294);
			txtView.Gravity = Gravity.CenterVertical;
			txtView.TextColor = UserCenterColor.Current.TextGrayColor1;
			txtView.Text = i_RoomName;
			this.AddChidren(txtView, ChidrenBindMode.BindEventOnly);
			this.btnTextView = new NormalViewControl(700, true);
			btnTextView.X = Application.GetRealWidth(294);
			btnTextView.Gravity = Gravity.CenterVertical;
			btnTextView.TextColor = UserCenterColor.Current.TextGrayColor1;
			btnTextView.Text = i_RoomName;
			this.AddChidren(btnTextView, ChidrenBindMode.BindEvent);

			if (chidrenYaxis != 0)
			{
			btnCaption.Y += chidrenYaxis;
			txtView.Y += chidrenYaxis;
			btnTextView.Y += chidrenYaxis;
			}

			if (IsSharedRoom == true)
			@@ -137,67 +140,18 @@
			this.UseClickStatu = false;
			return;
			}
			if (this.listFloorKeys.Count == 0 && listRoomKeys.Count == 0)
			{
			//或者根本就没有创建房间，则不允许更改
			this.UseClickStatu = false;
			return;
			}

			//右箭头
			this.AddRightArrow();

			this.ButtonClickEvent += (sender, e) =>
			//如果当前是展示模板,则需要处理
			if (Common.Config.Instance.Home.IsShowTemplate == false)
			{
			//区域选择
			this.ShowSelectRoom(txtView, i_caption);
			};
			}

			/// <summary>
			/// 初始化数据
			/// </summary>
			private void InitData()
			{
			var dicFloor = Common.Room.CurrentRoom.GetFloorSortList();
			if (dicFloor.Count == 0)
			{
			var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(string.Empty, false);
			if (listRoom.Count > 0)
			this.ButtonClickEvent += (sender, e) =>
			{
			//房间名字和主键收集
			var listName = new List<string>();
			var listKeys = new List<string>();
			foreach (var myRoom in listRoom)
			{
			listName.Add(myRoom.Name);
			listKeys.Add(myRoom.Id);
			}
			listRoomName.Add(listName);
			listRoomKeys.Add(listKeys);
			}
			}
			else
			{
			foreach (string fKeys in dicFloor.Keys)
			{
			var listRoom = Common.Room.CurrentRoom.GetFloorSortRoom(fKeys, false);
			if (listRoom.Count > 0)
			{
			//楼层名字和主键收集
			this.listFloorKeys.Add(fKeys);
			this.listFloorName.Add(dicFloor[fKeys]);
			//房间名字和主键收集
			var listName = new List<string>();
			var listKeys = new List<string>();
			foreach (var myRoom in listRoom)
			{
			listName.Add(myRoom.Name);
			listKeys.Add(myRoom.Id);
			}
			listRoomName.Add(listName);
			listRoomKeys.Add(listKeys);
			}
			}
			//区域选择
			this.ShowSelectRoom(btnTextView, i_caption);
			};
			}
			}

			@@ -212,44 +166,39 @@
			/// <param name="i_caption"></param>
			private void ShowSelectRoom(NormalViewControl txtView, string i_caption)
			{
			int index1 = this.listFloorKeys.IndexOf(FloorKey);
			if (index1 == -1) { index1 = 0; }
			int index2 = this.listRoomKeys[index1].IndexOf(RoomKey);
			if (index2 == -1) { index2 = 0; }

			if (this.listFloorKeys.Count == 0)
			//显示底部弹窗的房间列表
			var result = HdlControlLogic.Current.ShowBottomListRoomView(this.RoomKey, i_caption, (selectId, selectName) =>
			{
			//无楼层模式
			PickerView.Show(this.listRoomName[0], (value) =>
			{
			//楼层+房间
			txtView.Text = this.listRoomName[0][value];
			RoomKey = this.listRoomKeys[0][value];
			this.SelectRoomEvent?.Invoke(RoomKey);

			}, index2, i_caption,
			Language.StringByID(R.MyInternationalizationString.uFinish),
			Language.StringByID(R.MyInternationalizationString.uCancel));
			}
			else
			this.RoomKey = selectId;
			txtView.Text = selectName;
			//调用回调函数
			this.SelectRoomEvent?.Invoke(RoomKey);
			});
			if (result == false)
			{
			//有楼层模式
			PickerView.ShowSecondary(this.listFloorName, this.listRoomName, (value1, value2) =>
			{
			//楼层+房间
			txtView.Text = this.listFloorName[value1] + " " + this.listRoomName[value1][value2];
			FloorKey = this.listFloorKeys[value1];
			RoomKey = this.listRoomKeys[value1][value2];
			this.SelectRoomEvent?.Invoke(RoomKey);

			}, index1, index2, i_caption,
			Language.StringByID(R.MyInternationalizationString.uFinish),
			Language.StringByID(R.MyInternationalizationString.uCancel));
			//或者根本就没有创建房间，则不允许更改
			this.UseClickStatu = false;
			}
			}

			#endregion

			#region ■ 刷新控件___________________________

			/// <summary>
			/// 重新刷新控件
			/// </summary>
			/// <param name="i_RoomId">指定以哪个房间ID刷新控件</param>
			public void RefreshControl(string i_RoomId)
			{
			this.RoomKey = i_RoomId;

			var room = HdlRoomLogic.Current.GetRoomById(i_RoomId);
			this.btnTextView.Text = HdlRoomLogic.Current.GetRoomName(room);
			}

			#endregion

			#region ■ 控件摧毁___________________________

			/// <summary>