~wjc/HomeApp.git

			@@ -18,7 +18,7 @@
			Tag = "Logic";
			}
			EditText logicTextBox;
			public void Show(Action action)
			public async void Show(Action action)
			{

			#region 最上面的布局代码
			@@ -79,12 +79,7 @@
			action();
			RemoveFromParent();
			};



			#endregion



			var middle = new VerticalScrolViewLayout
			{
			@@ -93,7 +88,26 @@
			BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};
			this.AddChidren(middle);
			var saveFrameLayout = new FrameLayout
			{
			Y = middle.Bottom,
			Height = Application.GetRealHeight(180),
			BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};
			this.AddChidren(saveFrameLayout);

			var btnsave = new Button
			{
			X = Application.GetRealWidth(85),
			Height = Application.GetRealHeight(130),//194
			Width = Application.GetRealWidth(910),
			Radius = (uint)Application.GetRealHeight(60),
			BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
			TextID = MyInternationalizationString.Save,
			TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
			TextSize = 16,
			};
			saveFrameLayout.AddChidren(btnsave);

			#region -----自动化名称设置名称-----
			var logicnamefl = new FrameLayout
			@@ -497,7 +511,8 @@
			var deviceinof = Common.Logic.LogicDviceList.Find((obj) => { return obj.DeviceAddr == conditions["MacAddr"] && obj.DeviceEpoint.ToString() == conditions["Epoint"]; });
			if (deviceinof == null)
			{
			continue;
			deviceinof = new ZigBee.Device.CommonDevice();
			//continue;
			}
			///显示设备名称
			var btndevice = new Button
			@@ -620,19 +635,19 @@
			int second = int.Parse(conditions["IgnoreTime"]) % 60;
			if (minute != 0 && second != 0)
			{
			devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
			devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);

			}
			else
			{
			if (minute == 0 && second != 0)
			{
			devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.closetime);
			devicestatus.Text = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);

			}
			if (minute != 0 && second == 0)
			{
			devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.closetime);
			devicestatus.Text = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);

			}

			@@ -921,26 +936,37 @@
			};
			conditionsRowLayout.AddChidren(securitystatus);

			if (conditions["EnOrWithdrawMode"] == "1")
			switch (conditions["EnOrWithdrawMode"])
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
			securitystatus.Text = Language.StringByID(MyInternationalizationString.withdrawal);
			}
			else
			{
			if (conditions["ModeId"] == "1")
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/athome.png";
			securitystatus.Text = Language.StringByID(MyInternationalizationString.logicathomegarrison);
			case "0":
			{
			if (conditions["ModeId"] == "1")
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/athome.png";
			securitystatus.Text = Language.StringByID(MyInternationalizationString.logicathomegarrison);

			}
			else
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/leavehome.png";
			securitystatus.Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison);

			}
			}
			else
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/leavehome.png";
			securitystatus.Text = Language.StringByID(MyInternationalizationString.logicremovehomegarrison);
			}
			}
			break;
			case "1":
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
			securitystatus.Text = Language.StringByID(MyInternationalizationString.withdrawal);
			}
			break;
			case "2":
			{
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
			securitystatus.Text = Language.StringByID(MyInternationalizationString.urgentwithdrawal);
			}
			break;
			}

			}
			break;
			case 7:
			@@ -949,7 +975,7 @@
			conditionIcon.UnSelectedImagePath = "ZigeeLogic/position.png";
			var btnlocation = new Button
			{
			Width = Application.GetRealWidth(700),
			Width = Application.GetRealWidth(250),
			TextAlignment = TextAlignment.CenterLeft,
			Gravity = Gravity.CenterVertical,
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			@@ -976,11 +1002,11 @@

			var locationstatus = new Button
			{
			Width = Application.GetRealWidth(300),
			Width = Application.GetRealWidth(550),
			Height = Application.GetRealHeight(130),
			Gravity = Gravity.CenterVertical,
			TextAlignment = TextAlignment.CenterRight,
			X = Application.GetRealWidth(500),
			X = Application.GetRealWidth(250),
			TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
			TextSize = 14,
			};
			@@ -1195,9 +1221,11 @@
			var deviceinof = Common.Logic.LogicDviceList.Find((obj) => { return ((obj.DeviceAddr == obj1) && (obj.DeviceEpoint.ToString() == obj2)); });
			if (deviceinof == null)
			{
			continue;

			deviceinof = new ZigBee.Device.CommonDevice();
			// continue;
			}


			///设备名称Button
			var btndevicename = new Button
			{
			@@ -1503,11 +1531,29 @@
			break;
			case 2:
			{

			//在本地查找该场景;
			var sceneinof = Common.Room.AllRoomSceneUIList.Find((obj) => { return obj.Id.ToString() == actions["DeviceAddr"].ToString(); });
			//本地没有存在;
			if (sceneinof == null)
			{
			continue;
			//实现目的:显示出来让可以自己是否删除
			sceneinof = new SceneUI();
			#region --------
			////在网关查找该场景;
			////标记问题:网络请求，存在视图加载快慢的问题；
			//sceneinof = await Send.GetScene(int.Parse(actions["DeviceAddr"].ToString()));
			////网关没有存在;
			//if (sceneinof == null)
			//{
			// //注解:本地和网关都不存在该场景,界面将不会显示该场景;
			// //sceneinof = new SceneUI();
			// //移除该场景数据;
			// Common.Logic.CurrentLogic.Actions.Remove(actions);
			// //移除该场景视图;
			// devicesFrameLayout.RemoveFromParent();
			// continue;
			//}
			#endregion
			}

			actionsIcon.UnSelectedImagePath = "ZigeeLogic/scene.png";
			@@ -1539,7 +1585,6 @@
			Common.Room room = new Common.Room();
			btnregionname.Text = room.GetRoomNameBySceneId(sceneinof.Id);
			//Send.RoomNmae(btnregionname, deviceinof);



			}
			@@ -1752,6 +1797,7 @@
			if (e1)
			{
			Common.Logic.CurrentLogic.Actions.Remove(actions);
			// devicesFrameLayout.RemoveFromParent();
			var logicCommunalPage = new LogicCommunalPage();
			UserView.HomePage.Instance.AddChidren(logicCommunalPage);
			UserView.HomePage.Instance.PageIndex += 1;
			@@ -1888,23 +1934,11 @@
			Gravity = Gravity.CenterVertical,
			};
			pushswitchRowlayout.AddChidren(btnswitch);
			btnswitch.MouseUpEventHandler += (sender1, e1) =>
			{
			btnswitch.IsSelected = !btnswitch.IsSelected;
			if (btnswitch.IsSelected)
			{

			}
			else
			{

			}
			};


			var custompushFrameLayout = new FrameLayout
			{
			Height = Application.GetRealHeight(160),
			Height = Application.GetRealHeight(0),
			BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
			};
			middle.AddChidren(custompushFrameLayout);
			@@ -1952,30 +1986,35 @@
			btncustompush.MouseUpEventHandler += customclick;
			custompushback.MouseUpEventHandler += customclick;
			custompushRowLayout.MouseUpEventHandler += customclick;
			bool tag = false;//标记开关状态;
			btnswitch.MouseUpEventHandler += (sender1, e1) =>
			{
			btnswitch.IsSelected = !btnswitch.IsSelected;
			if (btnswitch.IsSelected)
			{
			tag = true;
			custompushFrameLayout.Height = Application.GetRealHeight(160);
			if (Common.Logic.CurrentLogic.LogicId != 0)
			{
			Send.Data("添加/更新", "/App/HomeLogicConfig", "POST");
			}

			}
			else
			{
			tag = false;
			custompushFrameLayout.Height = Application.GetRealHeight(0);
			if (Common.Logic.CurrentLogic.LogicId != 0)
			{
			Send.Data("删除", "/App/DelHomeLogicConfig", "POST");
			}

			}
			};
			#endregion


			var saveFrameLayout = new FrameLayout
			{
			Y = middle.Bottom,
			Height = Application.GetRealHeight(180),
			BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
			};
			this.AddChidren(saveFrameLayout);

			var btnsave = new Button
			{
			X = Application.GetRealWidth(85),
			Height = Application.GetRealHeight(130),//194
			Width = Application.GetRealWidth(910),
			Radius = (uint)Application.GetRealHeight(60),
			BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
			TextID = MyInternationalizationString.Save,
			TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
			TextSize=16,
			};
			saveFrameLayout.AddChidren(btnsave);

			btnsave.MouseUpEventHandler += async (sender, e) =>
			{
			var name = logicTextBox.Text.Trim();
			@@ -1984,12 +2023,13 @@
			new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.PleaseEnterLogicName), Language.StringByID(MyInternationalizationString.Close)).Show();
			return;
			}
			var logicname = Common.Logic.LogicList.Find((logic) => Common.Logic.CurrentLogic.LogicId != logic.LogicId && logic.LogicName == name);
			if (logicname != null)
			{
			new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.Rename), Language.StringByID(MyInternationalizationString.Close)).Show();
			return;
			}
			///先隐藏判断名字相同的功能；
			//var logicname = Common.Logic.LogicList.Find((logic) => Common.Logic.CurrentLogic.LogicId != logic.LogicId && logic.LogicName == name);
			//if (logicname != null)
			//{
			// new Alert(Language.StringByID(MyInternationalizationString.Tip), Language.StringByID(MyInternationalizationString.Rename), Language.StringByID(MyInternationalizationString.Close)).Show();
			// return;
			//}

			Common.Logic.CurrentLogic.LogicName = name;
			bool succeed = false;
			@@ -2004,6 +2044,10 @@
			succeed = true;
			Common.Logic.CurrentLogic.LogicId = logicifon.LogicId;
			Common.Logic.LogicList.Add(Common.Logic.CurrentLogic);
			if (tag)
			{
			Send.Data("添加/更新", "/App/HomeLogicConfig", "POST");
			}
			}
			}
			else
			@@ -2015,11 +2059,13 @@
			}
			CommonPage.Loading.Hide();

			if (!succeed) {
			if (!succeed)//succeed标记是添加成功还是失败
			{
			//网关回复失败，不关闭界面，让它停留当前界面；
			//（原因：考虑到失败重新编辑原来数据给用户带来了麻烦）
			///提示：添加自动化失败；
			return;
			//TipView("添加自动化失败");
			//return;
			}
			UserView.HomePage.Instance.RemoveViewByTag("Logic");
			Category.Category.instance?.RefreshBodyView();
			@@ -2520,5 +2566,50 @@
			};

			}
			/// <summary>
			/// 闪现式提示框的方法
			/// </summary>
			/// <param name="tipText">提示内容</param>
			/// <param name="second">停留时间单位为s</param>
			public void TipView(string tipText, int second = 1)
			{

			var frameLayout = new FrameLayout { BackgroundColor = 0x50000000 };
			this.AddChidren(frameLayout);

			var btn = new Button
			{
			Gravity = Gravity.Center,
			Text = tipText,
			BackgroundColor = 0xff1f1f1f,
			Width = Application.GetRealWidth(500),
			Height = Application.GetRealHeight(100),
			Radius = (uint)Application.GetRealHeight(50),
			};
			frameLayout.AddChidren(btn);

			var dateTime1 = DateTime.Now;
			new System.Threading.Thread(() =>
			{
			Application.RunOnMainThread(() =>
			{
			while (true)
			{
			if ((DateTime.Now - dateTime1).TotalMilliseconds > second * 1000)
			{
			//默认一秒关闭
			frameLayout.RemoveFromParent();
			break;
			}
			}
			});
			})
			{ IsBackground = true }.Start();

			}




			}
			}