~wjc/HomeApp.git

old mode 100644 new mode 100755

File was renamed from ZigbeeApp20200414/Shared/Phone/Device/Logic/AddLogicPage.cs
			@@ -23,11 +23,11 @@
			this.AddChidren(view.TopRowView());
			view.toptitleNameBtn.TextID = MyInternationalizationString.selection;
			view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };


			var middle = new FrameLayout
			{
			Y = view.topRowLayout.Bottom,
			Height = Application.GetRealHeight(1925 - 184),
			Height = Application.GetRealHeight(Method.H - 184),
			BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};
			this.AddChidren(middle);
			@@ -36,25 +36,25 @@
			timeView.iconBtn.UnSelectedImagePath = "ZigeeLogic/time.png";
			timeView.funnameBtn.TextID = MyInternationalizationString.timecondition;
			middle.AddChidren(timeView.FunFrameView());


			///设备
			FunView functionView = new FunView();
			functionView.funFrameLayout.Y = timeView.funFrameLayout.Bottom;
			functionView.iconBtn.UnSelectedImagePath = "ZigeeLogic/function.png";
			functionView.funnameBtn.TextID = MyInternationalizationString.device;
			middle.AddChidren(functionView.FunFrameView());


			///安防
			FunView securityView = new FunView();
			securityView.funFrameLayout.Y = functionView.funFrameLayout.Bottom;
			securityView.iconBtn.UnSelectedImagePath = "ZigeeLogic/security.png";
			securityView.funnameBtn.TextID = MyInternationalizationString.security;
			middle.AddChidren(securityView.FunFrameView());


			///地理围栏
			FunView positionView = new FunView();
			positionView.funFrameLayout.Y = securityView.funFrameLayout.Bottom;
			positionView.funFrameLayout.Height = Application.GetRealHeight(160 + 20);//最后一行增加20高度;
			positionView.funFrameLayout.Height = Application.GetRealHeight(160+20);//最后一行增加20高度;
			positionView.iconBtn.UnSelectedImagePath = "ZigeeLogic/position.png";
			positionView.funnameBtn.TextID = MyInternationalizationString.location;
			positionView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
			@@ -335,8 +335,7 @@
			#endregion
			string strname = "";
			//到达地点点击事件
			athomeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
			{
			athomeView.clickviewBtn.MouseUpEventHandler += (sender, e) => {

			strname = athomeView.titleBtn.Text;
			leaveView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			@@ -345,15 +344,14 @@
			athomeView.selectedIconBtn.Visible = true;
			};
			//离开地点点击事件
			leaveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
			{
			leaveView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
			strname = leaveView.titleBtn.Text;
			leaveView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
			athomeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			leaveView.selectedIconBtn.Visible = true;
			athomeView.selectedIconBtn.Visible = false;
			};


			double latitude = Config.Instance.Home.Latitude;//纬度
			double longitude = Config.Instance.Home.Longitude;//经度
			int r = 500;//半径
			@@ -521,8 +519,7 @@
			timeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
			#endregion
			//立即执行点击事件
			timepointView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
			{
			timepointView.clickviewBtn.MouseUpEventHandler += (sender, e) => {

			timeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			timepointView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
			@@ -530,8 +527,7 @@
			timepointView.selectedIconBtn.Visible = true;
			};
			//时间范围点击事件
			timeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
			{
			timeView.clickviewBtn.MouseUpEventHandler += (sender, e) => {
			timeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
			timepointView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
			timeView.selectedIconBtn.Visible = true;