~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -16,15 +16,9 @@

			}
			/// 给徐梅刷新界面用的
			public Action<bool> action;
			public Action<bool> action;
			///第二块第一级父控件
			FrameLayout fLayout = new FrameLayout();
			///常开模式图标
			Button modeIconBtn = new Button();
			///第二块第二级父控件
			FrameLayout modeFl = new FrameLayout();
			Button button1 = new Button();
			Button button2= new Button();
			///第三块第一级父控件
			FrameLayout listLogicFl = new FrameLayout();
			///常开自动化列表上下滑动的控件
			@@ -39,7 +33,7 @@
			public int timeValue = 0;
			public async void Show()
			{


			#region 界面的布局代码
			UserView.HomePage.Instance.ScrollEnabled = false;//锁住左滑
			TopView view = new TopView();
			@@ -47,7 +41,7 @@
			view.toptitleNameBtn.TextID = MyInternationalizationString.openmode;
			view.clickBtn.MouseDownEventHandler += (sender, e) =>
			{
			UserView.HomePage.Instance.ScrollEnabled = true;
			UserView.HomePage.Instance.ScrollEnabled = true;
			//把静态变量的这个东西置空
			soneLogicList = null;
			this.RemoveFromParent();
			@@ -92,30 +86,6 @@
			BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};
			middle.AddChidren(fLayout);
			///常开模式图标
			modeIconBtn = new Button
			{
			X = Application.GetRealWidth(395),
			Y = Application.GetRealHeight(92),
			Width = Application.GetMinRealAverage(294),
			Height = Application.GetMinRealAverage(294),
			};
			fLayout.AddChidren(modeIconBtn);
			///第二块第二级父控件
			modeFl = new FrameLayout
			{
			};
			fLayout.AddChidren(modeFl);

			button1 = new Button
			{
			};
			modeFl.AddChidren(button1);

			button2 = new Button
			{
			};
			modeFl.AddChidren(button2);
			ModeView();
			#endregion
			#region 常开自动化
			@@ -162,7 +132,7 @@
			UnSelectedImagePath = "ZigeeLogic/add.png",
			};
			addLogicfL.AddChidren(addIconBtn);

			///加大点击热键
			var addIconclickBtn = new Button
			{
			Width = Application.GetRealWidth(90 + 69 + 63),
			@@ -245,33 +215,46 @@
			/// <summary>
			/// 常开模式开关切换图标界面
			/// </summary>
			public async void ModeView()
			public void ModeView()
			{


			fLayout.RemoveAll();
			///常开模式图标
			Button modeIconBtn = new Button
			{
			X = Application.GetRealWidth(395),
			Y = Application.GetRealHeight(92),
			Width = Application.GetMinRealAverage(294),
			Height = Application.GetMinRealAverage(294),
			};
			fLayout.AddChidren(modeIconBtn);
			if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
			{
			fLayout.Height = Application.GetRealHeight(780);//改变高度

			fLayout.Height = Application.GetRealHeight(780);//改变高度
			modeIconBtn.UnSelectedImagePath = "ZigeeLogic/openMode.png";//改变图标状态
			modeFl.Y = modeIconBtn.Bottom + Application.GetRealHeight(64);
			modeFl.X = Application.GetRealWidth(0);
			modeFl.Height = Application.GetRealHeight(127 + 199);
			modeFl.Width = Application.GetRealHeight(1080);
			modeFl.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
			modeFl.SetCornerWithSameRadius(Application.GetRealHeight(0), HDLUtils.RectCornerBottomLeft);

			///第二级父控件
			var openModeFl = new FrameLayout
			{
			Y = Application.GetRealHeight(455),
			Height = Application.GetRealHeight(127 + 199),
			Width = Application.GetRealWidth(1080),
			};
			fLayout.AddChidren(openModeFl);
			///关闭时效性自动化
			button1.Y = Application.GetRealHeight(0);
			button1.X = Application.GetRealWidth(86);
			button1.Width = Application.GetRealWidth(907);
			button1.Height = Application.GetRealHeight(127);
			button1.Radius = (uint)Application.GetRealHeight(58);
			button1.BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor;
			button1.TextAlignment = TextAlignment.Center;
			button1.TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor;
			button1.TextID = MyInternationalizationString.closeUp;
			button1.TextSize = 16;

			button1.MouseUpEventHandler = async (sender, e) =>
			Button closeBtn = new Button
			{
			X = Application.GetRealWidth(86),
			Height = Application.GetRealHeight(127),
			Width = Application.GetRealWidth(907),
			Radius = (uint)Application.GetRealHeight(58),
			BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
			TextID = MyInternationalizationString.closeUp,
			TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
			TextSize = 16,
			};
			openModeFl.AddChidren(closeBtn);
			closeBtn.MouseUpEventHandler += async (sender, e) =>
			{
			CommonPage.Loading.Start();
			try
			@@ -302,16 +285,20 @@
			});
			}
			};

			///显示失效设置时间文本控件
			var timeTextBtn = new Button
			{
			Y = Application.GetRealHeight(127 + 69),
			X = Application.GetRealWidth(125),
			Width = Application.GetRealWidth(634 + 200),
			Height = Application.GetRealHeight(60),
			TextSize = 15,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			};
			if (logicId != 0)
			{
			///显示失效设置时间文本控件
			button2.Y = Application.GetRealHeight(127 + 69);
			button2.X = Application.GetRealWidth(125);
			button2.Width = Application.GetRealWidth(634 + 200);
			button2.Height = Application.GetRealHeight(60);
			button2.UnSelectedImagePath = "ZigeeLogic/1234.png";
			button2.TextSize = 15;
			button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
			openModeFl.AddChidren(timeTextBtn);
			///有时效性常开才显示时间条件文本
			var y = DateTime.Now.Year.ToString();//那一年
			var m = DateTime.Now.Month.ToString();//那一月
			@@ -325,53 +312,61 @@
			string text3 = Language.StringByID(MyInternationalizationString.monthSone);
			string text4 = Language.StringByID(MyInternationalizationString.numberSone);
			string text5 = Language.StringByID(MyInternationalizationString.executeSone);
			button2.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
			timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
			}
			else
			{
			button2.Y = Application.GetRealHeight(0);
			button2.X = Application.GetRealWidth(0);
			button2.Width = Application.GetRealWidth(0);
			button2.Height = Application.GetRealHeight(0);
			}



			}
			else
			{
			fLayout.Height = Application.GetRealHeight(645);//改变高度
			modeIconBtn.UnSelectedImagePath = "ZigeeLogic/noMode.png";//改变图标状态
			modeFl.Y = modeIconBtn.Bottom + Application.GetRealHeight(92);
			modeFl.X = Application.GetRealWidth(58);
			modeFl.Height = Application.GetRealHeight(138);
			modeFl.Width = Application.GetRealHeight(1022);
			modeFl.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
			///第二级父控件
			var modeFl = new FrameLayout
			{
			Y = Application.GetRealHeight(478),
			X = Application.GetRealWidth(58),
			Height = Application.GetRealHeight(138),
			Width = Application.GetRealWidth(1022),
			BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
			};
			fLayout.AddChidren(modeFl);
			modeFl.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);

			///时效性常开设置显示文本控件
			button1.Y = Application.GetRealHeight(40);
			button1.X = Application.GetRealWidth(58);
			button1.Width = Application.GetRealWidth(600);
			button1.Height = Application.GetRealHeight(60);
			button1.Radius = (uint)Application.GetRealHeight(0);
			button1.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;
			button1.TextAlignment = TextAlignment.CenterLeft;
			button1.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
			// Text = "时效性常开设置",
			button1.TextID = MyInternationalizationString.timeSetSone;
			button1.TextSize = 15;
			var modeTextBtn = new Button
			{


			Y = Application.GetRealHeight(40),
			X = Application.GetRealWidth(58),
			Width = Application.GetRealWidth(600),
			Height = Application.GetRealHeight(60),
			TextSize = 15,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			TextAlignment = TextAlignment.CenterLeft,
			// Text = "时效性常开设置",
			TextID = MyInternationalizationString.timeSetSone,
			};
			modeFl.AddChidren(modeTextBtn);
			///下一级菜单图标控件
			button2.Width = Application.GetMinRealAverage(104);
			button2.Height = Application.GetMinRealAverage(104);
			button2.X = Application.GetRealWidth(861);
			button2.Y = Application.GetRealHeight(17);
			button2.UnSelectedImagePath = "ZigeeLogic/nextIconSone.png";
			button2.TextSize = 15;
			button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
			button2.Text ="";
			button2.MouseUpEventHandler = (sender, e) =>
			var nextIconBtn = new Button
			{
			Width = Application.GetMinRealAverage(104),
			Height = Application.GetMinRealAverage(104),
			X = Application.GetRealWidth(861),
			Y = Application.GetRealHeight(17),
			UnSelectedImagePath = "ZigeeLogic/nextIconSone.png",
			};
			modeFl.AddChidren(nextIconBtn);

			///加大点击热键
			var clickBtn = new Button
			{
			Width = Application.GetRealWidth(104 + 161 + 30),
			Height = Application.GetRealHeight(138),
			X = Application.GetRealWidth(700),
			};
			modeFl.AddChidren(clickBtn);
			clickBtn.MouseUpEventHandler += (sender, e) =>
			{

			LogicView.TipView.ShowConfrimTip(() =>
			@@ -405,8 +400,8 @@
			logicId = addResult;
			timeValue = int.Parse(str);
			Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
			ModeView();
			//添加App开启常开模式的历史记录
			ModeView();
			//添加App开启常开模式的历史记录
			UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
			}
			}
			@@ -439,7 +434,7 @@
			/// 读取自动化列表数据；
			/// </summary>
			/// <param name="yes"></param>
			private async void Read( bool yes)
			private async void Read(bool yes)
			{
			if (yes)
			{
			@@ -477,8 +472,10 @@

			}
			}

			RowLayout selectedRow = new RowLayout() { Tag = "0" };//记录左滑状态
			/// <summary>
			/// 记录左滑状态
			/// </summary>
			RowLayout selectedRow = new RowLayout() { Tag = "0" };
			int a = 1;
			/// <summary>
			/// 加载自动化列表
			@@ -514,7 +511,7 @@
			selectedRow = logicRow;
			};
			a++;
			///显示逻辑名称的控件
			///显示逻辑名称的控件
			var nameBtn = new Button
			{
			Height = Application.GetRealHeight(58),
			@@ -578,7 +575,7 @@
			TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
			};
			logicRow.AddRightView(edit);


			///删除
			var del = new Button
			{
			@@ -631,17 +628,17 @@
			{
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
			Language.StringByID(MyInternationalizationString.doyouwanttodelete),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			alert.ConfirmClickEvent += () =>
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			alert.ConfirmClickEvent += () =>
			{
			Common.Logic.SoneLogicList.Remove(logic);
			//logicRow.Parent.RemoveFromParent();
			fLayoutLogic.RemoveFromParent();
			Send.DelLogic(logic.LogicId);
			Send.DelLogic(logic.LogicId);
			};

			};
			};
			}
			}