~xm/HomeApp.git

			@@ -47,7 +47,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();
			@@ -76,7 +76,7 @@
			try
			{
			//进来更新一次值
			logicId = logic.LogicId;
			logicId = logic.LogicId;
			timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]) / 3600;
			timeLong = int.Parse(logic.Conditions[0]["TriggerTime"]);
			}
			@@ -132,8 +132,8 @@
			///添加自动化图标的控件
			var addIconBtn = new Button
			{
			Width = Application.GetMinRealAverage(69),
			Height = Application.GetMinRealAverage(69),
			Width = Application.GetRealWidth(69),
			Height = Application.GetRealWidth(69),
			X = Application.GetRealWidth(890),
			Y = Application.GetRealHeight(60),
			UnSelectedImagePath = "ZigeeLogic/add.png",
			@@ -169,10 +169,10 @@
			actionsInfo.Add("LinkType", 8);
			actionsInfo.Add("DeviceAddr", Send.CurrentDoorLock.DeviceAddr);
			actionsInfo.Add("Epoint", "200");
			actionsInfo.Add("PassData", "055704010113");//默认门锁常关
			Dictionary<string, string> accounts = new Dictionary<string, string>();
			actionsInfo.Add("PassData", "055704010113");//默认门锁常关
			Dictionary<string, string> accounts = new Dictionary<string, string>();
			accounts.Add("Type", "8");
			accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr.ToString());//用于判断识别是哪个门锁;
			accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr.ToString());//用于判断识别是哪个门锁;
			accounts.Add("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString());
			//new一个新逻辑对象；
			//新增门锁常开模式自动化入口；
			@@ -181,7 +181,7 @@
			Common.Logic.CurrentLogic.LogicType = 2;//标记逻辑类型
			Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.openmode);
			Common.Logic.CurrentLogic.Conditions.Add(timeConditionsInfo);//添加条件
			Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//添加目标
			Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//添加目标
			Common.Logic.CurrentLogic.Accounts.Add(accounts);
			var oneLogic = new OneLogic();
			UserView.HomePage.Instance.AddChidren(oneLogic);
			@@ -254,8 +254,8 @@
			{
			X = Application.GetRealWidth(395),
			Y = Application.GetRealHeight(92),
			Width = Application.GetMinRealAverage(294),
			Height = Application.GetMinRealAverage(294),
			Width = Application.GetRealWidth(294),
			Height = Application.GetRealWidth(294),
			};
			fLayout.AddChidren(modeIconBtn);
			if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
			@@ -350,8 +350,8 @@
			var datetime = GetLocalTime(timeLong);
			///有时效性常开才显示时间条件文本
			year = datetime.Year.ToString();//那一年
			month = datetime.Month.ToString();//那一月
			days = int.Parse(datetime.ToString("dd"));//那一天
			month = datetime.Month.ToString();//那一月
			days = int.Parse(datetime.ToString("dd"));//那一天
			hour = int.Parse(datetime.ToString("HH"));//小时
			minute = datetime.Minute;//分钟
			timeLong = 0;
			@@ -406,8 +406,8 @@
			///下一级菜单图标控件
			var nextIconBtn = new Button
			{
			Width = Application.GetMinRealAverage(104),
			Height = Application.GetMinRealAverage(104),
			Width = Application.GetRealWidth(104),
			Height = Application.GetRealWidth(104),
			X = Application.GetRealWidth(861),
			Y = Application.GetRealHeight(17),
			UnSelectedImagePath = "ZigeeLogic/nextIconSone.png",
			@@ -458,8 +458,8 @@
			logicId = addResult;
			timeValue = int.Parse(str);
			Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
			ModeView();
			///添加APP开启常开模式的历史记录
			ModeView();
			///添加APP开启常开模式的历史记录
			UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
			}

			@@ -519,10 +519,10 @@
			if (logic.LogicType != 2)
			{
			continue;
			}
			if (SkipView.ExistLogic(logic, Send.CurrentDoorLock))
			{
			Common.Logic.SoneLogicList.Add(logic);
			}
			if (SkipView.ExistLogic(logic, Send.CurrentDoorLock))
			{
			Common.Logic.SoneLogicList.Add(logic);
			}
			}
			}
			@@ -591,7 +591,7 @@
			selectedRow = logicRow;
			};
			a++;
			///显示逻辑名称的控件
			///显示逻辑名称的控件
			var nameBtn = new Button
			{
			Height = Application.GetRealHeight(58),
			@@ -607,8 +607,8 @@
			///显示目标功能背景颜色的控件
			var typeBjBtn = new FrameLayout
			{
			Width = Application.GetMinRealAverage(82),
			Height = Application.GetMinRealAverage(82),
			Width = Application.GetRealWidth(82),
			Height = Application.GetRealWidth(82),
			X = Application.GetRealWidth(17),
			Y = Application.GetRealHeight(84),
			Radius = (uint)Application.GetMinRealAverage(41),
			@@ -618,16 +618,16 @@
			///显示目标功能图标的控件
			var typeIconBtn = new Button
			{
			Width = Application.GetMinRealAverage(58),
			Height = Application.GetMinRealAverage(58),
			Width = Application.GetRealWidth(58),
			Height = Application.GetRealWidth(58),
			Gravity = Gravity.Center,
			};
			typeBjBtn.AddChidren(typeIconBtn);
			///逻辑开关图标的控件
			var switchBtn = new Button
			{
			Width = Application.GetMinRealAverage(104),
			Height = Application.GetMinRealAverage(63),
			Width = Application.GetRealWidth(104),
			Height = Application.GetRealWidth(63),
			UnSelectedImagePath = "ZigeeLogic/logicclose.png",
			SelectedImagePath = "ZigeeLogic/logicopen.png",
			X = Application.GetRealWidth(815),
			@@ -707,19 +707,19 @@
			///删除点击事件
			del.MouseUpEventHandler += (sender, e) =>
			{
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
			var alert = new UserCenter.ShowMsgControl(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);
			};

			};
			};
			}
			}
			/// <summary>