~wjc/HomeApp.git

			@@ -21,7 +21,7 @@
			/// </summary>
			public Action<List<CommonDevice>> SelectDeviceEvent = null;
			/// <summary>
			/// 当前选择的主键(房间类型时：房间ID 设备类型时：R文件里面的ID)
			/// 当前选择的主键(房间类型时：房间ID 设备类型时：文本信息)
			/// </summary>
			public string nowSelectKeys
			{
			@@ -36,6 +36,7 @@
			{
			return rId.ToString();
			}
			index++;
			}
			return string.Empty;
			}
			@@ -54,7 +55,7 @@
			/// <summary>
			/// 设备对象
			/// </summary>
			private Dictionary<int, List<CommonDevice>> dicDevice = null;
			private Dictionary<string, List<CommonDevice>> dicDevice = null;
			/// <summary>
			/// 前回选择的控件
			/// </summary>
			@@ -81,8 +82,8 @@
			/// <summary>
			/// 设备组合的菜单控件
			/// </summary>
			/// <param name="i_dicDevice">设备列表,keys:R文件里面的数字编号</param>
			public RoomDeviceGroupMenuControl(Dictionary<int, List<CommonDevice>> i_dicDevice)
			/// <param name="i_dicDevice">设备列表,keys:文本</param>
			public RoomDeviceGroupMenuControl(Dictionary<string, List<CommonDevice>> i_dicDevice)
			{
			this.dicDevice = i_dicDevice;
			this.Height = Application.GetRealHeight(204);
			@@ -119,14 +120,14 @@

			//计算字符的真实宽度
			btnTempWidth.Text = listRoom[i].Name;
			this.DoInitControl(scrolContr, i, i, listRoom[i].Name, btnTempWidth.GetRealWidthByText());
			this.DoInitControl(scrolContr, i.ToString(), i, listRoom[i].Name, btnTempWidth.GetRealWidthByText());
			}
			}
			else
			{
			//初始化设备模式的控件
			int index = 0;
			foreach (int keys in dicDevice.Keys)
			foreach (string strKeys in dicDevice.Keys)
			{
			if (oldSelectIndex == -1)
			{
			@@ -134,8 +135,8 @@
			oldSelectIndex = index;
			}
			//计算字符的真实宽度
			btnTempWidth.Text = Language.StringByID(keys);
			this.DoInitControl(scrolContr, keys, index, btnTempWidth.Text, btnTempWidth.GetRealWidthByText());
			btnTempWidth.Text = strKeys;
			this.DoInitControl(scrolContr, strKeys, index, btnTempWidth.Text, btnTempWidth.GetRealWidthByText());
			index++;
			}
			}
			@@ -147,11 +148,11 @@
			/// 初始化控件
			/// </summary>
			/// <param name="scrolContr">列表控件</param>
			/// <param name="keys">字典的主键</param>
			/// <param name="strKey">字典的主键</param>
			/// <param name="index">索引</param>
			/// <param name="text">显示文本</param>
			/// <param name="textWidth">文本真实宽度</param>
			private void DoInitControl(HorizontalScrolViewLayout scrolContr, int keys, int index, string text, int textWidth)
			private void DoInitControl(HorizontalScrolViewLayout scrolContr, string strKey, int index, string text, int textWidth)
			{
			//带底图控件的最小宽度
			int minWidth = Application.GetRealWidth(255);
			@@ -215,11 +216,11 @@
			//调用回调函数
			if (this.dicDevice != null)
			{
			this.SelectDeviceEvent?.Invoke(this.dicDevice[keys]);
			this.SelectDeviceEvent?.Invoke(this.dicDevice[strKey]);
			}
			else if (this.listRoom != null)
			{
			this.SelectRoomEvent?.Invoke(this.listRoom[keys]);
			this.SelectRoomEvent?.Invoke(this.listRoom[Convert.ToInt32(strKey)]);
			}
			};

			@@ -228,111 +229,14 @@
			{
			if (this.dicDevice != null)
			{
			this.SelectDeviceEvent?.Invoke(this.dicDevice[keys]);
			this.SelectDeviceEvent?.Invoke(this.dicDevice[strKey]);
			}
			else if (this.listRoom != null)
			{
			this.SelectRoomEvent?.Invoke(this.listRoom[keys]);
			this.SelectRoomEvent?.Invoke(this.listRoom[Convert.ToInt32(strKey)]);
			}
			}
			}

			/// <summary>
			/// 初始化控件
			/// </summary>
			/// <param name="scrolContr">列表控件</param>
			/// <param name="keys">字典的主键</param>
			/// <param name="index">索引</param>
			/// <param name="text">显示文本</param>
			/// <param name="textWidth">文本真实宽度</param>
			private void DoInitControl2(HorizontalScrolViewLayout scrolContr, int keys, int index, string text, int textWidth)
			{
			//带底图控件的最小宽度
			int minWidth = Application.GetRealWidth(255);
			//带底图控件的真实宽度 <文字的宽度的计算 frameBack.Width - (int)(frameBack.Height * 0.47)>
			int realWidth = textWidth + (int)(Application.GetRealHeight(159) * 0.47);
			if (realWidth < minWidth)
			{
			realWidth = minWidth;
			}

			//带图片的
			var frameBack = new FrameLayoutStatuControl();
			frameBack.UseClickStatu = false;
			frameBack.Gravity = Gravity.Center;
			frameBack.Height = Application.GetRealHeight(159);
			frameBack.Width = realWidth;
			frameBack.BorderWidth = 1;
			frameBack.BorderColor = UserCenterColor.Current.TextColor1;
			scrolContr.AddChidren(frameBack);
			if (oldSelectIndex == index)
			{
			frameBack.SetViewShadow(true);
			frameBack.BackgroundColor = UserCenterColor.Current.TextColor1;
			oldFrameBack = frameBack;
			}

			//文字
			var btnText = new NormalViewControl(textWidth, frameBack.Height, false);
			btnText.Gravity = Gravity.CenterHorizontal;
			btnText.Text = text;
			btnText.TextSize = 12;
			btnText.TextAlignment = TextAlignment.Center;
			if (oldSelectIndex == index)
			{
			btnText.TextColor = UserCenterColor.Current.White;
			oldBtnText = btnText;
			}
			else
			{
			btnText.TextColor = UserCenterColor.Current.TextGrayColor1;
			}
			frameBack.AddChidren(btnText, ChidrenBindMode.BindEvent);

			frameBack.ButtonClickEvent += (sender, e) =>
			{
			if (oldSelectIndex == index)
			{
			//同一个东西
			return;
			}
			oldSelectIndex = index;

			//状态变更
			frameBack.SetViewShadow(true);
			frameBack.BackgroundColor = UserCenterColor.Current.TextColor1;
			btnText.TextColor = UserCenterColor.Current.White;

			oldFrameBack.SetViewShadow(false);
			oldFrameBack.BackgroundColor = UserCenterColor.Current.Transparent;
			oldBtnText.TextColor = UserCenterColor.Current.TextGrayColor1;
			oldFrameBack = frameBack;
			oldBtnText = btnText;
			//调用回调函数
			if (this.dicDevice != null)
			{
			this.SelectDeviceEvent?.Invoke(this.dicDevice[keys]);
			}
			else if (this.listRoom != null)
			{
			this.SelectRoomEvent?.Invoke(this.listRoom[keys]);
			}
			};

			//调用回调函数
			if (oldSelectIndex == index)
			{
			if (this.dicDevice != null)
			{
			this.SelectDeviceEvent?.Invoke(this.dicDevice[keys]);
			}
			else if (this.listRoom != null)
			{
			this.SelectRoomEvent?.Invoke(this.listRoom[keys]);
			}
			}
			}


			#endregion

			@@ -356,27 +260,26 @@
			/// <summary>
			/// 设置初始选择(请在初始化完成之前调用)
			/// </summary>
			/// <param name="keys">房间ID 或者 R文件里面的数值编号(转为字符串类型)</param>
			public void SetDefultIndex(string keys)
			/// <param name="strKey">房间ID 或者文本信息</param>
			public void SetDefultIndex(string strKey)
			{
			if (listRoom != null)
			{
			for (int index = 0; index < listRoom.Count; index++)
			{
			if (listRoom[index].Id == keys)
			if (listRoom[index].Id == strKey)
			{
			oldSelectIndex = index;
			break;
			}
			}
			}
			else if (keys != string.Empty)
			else if (strKey != string.Empty)
			{
			int i = 0;
			int textId = Convert.ToInt32(keys);
			foreach (int rId in dicDevice.Keys)
			foreach (string rId in dicDevice.Keys)
			{
			if (rId == textId)
			if (rId == strKey)
			{
			oldSelectIndex = i;
			break;