~wjc/HomeApp.git

			@@ -16,11 +16,7 @@
			{
			Tag = "SoneLogic";
			}
			/// <summary>
			///
			/// </summary>
			/// <param name="action">给徐梅刷新界面用的</param>
			/// <param name="bool_If"></param>
			/// 给徐梅刷新界面用的
			public Action<bool> action;
			public async void Show()
			{
			@@ -33,13 +29,11 @@
			view.clickBtn.MouseDownEventHandler += (sender, e) =>
			{
			UserView.HomePage.Instance.ScrollEnabled = true;
			RemoveFromParent();
			if (action != null)
			{
			action(Send.CurrentDoorLock.IsDoorLockNormallyMode);
			}

			RemoveFromParent();

			};

			var middle = new FrameLayout
			@@ -67,8 +61,6 @@
			Y = Application.GetRealHeight(92),
			Width = Application.GetMinRealAverage(294),
			Height = Application.GetMinRealAverage(294),
			UnSelectedImagePath = "ZigeeLogic/noMode.png",
			SelectedImagePath = "ZigeeLogic/openMode.png",
			};
			fLayout.AddChidren(modeIconBtn);

			@@ -78,7 +70,7 @@
			var logic = await SkipView.GetLogicIfon();

			fLayout.Height = Application.GetRealHeight(780);//改变高度
			modeIconBtn.IsSelected = true;//改变图标状态
			modeIconBtn.UnSelectedImagePath = "ZigeeLogic/openMode.png";//改变图标状态
			///第二级父控件
			var openModeFl = new FrameLayout
			{
			@@ -116,11 +108,12 @@
			var soneLogicList = new SoneLogicList();
			UserView.HomePage.Instance.AddChidren(soneLogicList);
			UserView.HomePage.Instance.PageIndex += 1;
			soneLogicList.Show();
			soneLogicList.Show();
			soneLogicList.action = action;
			}
			else
			{
			LogicView.TipView.ShowFlashTip("关闭失败");
			LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.closeFailed));
			}

			};
			@@ -129,12 +122,11 @@
			var timeTextBtn = new Button
			{
			Y = Application.GetRealHeight(127 + 69),
			X = Application.GetRealWidth(225),
			Width = Application.GetRealWidth(634),
			X = Application.GetRealWidth(125),
			Width = Application.GetRealWidth(634+200),
			Height = Application.GetRealHeight(60),
			TextSize = 15,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			Text = "时效性常开设置12:20",
			};
			if (logic != null)
			{
			@@ -144,15 +136,21 @@
			///时效性常开只有一个条件;
			try
			{
			var y = DateTime.Now.ToString("yy");//那一年
			var m = DateTime.Now.ToString("mm");//那一月

			var y = DateTime.Now.Year.ToString();//那一年
			var m = DateTime.Now.Month.ToString();//那一月
			var d = DateTime.Now.ToString("dd");//那一天
			var h = int.Parse(DateTime.Now.ToString("HH"));//当前系统时间
			var me = DateTime.Now.ToLongDateString();
			var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
			int dayInt = (h + timeInt) / 24;//算出几天后执行
			int hour = (h + timeInt) % 24;//算出几天后那个时间执行
			timeTextBtn.Text = "时效性常开设置" + y + "年" + m + "月" + d + dayInt + "号" + timeInt + "时" + "执行";
			int days = int.Parse(d) + dayInt;
			string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
			string text2= Language.StringByID(MyInternationalizationString.yearSone);
			string text3 = Language.StringByID(MyInternationalizationString.monthSone);
			string text4= Language.StringByID(MyInternationalizationString.numberSone);
			string text5= Language.StringByID(MyInternationalizationString.executeSone);
			timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
			}
			catch { }

			@@ -160,7 +158,7 @@
			else
			{
			fLayout.Height = Application.GetRealHeight(645);//改变高度
			modeIconBtn.IsSelected = false;//改变图标状态
			modeIconBtn.UnSelectedImagePath = "ZigeeLogic/noMode.png";//改变图标状态
			///第二级父控件
			var modeFl = new FrameLayout
			{
			@@ -215,7 +213,7 @@
			var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
			if (!result)
			{
			LogicView.TipView.ShowFlashTip("开启失败");
			LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed));
			return;
			}
			else
			@@ -225,8 +223,10 @@
			var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//添加一条失效逻辑
			if (!addResult)
			{
			///可欣说如果常开模式开，创建自动化失败，那么将要发一条常开模式关闭命令;
			UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
			///提示失败
			LogicView.TipView.ShowFlashTip("添加失败");
			LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
			return;
			}
			Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
			@@ -235,6 +235,13 @@
			UserView.HomePage.Instance.AddChidren(soneLogicList);
			UserView.HomePage.Instance.PageIndex += 1;
			soneLogicList.Show();
			soneLogicList.action= action;
			//soneLogicList.action += (c) => {
			// if (action != null)
			// {
			// action(Send.CurrentDoorLock.IsDoorLockNormallyMode);
			// }
			//};

			}
			}
			@@ -398,7 +405,7 @@
			/// </summary>
			/// <param name="verticalRefresh"></param>
			RowLayout selectedRow = new RowLayout() { Tag = "0" };//记录左滑状态
			int i = 1;
			int a = 1;
			private void RefreshView(VerticalRefreshLayout verticalRefresh)
			{
			verticalRefresh.RemoveAll();
			@@ -418,7 +425,7 @@
			LineColor = ZigbeeColor.Current.LogicBackgroundColor,
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			SubViewWidth = Application.GetRealWidth(184),//改变编辑控件宽度多少；
			Tag = i.ToString(),
			Tag = a.ToString(),
			};
			fLayout.AddChidren(logicRow);
			//左滑菜单事件
			@@ -430,7 +437,7 @@
			}
			selectedRow = logicRow;
			};
			i++;
			a++;
			///显示逻辑名称的控件
			var nameBtn = new Button
			{