~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -648,11 +648,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;
			@@ -742,6 +743,7 @@
			{
			HidenFloor(true);
			ShowAutotion();

			}
			}

			@@ -1430,6 +1432,8 @@
			ShowSameTypeFunction(functionTypeIMG.ImageBtn, null);
			}
			}


			}
			}

			@@ -1494,7 +1498,7 @@
			{
			RefreshFunction(room);
			}


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


			}

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


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


			};
			deleteBtn.MouseUpEventHandler += delEvent;
			//编辑场景
			@@ -1819,12 +1823,11 @@
			#endregion

			#region ◆ 自动化__________________________

			/// <summary>
			/// 自动化
			/// </summary>
			private async void ShowAutotion()
			{
			{

			functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
			var bjFrameLayout = new FrameLayout
			@@ -1833,11 +1836,11 @@
			Height = Application.GetRealHeight(170),
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			X = Application.GetRealWidth(58),
			Radius = (uint)Application.GetRealHeight(50),
			//Radius = (uint)Application.GetRealHeight(50),
			Y = Application.GetRealHeight(30),
			};
			functionSceneAutoBodyView.AddChidren(bjFrameLayout);

			bjFrameLayout.SetCornerWithSameRadius(25, HDLUtils.RectCornerTopLeft \| HDLUtils.RectCornerBottomLeft);
			var sigBtn = new Button
			{
			Width = Application.GetMinRealAverage(84),
			@@ -1858,6 +1861,7 @@
			TextID = MyInternationalizationString.logictemplate,
			Gravity = Gravity.CenterVertical,
			TextColor = ZigbeeColor.Current.LogicBtnSelectedColor,
			TextSize=15,
			};
			bjFrameLayout.AddChidren(recommendtextBtn);

			@@ -1887,10 +1891,11 @@
			Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30),
			BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			X = Application.GetRealWidth(58),
			Radius = (uint)Application.GetRealHeight(50),
			//Radius = (uint)Application.GetRealHeight(50),
			Y = scenehorizontalScrol.Bottom,
			};
			functionSceneAutoBodyView.AddChidren(logicScrolView);
			logicScrolView.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft \| HDLUtils.RectCornerBottomLeft);


			recommendswitchBtn.MouseUpEventHandler += (sender, e) =>
			@@ -1928,6 +1933,7 @@
			Y = Application.GetRealHeight(246 - 23 - 80),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
			TextSize = 14,
			};
			frameLayout.AddChidren(logicnameBtn);

			@@ -2004,9 +2010,8 @@
			//自动化
			Automationview(logicScrolView);
			CommonPage.Loading.Hide();

			}

			}
			/// <summary>
			/// 自动化列表界面
			/// </summary>
			@@ -2038,6 +2043,7 @@
			Y = Application.GetRealHeight(30),
			TextAlignment = TextAlignment.CenterLeft,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextSize = 14,
			};
			logicRowlayout.AddChidren(logicnameBtn);

			@@ -2612,6 +2618,6 @@

			#endregion



			}
			}