~wjc/HomeApp.git

			@@ -1,23 +1,23 @@
			using System;
			using System.Collections.Generic;
			using Microsoft.AppCenter.Crashes;
			using Shared.Common;
			using Shared.Phone.UserCenter.Device;
			using ZigBee.Device;
			using static ZigBee.Device.BindObj;
			using static ZigBee.Device.Panel;

			namespace Shared.Phone.UserCenter.DeviceBind
			{
			/// <summary>
			/// 普通面板的绑定场景界面【只可绑定1个场景】
			/// </summary>
			public class AddScenePage : BindCommonLayout
			{
			/// 构造函数
			/// </summary>
			/// <param name="doorLock"></param>
			public AddScenePage(ZigBee.Device.Panel key, List<ScenesListInfo> gwScenesList)
			public AddScenePage(ZigBee.Device.Panel key)
			{
			this.currentKey = key;
			gwCurScenesList = gwScenesList;
			}

			#region 变量申明
			@@ -36,7 +36,11 @@
			/// <summary>
			/// 按键配置的目标列表
			/// </summary>
			List<CommonDevice> targetList = new List<CommonDevice>();
			List<CommonDevice> targetListDevice = new List<CommonDevice>();
			/// <summary>
			/// 按键配置的场景目标列表
			/// </summary>
			List<SceneUI> targetListScene = new List<SceneUI>();
			/// <summary>
			/// 本地房间列表
			/// </summary>
			@@ -48,7 +52,7 @@
			/// <summary>
			/// 保存完成按钮
			/// </summary>
			Button btnFinifh;
			Button btnFinish;
			/// <summary>
			/// 楼层文本
			/// </summary>
			@@ -58,10 +62,7 @@
			/// </summary>
			Dictionary<string, string> dicFloor;
			List<SceneUI> currentKeyAllRoomSceneList = new List<SceneUI>();
			/// <summary>
			/// 网关中的场景列表
			/// </summary>
			public List<ScenesListInfo> gwCurScenesList = new List<ScenesListInfo>();

			#endregion

			/// <summary>
			@@ -165,7 +166,7 @@
			};
			this.midFrameLayout.AddChidren(bottomFrameLayout);

			btnFinifh = new Button()
			btnFinish = new Button()
			{
			Width = Application.GetRealWidth(907),
			Gravity = Gravity.CenterHorizontal,
			@@ -176,10 +177,10 @@
			IsBold = true,
			TextSize = 16,
			};
			bottomFrameLayout.AddChidren(btnFinifh);
			bottomFrameLayout.AddChidren(btnFinish);
			#endregion

			#region 数据处理
			#region 数据处理
			//获取楼层
			dicFloor = HdlRoomLogic.Current.GetFloorSortList();
			currentKey.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
			@@ -224,7 +225,7 @@
			var sc = currentKey.bindList.Find(obj => (obj != null) && (obj.BindScenesId == scTemp.Id));
			if (sc != null)
			{
			targetList.Add(scTemp);
			targetListScene.Add(scTemp);
			}
			}
			}
			@@ -236,217 +237,222 @@

			if (curRoom.ListSceneId.Count == 0)
			{
			btnFinifh.Enable = false;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			btnFinish.Enable = false;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			}
			else
			{
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			}
			if (targetList.Count == 0)
			if (targetListDevice.Count == 0 && targetListScene.Count == 0)
			{
			btnFinifh.Enable = false;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			btnFinish.Enable = false;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			}
			else
			{
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			}
			btnFinifh.MouseUpEventHandler += async (sender, e) =>
			btnFinish.MouseUpEventHandler += (sender, e) =>
			{
			bool isFinish = false;
			try
			System.Threading.Tasks.Task.Run(() =>
			{
			if (targetList.Count == 0)
			try
			{
			Application.RunOnMainThread(() =>
			{
			var myTip = new Tip();
			myTip.Direction = AMPopTipDirection.None;
			myTip.CloseTime = 2;
			myTip.Text = Language.StringByID(R.MyInternationalizationString.BindDeviceTargetIsEmpty);
			myTip.Show(Common.CommonPage.Instance);
			});
			return;
			}

			Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
			if (currentKey.bindList.Count != 0)
			{
			var bindResult = await currentKey.ClearBindInfoAsync();
			if (bindResult != null && bindResult.clearBindInfoResponseData != null)
			{
			if (bindResult.clearBindInfoResponseData.Result != 0)
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
			CommonPage.Loading.Hide();
			});
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			return;
			}
			else
			{
			currentKey.bindList.Clear();
			}
			}
			else
			if (targetListDevice.Count == 0 && targetListScene.Count == 0)
			{
			Application.RunOnMainThread(() =>
			{
			var myTip = new Tip();
			myTip.Direction = AMPopTipDirection.None;
			myTip.CloseTime = 2;
			myTip.Text = Language.StringByID(R.MyInternationalizationString.BindDeviceTargetIsEmpty);
			myTip.Show(Common.CommonPage.Instance);
			});
			return;
			}

			Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
			if (currentKey.bindList.Count != 0)
			{
			var bindResult = HdlDeviceBindLogic.Current.ClearBindInfoAsync(currentKey);
			if (bindResult != null && bindResult.clearBindInfoResponseData != null)
			{
			if (bindResult.clearBindInfoResponseData.Result != 0)
			{
			Application.RunOnMainThread(() =>
			{
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
			CommonPage.Loading.Hide();
			});
			return;
			}
			else
			{
			currentKey.bindList.Clear();
			}
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			CommonPage.Loading.Hide();
			var myTip = new Tip();
			myTip.Direction = AMPopTipDirection.None;
			myTip.CloseTime = 2;
			myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5006" + ")";
			myTip.Show(Common.CommonPage.Instance);
			});
			return;
			}
			}

			var temp = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.Scene_Trigger);
			if (temp == null \|\| temp.setWritableValueResponData == null)
			{
			Application.RunOnMainThread(() =>
			{
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			CommonPage.Loading.Hide();
			var myTip = new Tip();
			myTip.Direction = AMPopTipDirection.None;
			myTip.CloseTime = 2;
			myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
			myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "120_ 6533" + ")";
			myTip.Show(Common.CommonPage.Instance);
			});
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			return;
			}
			}

			var temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Scene_Trigger);
			if (temp == null \|\| temp.setWritableValueResponData == null)
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			var myTip = new Tip();
			myTip.Direction = AMPopTipDirection.None;
			myTip.CloseTime = 2;
			myTip.Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime);
			myTip.Show(Common.CommonPage.Instance);
			});
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			return;
			}
			if (temp.setWritableValueResponData.Status != 0)
			{
			Application.RunOnMainThread(() =>
			{
			var myTip = new Tip();
			myTip.Direction = AMPopTipDirection.None;
			myTip.CloseTime = 2;
			myTip.Text = Language.StringByID(R.MyInternationalizationString.ChangeBindMode);
			myTip.Show(Common.CommonPage.Instance);
			CommonPage.Loading.Hide();
			});
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			return;
			}
			else
			{
			currentKey.panelMode = 1;
			var addBindeDev = new AddBindData();
			addBindeDev.DeviceAddr = currentKey.DeviceAddr;
			addBindeDev.Epoint = currentKey.DeviceEpoint;
			foreach (var de in targetList)
			{
			if (de.DeviceAddr != null)
			{
			var addBindInfo = new AddBindListObj();
			addBindInfo.BindType = 0;
			addBindInfo.BindCluster = 6;
			addBindInfo.BindMacAddr = de.DeviceAddr;
			addBindInfo.BindEpoint = de.DeviceEpoint;
			addBindeDev.BindList.Add(addBindInfo);
			}
			else
			{
			var addBindInfo = new AddBindListObj();
			addBindInfo.BindType = 1;
			addBindInfo.BindCluster = 6;
			var sc1 = (SceneUI)de;
			addBindInfo.BindScenesId = sc1.Id;
			addBindeDev.BindList.Add(addBindInfo);
			}
			}

			var dev = new AddedDeviceBindResponseAllData();
			dev = await currentKey.AddDeviceBindAsync(addBindeDev);
			if (dev != null && dev.addedDeviceBindResponseData != null)
			{
			if (dev.addedDeviceBindResponseData.Result == 0)
			{
			currentKey.bindList = dev.addedDeviceBindResponseData.BindList;
			targetList.Clear();
			isFinish = true;
			if (isFinish)
			{
			if (action != null)
			{
			action(currentKey.bindList);
			}
			this.RemoveFromParent();
			}
			else
			{
			this.RemoveFromParent();
			}
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			});
			}
			else if (dev.addedDeviceBindResponseData.Result == 1)
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			new Tip()
			{
			MaxWidth = 150,
			Text = Language.StringByID(R.MyInternationalizationString.BindFailed),
			Direction = AMPopTipDirection.Up,
			CloseTime = 1
			}.Show(btnFinifh);
			});
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			return;
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			new Tip()
			{
			MaxWidth = 150,
			Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError),
			Direction = AMPopTipDirection.Up,
			CloseTime = 1
			}.Show(btnFinifh);
			});
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			return;
			}
			}
			else
			if (temp.setWritableValueResponData.Status != 0)
			{
			Application.RunOnMainThread(() =>
			{
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			var myTip = new Tip();
			myTip.Direction = AMPopTipDirection.None;
			myTip.CloseTime = 2;
			myTip.Text = Language.StringByID(R.MyInternationalizationString.ChangeBindMode);
			myTip.Show(Common.CommonPage.Instance);
			CommonPage.Loading.Hide();
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinifh);
			});
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			return;
			}
			else
			{
			currentKey.panelMode = 1;
			var addBindeDev = new AddBindData();
			addBindeDev.DeviceAddr = currentKey.DeviceAddr;
			addBindeDev.Epoint = currentKey.DeviceEpoint;
			foreach (var de in targetListDevice)
			{
			if (de.DeviceAddr != null)
			{
			var addBindInfo = new AddBindListObj();
			addBindInfo.BindType = 0;
			addBindInfo.BindCluster = 6;
			addBindInfo.BindMacAddr = de.DeviceAddr;
			addBindInfo.BindEpoint = de.DeviceEpoint;
			addBindeDev.BindList.Add(addBindInfo);
			}
			}
			foreach (var de in targetListScene)
			{
			var addBindInfo = new AddBindListObj();
			addBindInfo.BindType = 1;
			addBindInfo.BindCluster = 6;
			addBindInfo.BindScenesId = de.Id;
			addBindeDev.BindList.Add(addBindInfo);
			}

			var dev = new AddedDeviceBindResponseAllData();
			dev = HdlDeviceBindLogic.Current.AddDeviceBindAsync(addBindeDev);
			if (dev != null && dev.addedDeviceBindResponseData != null)
			{
			if (dev.addedDeviceBindResponseData.Result == 0)
			{
			currentKey.bindList = dev.addedDeviceBindResponseData.BindList;
			targetListDevice.Clear();
			targetListScene.Clear();
			isFinish = true;
			Application.RunOnMainThread(() =>
			{
			if (isFinish)
			{
			if (action != null)
			{
			action(currentKey.bindList);
			}
			this.RemoveFromParent();
			}
			else
			{
			this.RemoveFromParent();
			}
			CommonPage.Loading.Hide();
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			});
			}
			else if (dev.addedDeviceBindResponseData.Result == 1)
			{
			Application.RunOnMainThread(() =>
			{
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			CommonPage.Loading.Hide();
			new Tip()
			{
			MaxWidth = 150,
			Text = Language.StringByID(R.MyInternationalizationString.BindFailed),
			Direction = AMPopTipDirection.Up,
			CloseTime = 1
			}.Show(btnFinish);
			});
			return;
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			CommonPage.Loading.Hide();
			new Tip()
			{
			MaxWidth = 150,
			Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError),
			Direction = AMPopTipDirection.Up,
			CloseTime = 1
			}.Show(btnFinish);
			});

			return;
			}
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			CommonPage.Loading.Hide();
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5001" + ")", Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
			});

			return;
			}
			}
			}
			}
			catch { }
			catch { }
			});
			};
			#endregion
			}
			@@ -486,11 +492,11 @@
			{
			roomTempList.Add(room);
			}
			if (roomTempList.Count != 0)
			{
			curRoom = roomTempList[0];
			}

			}
			for (int i = 0; i < roomTempList.Count; i++)
			{
			var room = roomTempList[i];
			curRoom = roomTempList[0];
			var btnRoomFrameLayout = new FrameLayout
			{
			Height = Application.GetMinReal(159),
			@@ -505,7 +511,7 @@
			var btnRoom = new Button
			{
			Height = Application.GetRealHeight(58),
			Width = Application.GetRealWidth(127),
			Width = Application.GetRealWidth(255),
			Y = Application.GetRealHeight(58),
			X = Application.GetRealWidth(14),
			Text = room.Name,
			@@ -523,6 +529,20 @@
			curentOldRoom = btnRoom;
			curentOldRoomFrameLayout = btnRoomFrameLayout;
			}

			if (index == roomTempList.Count - 1 && index > 2)
			{
			var btnRoomFrameLayoutEmpty = new FrameLayout
			{
			Height = Application.GetMinReal(159),
			Width = Application.GetMinReal(50),
			Y = Application.GetRealHeight(23),
			X = Application.GetRealWidth(5),
			BorderWidth = 1,
			};
			btnHorizontalScrolViewLayout.AddChidren(btnRoomFrameLayoutEmpty);
			}

			EventHandler<MouseEventArgs> eHandlerRoom = (sender, e) =>
			{
			if (!btnRoom.IsSelected)
			@@ -547,26 +567,25 @@
			curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
			}
			curRoom = room;
			currentKey.RoomId = room.Id;
			if (curRoom.ListSceneId.Count == 0)
			{
			btnFinifh.Enable = false;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			btnFinish.Enable = false;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			}
			else
			{
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			}
			if (targetList.Count == 0)
			if (targetListDevice.Count == 0 && targetListScene.Count == 0)
			{
			btnFinifh.Enable = false;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			btnFinish.Enable = false;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			}
			else
			{
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			}
			RefreshSceneList(curRoom);

			@@ -575,7 +594,7 @@
			btnRoomFrameLayout.MouseUpEventHandler += eHandlerRoom;
			index++;
			}
			BindInfo.FinishDisplay(roomTempList, btnFinifh);
			BindInfo.FinishDisplay(roomTempList, btnFinish);
			RefreshSceneList(curRoom);
			}

			@@ -595,8 +614,8 @@
			var currentSceneUIList = GetMatchSceneUIList(curRoom);
			if (currentSceneUIList.Count == 0)
			{
			btnFinifh.Enable = false;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			btnFinish.Enable = false;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			return;
			}
			foreach (var scene in currentSceneUIList)
			@@ -665,7 +684,7 @@
			{
			btnBindName.Text = scene.Name;
			}
			if (targetList.Count == 0)
			if (targetListDevice.Count == 0 && targetListScene.Count == 0)
			{
			foreach (var bindedSc in currentKey.bindList)
			{
			@@ -674,16 +693,15 @@
			btnChoose.IsSelected = true;
			btnChoose.Visible = true;
			oldScene = btnChoose;
			targetList.Add(scene);
			targetListScene.Add(scene);
			}
			}
			}
			else
			{
			foreach (var bindedSc in targetList)
			foreach (var bindedSc in targetListScene)
			{
			var sc1 = (SceneUI)bindedSc;
			if (scene.Id == sc1.Id)
			if (scene.Id == bindedSc.Id)
			{
			btnChoose.IsSelected = true;
			btnChoose.Visible = true;
			@@ -692,16 +710,10 @@
			}
			}

			bool IsTip = false;
			EventHandler<MouseEventArgs> hander = (sender, e) =>
			{
			if (currentKey.bindList.Count != 0)
			{
			if (IsTip)
			{
			return;
			}
			IsTip = true;
			if (btnChoose.IsSelected)
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindExist), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnBindName);
			@@ -719,19 +731,19 @@
			oldScene = btnChoose;
			oldScene.IsSelected = true;
			oldScene.Visible = true;
			currentKey.curSelectSceneID = scene.Id.ToString();
			targetList.Clear();
			targetList.Add(scene);
			targetListDevice.Clear();
			targetListScene.Clear();
			targetListScene.Add(scene);
			}
			if (targetList.Count == 0)
			if (targetListDevice.Count == 0 && targetListScene.Count == 0)
			{
			btnFinifh.Enable = false;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			btnFinish.Enable = false;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			}
			else
			{
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			}
			};
			rowLayout.MouseUpEventHandler += hander;
			@@ -740,15 +752,15 @@
			btnChoose.MouseUpEventHandler += hander;
			curIndex++;
			}
			if (targetList.Count == 0)
			if (targetListDevice.Count == 0 && targetListScene.Count == 0)
			{
			btnFinifh.Enable = false;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			btnFinish.Enable = false;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			}
			else
			{
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			}
			}

			@@ -893,15 +905,15 @@
			int index = 0;
			RefreshRoomList(curRoom, ref index);
			RefreshSceneList(roomList[0]);
			if (targetList.Count == 0)
			if (targetListDevice.Count == 0 && targetListScene.Count == 0)
			{
			btnFinifh.Enable = false;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			btnFinish.Enable = false;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
			}
			else
			{
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			btnFinish.Enable = true;
			btnFinish.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			}
			dialog.Close();
			};
			@@ -931,7 +943,7 @@
			List<SceneUI> GetALlDispalyRoomSceneList()
			{
			currentKeyAllRoomSceneList.Clear();
			// 获取所有房间
			// 获取所有房间
			var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
			foreach (var room in listAllRoom)
			{
			@@ -973,11 +985,7 @@
			{
			continue;
			}
			var gwSc = gwCurScenesList.Find(obj => (obj.ScenesId == sceneId));
			if (gwSc != null)
			{
			tempSceneUIList.Add(scene);
			}
			tempSceneUIList.Add(scene);
			}
			return tempSceneUIList;
			}