~wjc/HomeApp.git

			@@ -88,7 +88,8 @@
			Width = Application.GetRealWidth(400),
			Height = Application.GetRealHeight(69),
			Y = Application.GetRealHeight(92),
			TextID = MyInternationalizationString.customroom,
			//TextID = MyInternationalizationString.customroom,
			Text = Config.Instance.Home.GetCurrentFloorName,
			};
			topRowLayout.AddChidren(foolrname);
			var dropdown = new Button
			@@ -102,6 +103,7 @@
			UnSelectedImagePath = "ZigeeLogic/drop-down.png",
			};
			topRowLayout.AddChidren(dropdown);

			#endregion

			///没有房间直接返回去；
			@@ -154,11 +156,12 @@
			DeviceType.IASZone,
			DeviceType.OnOffSwitch,
			DeviceType.OnOffOutput,//楼梯灯
			DeviceType.DoorLock
			DeviceType.DoorLock,
			DeviceType.TemperatureSensor,
			};

			///楼层点击事件
			foolrname.MouseUpEventHandler += (sender, e) =>
			EventHandler<MouseEventArgs> foorlclick = (sender, e) =>
			{

			var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
			@@ -178,10 +181,9 @@
			Radius = (uint)Application.GetRealHeight(30),
			};
			flMain.AddChidren(foolrbj);
			///默认调试
			List<string> foolrlist = new List<string> { "一楼", "二楼", "三楼" };
			foreach (var foolr in foolrlist)
			foreach (var foolr in Config.Instance.Home.FloorDics)
			{

			var foolrRowLayout = new FrameLayout
			{
			Height = Application.GetRealHeight(150),
			@@ -192,32 +194,57 @@
			{
			Width = Application.GetRealWidth(250),
			Height = Application.GetRealHeight(160),
			Text = foolr,
			Text = foolr.Value,
			TextAlignment = TextAlignment.Center,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			//SelectedTextColor=0xfffc744b,
			Tag = foolr.Key,
			};
			foolrRowLayout.AddChidren(btnfoolrname);


			EventHandler<MouseEventArgs> foolrclick = (sender13, e13) =>
			EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
			{
			roomhorizontalScrol.RemoveAll();
			devicetypehorizontalScrol.RemoveAll();
			middle.RemoveAll();
			foolrname.Text = btnfoolrname.Text;
			flMain.RemoveFromParent();
			///备注：显示选中楼层的所有房间
			AllRoomView(Common.Room.Lists, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);

			var list = Send.GetRoomList(btnfoolrname.Tag.ToString());
			AllRoomView(list, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
			};
			foolrRowLayout.MouseUpEventHandler += foolrclick;
			btnfoolrname.MouseUpEventHandler += foolrclick;
			foolrRowLayout.MouseUpEventHandler += foolrnameclick;
			btnfoolrname.MouseUpEventHandler += foolrnameclick;


			}

			};
			foolrname.MouseUpEventHandler += foorlclick;
			dropdown.MouseUpEventHandler += foorlclick;
			///第一次进来
			AllRoomView(Common.Room.Lists, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
			var roomlists = new List<Common.Room>();
			roomlists.Clear();
			if (Config.Instance.Home.FloorDics.Count < 2)
			{
			foolrname.Visible = false;
			dropdown.Visible = false;
			if (Config.Instance.Home.FloorDics.Count == 0)
			{
			roomlists.AddRange(Common.Room.Lists);
			}
			else
			{
			roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
			}
			}
			else
			{
			roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);

			}

			AllRoomView(roomlists, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
			}
			/// <summary>
			/// 加载所有房间的视图方法
			@@ -272,6 +299,9 @@
			var list = new List<DeviceUI>();
			foreach (var device in room.DeviceUIList)
			{
			if (device.CommonDevice==null) {
			continue;
			}
			if (!deviceTypeList.Contains(device.CommonDevice.Type))
			{
			continue;
			@@ -298,6 +328,9 @@
			var list = new List<DeviceUI>();
			foreach (var device in room.DeviceUIList)
			{
			if (device.CommonDevice==null) {
			continue;
			}
			if (!deviceTypeList.Contains(device.CommonDevice.Type))
			{
			continue;
			@@ -334,7 +367,7 @@
			devicetypelist.Add(Language.StringByID(MyInternationalizationString.Curtains));
			}

			var iASZonejosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.IASZone);
			var iASZonejosn = devicelist.Find((device) => device.CommonDevice.Type == DeviceType.IASZone\|\| device.CommonDevice.Type == DeviceType.TemperatureSensor);
			if (iASZonejosn != null)
			{
			devicetypelist.Add(Language.StringByID(MyInternationalizationString.sensor));
			@@ -454,6 +487,7 @@
			else if (devicetype == Language.StringByID(MyInternationalizationString.sensor))
			{
			list.Add(DeviceType.IASZone);
			list.Add(DeviceType.TemperatureSensor);
			}
			else if (devicetype == Language.StringByID(MyInternationalizationString.doorLock))
			{
			@@ -555,6 +589,21 @@
			deviceIconBtn.SelectedImagePath = $"ZigeeLogic/selectedsensor{iASZonedevice.IasDeviceType}.png";


			}
			break;
			case DeviceType.TemperatureSensor:
			{
			var temperatureSensor = common.CommonDevice as TemperatureSensor;
			if (temperatureSensor.SensorDiv == 1)
			{
			deviceIconBtn.UnSelectedImagePath = $"ZigeeLogic/temperature.png";
			deviceIconBtn.SelectedImagePath = $"ZigeeLogic/selectedtemperature.png";
			}
			else
			{
			deviceIconBtn.UnSelectedImagePath = "ZigeeLogic/humidity.png";
			deviceIconBtn.SelectedImagePath = "ZigeeLogic/selectedhumidity.png";
			}
			}
			break;
			case DeviceType.OnOffSwitch:
			@@ -1365,6 +1414,33 @@
			}
			break;

			case DeviceType.TemperatureSensor:
			{

			var temperatureSensor = common as TemperatureSensor;
			if (temperatureSensor.SensorDiv == 1)
			{
			dictionary(deviceConditionsInfo, "Cluster_ID", "1026");
			dictionary(deviceConditionsInfo, "AttriButeId", "0");
			dictionary(deviceConditionsInfo, "Range", "0");
			dictionary(deviceConditionsInfo, "AttriButeData1", "0");
			dictionary(deviceConditionsInfo, "AttriButeData2", "0");



			}
			else
			{

			dictionary(deviceConditionsInfo, "Cluster_ID", "1029");
			dictionary(deviceConditionsInfo, "AttriButeId", "0");
			dictionary(deviceConditionsInfo, "Range", "0");//表示大于值
			dictionary(deviceConditionsInfo, "AttriButeData1", "0");//温度值
			dictionary(deviceConditionsInfo, "AttriButeData2", "0");
			}

			}
			break;
			}

			Btncomplete.MouseUpEventHandler += (sender2, e2) =>