~wxr/HDL_APP_Project.git

			@@ -10,19 +10,16 @@
			{
			public SetPir()
			{
			Tag = "PirMain";
			Tag = "PirView";
			}
			Action backAction;
			public void Show(Action action)
			public void Show()
			{
			backAction = action;
			#region 界面布局
			this.BackgroundColor = CSS.CSS_Color.viewMiddle;
			Intelligence.Automation.LogicView.TopView topView = new Intelligence.Automation.LogicView.TopView();
			this.AddChidren(topView.FLayoutView());
			topView.clickBackBtn.MouseUpEventHandler += (e, sen) =>
			{
			//action();
			RemoveFromParent();
			};
			topView.topNameBtn.TextID = StringId.setlogic;
			@@ -42,11 +39,11 @@
			editNameFLayout.btnNextIcon.Width = Application.GetRealWidth(28);
			editNameFLayout.btnNextIcon.UnSelectedImagePath = "LogicIcon/editname.png";
			viewLayout.AddChidren(editNameFLayout.FLayoutView());
			///版本升级
			FrameLayout50 banbenshengjiFL = new FrameLayout50();
			banbenshengjiFL.btnText.Text = Language.StringByID(StringId.banbenshengji);
			banbenshengjiFL.frameLayout.Y = editNameFLayout.frameLayout.Bottom;
			viewLayout.AddChidren(banbenshengjiFL.FLayoutView());
			/////版本升级
			//FrameLayout50 banbenshengjiFL = new FrameLayout50();
			//banbenshengjiFL.btnText.Text = Language.StringByID(StringId.banbenshengji);
			//banbenshengjiFL.frameLayout.Y = editNameFLayout.frameLayout.Bottom;
			//viewLayout.AddChidren(banbenshengjiFL.FLayoutView());

			var versions = Pir.currPir.versions.Find((c)=>c.module== "fw_version");
			if (versions == null)
			@@ -57,7 +54,8 @@
			FrameLayout50 banbenhaoFLayout = new FrameLayout50();
			banbenhaoFLayout.btnNextIcon.Visible = false;
			banbenhaoFLayout.btnText.Text = Language.StringByID(StringId.banbenhao) + ":"+ versions.version;
			banbenhaoFLayout.frameLayout.Y = banbenshengjiFL.frameLayout.Bottom;
			banbenhaoFLayout.btnText.Width = Application.GetRealWidth(280);
			banbenhaoFLayout.frameLayout.Y = editNameFLayout.frameLayout.Bottom;// banbenshengjiFL.frameLayout.Bottom;
			viewLayout.AddChidren(banbenhaoFLayout.FLayoutView());
			//删除
			FrameLayout frameLayout = new FrameLayout
			@@ -84,10 +82,10 @@
			editNameFLayout.btnClick.MouseUpEventHandler += (sender, e) =>
			{
			List<string> list = new List<string>();
			Method method = new Method();
			PirMethod method = new PirMethod();
			method.EditControlName(StringId.editName, list, Pir.currPir.name, (name, dialog) =>
			{
			Method.ThreadSend(new Control { deviceId = Pir.currPir.deviceId, name = name }, (responsePackNew) =>
			PirMethod.ThreadSend(new Control { deviceId = Pir.currPir.deviceId, name = name }, (responsePackNew) =>
			{
			dialog.Close();
			editNameFLayout.btnEditText.Text = name;
			@@ -105,7 +103,7 @@
			tipPopView.TipBox(StringId.tip, text, (dialog) =>
			{

			Method.ThreadSend(new Control { deviceId = Pir.currPir.deviceId }, (responsePackNew) =>
			PirMethod.ThreadSend(new Control { deviceId = Pir.currPir.deviceId }, (responsePackNew) =>
			{
			var pir = Pir.pirDeviceList.Find((c) => c.deviceId == Pir.currPir.deviceId);
			if (pir != null)
			@@ -113,16 +111,8 @@
			Pir.pirDeviceList.Remove(Pir.currPir);
			}
			dialog.Close();
			action();
			this.RemoveFromParent();
			for (int i = MainPage.BasePageView.ChildrenCount - 1; 0 <= i; i--)
			{
			var view = MainPage.BasePageView.GetChildren(i);
			if (view.GetType() == typeof(PirMain))
			{
			view.RemoveFromParent();
			}
			}
			PirMethod.RemoveView("PirMain");
			}, "删除", "dialog", null, dialog);

			}, () =>
			@@ -141,8 +131,10 @@
			/// </summary>
			public override void RemoveFromParent()
			{
			backAction();
			//刷新PirMain界面
			PirMethod.RefreshView("PirMain");
			base.RemoveFromParent();

			}
			}
			}