~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -450,7 +450,7 @@
			/// <param name="selectedBtn">选中那个界面 0--功能 1--场景 2--自动化 </param>
			public void Show(int selectedBtn = 1)
			{


			ZbGateway.StatusList.Add(this);
			RemoveAll();

			@@ -653,11 +653,12 @@
			/// <param name="sender">Sender.</param>
			/// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
			private void AutomationBtn_MouseUpEventHandler(object sender, MouseEventArgs mouseEventArgs)
			{
			Common.Logic.LogicDviceList.Clear();
			if (Common.Logic.LogicDviceList.Count == 0)
			{
			Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
			{
			///第一次进来初始化设备列表；
			Common.Logic.LogicDviceList.Clear();
			if (Common.Logic.LogicDviceList.Count == 0)
			{
			Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
			}
			functionBtn.IsSelected = false;
			sceneBtn.IsSelected = false;
			@@ -714,6 +715,15 @@
			UserView.HomePage.Instance.PageIndex += 1;
			addLogicPage.Show();
			}
			/// <summary>
			/// HidenFloor
			/// </summary>
			/// <param name="statu"></param>
			private void HidenFloor(bool statu)
			{
			selectFloorBtn.Visible = !statu;
			floorBtn.Visible = !statu;
			}

			#endregion

			@@ -726,15 +736,19 @@
			functionSceneAutoBodyView.RemoveAll();
			if (functionBtn.IsSelected)
			{
			HidenFloor(false);
			ShowFunction();
			}
			else if (sceneBtn.IsSelected)
			{
			HidenFloor(false);
			ShowScene();
			}
			else if (automationBtn.IsSelected)
			{
			HidenFloor(true);
			ShowAutotion();

			}
			}

			@@ -945,13 +959,32 @@

			deviceRow.ClickBtn.MouseUpEventHandler += (send2, e2) =>
			{
			var lightControl = new Phone.Device.Light.LightControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, room);
			if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A开关)
			{
			var lightControl = new Phone.Device.Light.OnOffControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, room);
			}
			else if (deviceUI.CommonDevice.DfunctionType == DeviceFunctionType.A插座)
			{
			var lightControl = new Phone.Device.Light.PlugControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, room);
			}
			else
			{
			var lightControl = new Phone.Device.Light.LightControl();
			UserView.HomePage.Instance.AddChidren(lightControl);
			UserView.HomePage.Instance.PageIndex += 1;
			//lightControl.action = RefreshBodyView;
			lightControl.Show(deviceUI, room);
			}
			};


			var editBtn = new CommonForm.RowLayoutEditButton()
			{
			Tag = deviceUI,
			@@ -1284,6 +1317,7 @@
			UserHomeView.ReadStatus(rollerShade, () =>
			{
			rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			rollerShade.ReadWcdCurrentPositionLiftPercentage();
			});
			}
			else
			@@ -1292,6 +1326,7 @@
			if ((DateTime.Now - rollerShade.LastDateTime).TotalSeconds > CommonPage.ReadDeviceStatuSpan)
			{
			rollerShade.ReadAttri(Cluster_ID.Identify, AttriButeId.Switch);
			rollerShade.ReadWcdCurrentPositionLiftPercentage();
			}
			}

			@@ -1388,6 +1423,8 @@
			ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
			}
			}


			}
			}

			@@ -1452,7 +1489,7 @@
			{
			RefreshFunction(room);
			}


			}
			roomBtn.MouseUpEventHandler += (sender, e) =>
			{
			@@ -1473,7 +1510,7 @@
			}
			};
			}


			}

			#endregion
			@@ -1558,7 +1595,7 @@
			Tag = scene
			};
			leftFL.AddChidren(collectionBtn);


			var sceneNameBtn = new Button()
			{
			Width = Application.GetRealWidth(176),
			@@ -1707,7 +1744,7 @@
			}
			};
			}


			};
			deleteBtn.MouseUpEventHandler += delEvent;
			//编辑场景
			@@ -1769,7 +1806,7 @@
			/// 自动化
			/// </summary>
			private async void ShowAutotion()
			{
			{

			functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
			var bjFrameLayout = new FrameLayout
			@@ -1949,7 +1986,7 @@
			//自动化
			Automationview(logicScrolView);
			CommonPage.Loading.Hide();


			}

			/// <summary>
			@@ -2557,6 +2594,6 @@

			#endregion



			}
			}