~wjc/HomeApp.git

			@@ -45,19 +45,17 @@
			FrameLayout blankFrameLayout;//空数据显示布局
			List<int> typeModeList;//动态获取按键支持的模式大类型
			public List<ScenesListInfo> gwScenesList = new List<ScenesListInfo>();//网关中的场景列表
			bool IsRead = false;

			#endregion

			//初始化按键数据
			private void InitListInfo()
			void InitListInfo()
			{
			System.Threading.Tasks.Task.Run(async () =>
			{
			try
			{
			Application.RunOnMainThread(() =>
			{
			});
			localDeviceList.Clear();
			scList.Clear();
			//获取本地设备列表
			@@ -73,15 +71,8 @@
			{
			gwScenesList = gwSceneObj.getSceneInfo.ScenesList;
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();

			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			});
			}
			//动态获取按键支持的大类
			typeModeList = await GetTypeMode();
			#region 读取面板当前模式
			//读取按键当前模式
			var tempDeata = await currentKey.ReadPanelConfigureInfoAsync();
			@@ -106,78 +97,81 @@
			{
			currentClusterID = 258;
			}
			currentKey.ReSave();
			//读取按键当前绑定目标
			var getBindList = await currentKey.GetDeviceBindAsync();
			var bindDeviceListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
			var bindSceneListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
			if (getBindList != null && getBindList.getAllBindResponseData != null)
			{
			currentKey.bindList.Clear();
			foreach (var b in getBindList.getAllBindResponseData.BindList)
			{
			if (b.BindCluster == currentClusterID)
			{
			if (b.BindCluster == 6)
			{

			if (b.BindType == 2)
			{
			bindSceneListTemp.Add(b);
			}
			else
			{
			bindDeviceListTemp.Add(b);
			}
			}
			else
			//读取按键当前绑定目标
			GetDeviceBindResponseAllData getBindList = null;
			if (IsRead)
			{
			getBindList = await currentKey.GetDeviceBindAsync();
			var bindDeviceListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
			var bindSceneListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
			if (getBindList != null && getBindList.getAllBindResponseData != null)
			{
			currentKey.bindList.Clear();
			foreach (var b in getBindList.getAllBindResponseData.BindList)
			{
			if (b.BindCluster == currentClusterID)
			{
			if (currentClusterID == 8)
			if (b.BindCluster == 6)
			{
			if (b.BindCluster == 8)

			if (b.BindType == 2)
			{
			currentKey.bindList.Add(b);
			bindSceneListTemp.Add(b);
			}
			else
			{
			bindDeviceListTemp.Add(b);
			}
			}
			else
			{
			currentKey.bindList.Add(b);
			if (currentClusterID == 8)
			{
			if (b.BindCluster == 8)
			{
			currentKey.bindList.Add(b);
			}
			}
			else
			{
			currentKey.bindList.Add(b);
			}
			}
			}
			}
			}
			}
			else
			{
			Application.RunOnMainThread(() =>
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			});
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			return;
			});
			}
			if (currentKey.panelMode == 1)
			{
			currentKey.bindList = bindSceneListTemp;
			currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddScene);
			}
			else if (currentKey.panelMode == 100 \|\| currentKey.panelMode == 101 \|\| currentKey.panelMode == 102)
			{
			currentKey.bindList = bindDeviceListTemp;
			currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddSwitch);
			}
			else if (currentKey.panelMode == 200 \|\| currentKey.panelMode == 201 \|\| currentKey.panelMode == 203 \|\| currentKey.panelMode == 204 \|\| currentKey.panelMode == 205)
			{
			currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddDimmer);
			}
			else if (currentKey.panelMode == 300 \|\| currentKey.panelMode == 301 \|\| currentKey.panelMode == 302 \|\| currentKey.panelMode == 303 \|\| currentKey.panelMode == 304)
			{
			currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddCurtain);
			}
			}

			if (currentKey.panelMode == 1)
			{
			currentKey.bindList = bindSceneListTemp;
			currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddScene);
			}
			else if (currentKey.panelMode == 100 \|\| currentKey.panelMode == 101 \|\| currentKey.panelMode == 102)
			{
			currentKey.bindList = bindDeviceListTemp;
			currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddSwitch);
			}
			else if (currentKey.panelMode == 200 \|\| currentKey.panelMode == 201 \|\| currentKey.panelMode == 203 \|\| currentKey.panelMode == 204 \|\| currentKey.panelMode == 205)
			{
			currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddDimmer);
			}
			else if (currentKey.panelMode == 300 \|\| currentKey.panelMode == 301 \|\| currentKey.panelMode == 302 \|\| currentKey.panelMode == 303 \|\| currentKey.panelMode == 304)
			{
			currentKey.currentKeySelectModeText = Language.StringByID(R.MyInternationalizationString.AddCurtain);
			}
			currentKey.ReSave();
			}
			#endregion

			//动态获取按键支持的大类
			typeModeList = await GetTypeMode();
			#endregion
			Application.RunOnMainThread(() =>
			{
			RefreshList();
			@@ -189,7 +183,6 @@
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();

			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			});
			return;
			@@ -216,13 +209,14 @@

			var btnAddFrameLayout = new FrameLayout()
			{
			X = Application.GetRealWidth(913),
			X = Application.GetRealWidth(888),
			Width = Application.GetRealWidth(192),
			};
			this.titleFrameLayout.AddChidren(btnAddFrameLayout);

			var btnBindAdd = new Button
			{
			X = Application.GetRealWidth(62),
			Height = Application.GetRealHeight(72),
			Width = Application.GetRealWidth(72),
			UnSelectedImagePath = "BindPic/BindAdd.png",
			@@ -310,6 +304,14 @@
			#endregion
			CommonPage.Loading.Start("");
			middleFrameLayout();
			if (currentKey.bindList.Count == 0)
			{
			IsRead = true;
			}
			else
			{
			IsRead = false;
			}
			InitListInfo();

			}
			@@ -325,6 +327,7 @@
			midVerticalRefreshLayout.BeginHeaderRefreshingAction += () =>
			{
			midVerticalRefreshLayout.BeginHeaderRefreshing();
			IsRead = true;
			InitListInfo();
			midVerticalRefreshLayout.EndHeaderRefreshing();
			};
			@@ -484,7 +487,7 @@
			devicePic.Width = Application.GetRealWidth(110);
			devicePic.Text = "";
			}
			if (tempDev.DeviceEpointName == "")
			if (string.IsNullOrEmpty(tempDev.DeviceEpointName))
			{
			btnBindNameText = tempDev.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit);
			}
			@@ -528,7 +531,7 @@
			modeRowLayout.BackgroundColor = ZigbeeColor.Current.XMWhite;
			midVerticalRefreshLayout.AddChidrenRow(modeRowLayout);
			modeRowLayout.frameTable.UseClickStatu = false;
			modeRowLayout.frameTable.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.keyMode), 500);
			modeRowLayout.frameTable.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.keyMode), 400);
			var btnKeyModeTipText = "";
			#region 当前模式文本显示
			switch (currentKey.panelMode)
			@@ -574,7 +577,7 @@
			break;
			}
			#endregion
			modeRowLayout.frameTable.AddMostRightView(btnKeyModeTipText, 500);
			modeRowLayout.frameTable.AddMostRightView(btnKeyModeTipText, 800);
			modeRowLayout.frameTable.AddBottomLine();
			var btnDel = modeRowLayout.AddDeleteControl();
			//一键清除按键事件
			@@ -639,7 +642,7 @@
			}
			CommonPage.Loading.Hide();
			}
			};
			};
			};
			}

			@@ -856,7 +859,7 @@
			currentKey.currentKeySelectModeText = oldKeySelectModeText;
			dialog.Close();
			}
			};
			};
			}
			}
			else
			@@ -909,7 +912,7 @@
			currentKey.currentKeySelectModeText = oldKeySelectModeText;
			dialog.Close();
			}
			};
			};
			}
			}
			else