~wjc/HomeApp.git

			@@ -14,6 +14,7 @@
			{
			Tag = "SoneLogic";
			soneLogicList = this;

			}
			/// 给徐梅刷新界面用的
			public Action<bool> action;
			@@ -29,8 +30,17 @@
			FrameLayout listLogicFl = new FrameLayout();
			///常开自动化列表上下滑动的控件
			VerticalRefreshLayout verticalRefresh = new VerticalRefreshLayout();
			/// <summary>
			/// 记录逻辑id
			/// </summary>
			public int logicId = 0;
			/// <summary>
			/// 记录选中时间
			/// </summary>
			public int timeValue = 0;
			public async void Show()
			{

			#region 界面的布局代码
			UserView.HomePage.Instance.ScrollEnabled = false;//锁住左滑
			TopView view = new TopView();
			@@ -56,6 +66,23 @@
			};
			this.AddChidren(middle);
			#endregion
			//是常开模式再去读取
			if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
			{
			//进来更新一次
			//查找是否存在时效性自动化；有的话就返回自动化对象;
			var logic = await SkipView.GetLogicIfon();
			if (logic != null)
			{
			try
			{
			//进来更新一次值
			logicId = logic.LogicId;
			timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
			}
			catch { }
			}
			}

			#region 常开模式图标时效性常开设置
			///第二块第一级父控件
			@@ -92,7 +119,6 @@
			modeFl.AddChidren(button2);
			ModeView();
			#endregion

			#region 常开自动化
			///第三块第一级父控件
			listLogicFl = new FrameLayout
			@@ -225,9 +251,6 @@

			if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
			{
			/// 查找是否存在时效性自动化；有的话就返回自动化对象;
			var logic = await SkipView.GetLogicIfon();

			fLayout.Height = Application.GetRealHeight(780);//改变高度
			modeIconBtn.UnSelectedImagePath = "ZigeeLogic/openMode.png";//改变图标状态
			modeFl.Y = modeIconBtn.Bottom + Application.GetRealHeight(64);
			@@ -257,11 +280,10 @@
			var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
			if (result)
			{
			if (logic != null)
			if (logicId != 0)
			{
			///有可能只有常开模式，没有时效性自动化
			///没有判断的话，逻辑会为空，抛出异常;
			Send.DelLogic(logic.LogicId);
			Send.DelLogic(logicId);
			}
			Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
			ModeView();
			@@ -281,7 +303,7 @@
			});
			}
			};
			if (logic != null)
			if (logicId != 0)
			{
			///显示失效设置时间文本控件
			button2.Y = Application.GetRealHeight(127 + 69);
			@@ -296,9 +318,8 @@
			var m = DateTime.Now.Month.ToString();//那一月
			var d = DateTime.Now.ToString("dd");//那一天
			var h = int.Parse(DateTime.Now.ToString("HH"));//当前系统时间
			var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
			int dayInt = (h + timeInt) / 24;//算出几天后执行
			int hour = (h + timeInt) % 24;//算出几天后那个时间执行
			int dayInt = (h + timeValue) / 24;//算出几天后执行
			int hour = (h + timeValue) % 24;//算出几天后那个时间执行
			int days = int.Parse(d) + dayInt;
			string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
			string text2 = Language.StringByID(MyInternationalizationString.yearSone);
			@@ -307,7 +328,8 @@
			string text5 = Language.StringByID(MyInternationalizationString.executeSone);
			button2.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
			}
			else {
			else
			{
			button2.Y = Application.GetRealHeight(0);
			button2.X = Application.GetRealWidth(0);
			button2.Width = Application.GetRealWidth(0);
			@@ -362,7 +384,6 @@
			try
			{
			///xm

			var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
			if (!result)
			{
			@@ -374,7 +395,7 @@
			///因为有常开模式下才可以创建失效逻辑；
			SkipView.GetLogicAll();//删除之前所有失效逻辑
			var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//添加一条失效逻辑
			if (!addResult)
			if (addResult == 0)
			{
			///可欣说如果常开模式开，创建自动化失败，那么将要发一条常开模式关闭命令;
			UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
			@@ -382,8 +403,13 @@
			LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
			return;
			}
			else
			{
			logicId = addResult;
			timeValue = int.Parse(str);
			Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
			ModeView();
			}


			}
			@@ -556,10 +582,7 @@
			TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
			};
			logicRow.AddRightView(edit);
			if (logic.LogicType == 2)
			{
			edit.TextID = MyInternationalizationString.look;
			}

			///删除
			var del = new Button
			{