~wjc/HomeApp.git

			@@ -60,11 +60,12 @@
			this.AddChidren(middle);
			#endregion
			//是常开模式再去读取

			if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
			{
			//进来更新一次
			//查找是否存在时效性自动化；有的话就返回自动化对象;
			var logic = await SkipView.GetLogicIfon();
			var logic = await SkipView.GetLogicIfon(Send.CurrentDoorLock);
			if (logic != null)
			{
			try
			@@ -163,6 +164,10 @@
			actionsInfo.Add("DeviceAddr", Send.CurrentDoorLock.DeviceAddr);
			actionsInfo.Add("Epoint", "200");
			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("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString());
			//new一个新逻辑对象；
			//新增门锁常开模式自动化入口；
			Common.Logic.CurrentLogic = new Common.Logic();
			@@ -171,6 +176,7 @@
			Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.openmode);
			Common.Logic.CurrentLogic.Conditions.Add(timeConditionsInfo);//添加条件
			Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//添加目标
			Common.Logic.CurrentLogic.Accounts.Add(accounts);
			var oneLogic = new OneLogic();
			UserView.HomePage.Instance.AddChidren(oneLogic);
			UserView.HomePage.Instance.PageIndex += 1;
			@@ -304,16 +310,19 @@
			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 h = int.Parse(DateTime.Now.ToString("HH"));//小时
			int dayInt = (h + timeValue) / 24;//算出几天后执行
			int hour = (h + timeValue) % 24;//算出几天后那个时间执行
			int days = int.Parse(d) + dayInt;
			int minute = DateTime.Now.Minute;//分钟
			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;
			string text5 = Language.StringByID(MyInternationalizationString.hour1);
			string text6 = Language.StringByID(MyInternationalizationString.executeSone);
			// timeTextBtn.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
			timeTextBtn.Text = text1 + m + text3 + days.ToString() + text4 + hour.ToString() + text5 + minute.ToString() + text6;
			}


			@@ -371,59 +380,58 @@
			{

			LogicView.TipView.ShowConfrimTip(() =>

			{///再次确认
			LogicView.TipView.ShowInputTip(true, async (str) =>
			{///确认发送命令
			CommonPage.Loading.Start();
			try
			{
			///xm
			var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
			if (!result)
			{
			LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed));
			return;
			}
			else
			{
			///因为有常开模式下才可以创建失效逻辑；
			SkipView.GetLogicAll();//删除之前所有失效逻辑
			var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//添加一条失效逻辑
			if (addResult == 0)
			{
			///可欣说如果常开模式开，创建自动化失败，那么将要发一条常开模式关闭命令;
			UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
			///提示失败
			LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
			return;
			}
			else
			{
			logicId = addResult;
			timeValue = int.Parse(str);
			Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
			ModeView();
			///添加APP开启常开模式的历史记录
			UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock,9001,string.Empty);
			}
			LogicView.TipView.ShowInputTip(true, async (str) =>
			{///确认发送命令
			CommonPage.Loading.Start();
			try
			{
			///xm
			var result = await UserCenter.DoorLock.DoorLockCommonInfo.SetNormallyOpenModeFuncAsync(Send.CurrentDoorLock);
			if (!result)
			{
			LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.openFailed));
			return;
			}
			else
			{
			///因为有常开模式下才可以创建失效逻辑；
			SkipView.GetLogicAll(Send.CurrentDoorLock);//删除之前所有失效逻辑
			var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//添加一条失效逻辑
			if (addResult == 0)
			{
			///可欣说如果常开模式开，创建自动化失败，那么将要发一条常开模式关闭命令;
			UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
			///提示失败
			LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
			return;
			}
			else
			{
			logicId = addResult;
			timeValue = int.Parse(str);
			Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
			ModeView();
			///添加APP开启常开模式的历史记录
			UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
			}


			}
			}
			catch
			{
			}
			}
			catch
			{

			}
			finally
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			}
			finally
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();

			});
			}
			});
			});
			}
			});

			});

			@@ -460,9 +468,12 @@
			{
			continue;
			}
			Common.Logic.SoneLogicList.Add(logic);
			if (SkipView.ExistLogic(logic, Send.CurrentDoorLock))
			{
			Common.Logic.SoneLogicList.Add(logic);
			}
			}
			}
			}
			}
			}
			catch (Exception e)
			@@ -490,6 +501,10 @@
			verticalRefresh.RemoveAll();
			foreach (var logic in Common.Logic.SoneLogicList)
			{
			if (!SkipView.ExistLogic(logic, Send.CurrentDoorLock))
			{
			continue;
			}
			#region 自动化布局View
			///自动化父控件
			var fLayoutLogic = new FrameLayout
			@@ -580,7 +595,7 @@
			TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
			};
			logicRow.AddRightView(edit);


			///删除
			var del = new Button
			{
			@@ -613,6 +628,7 @@
			else
			{
			//逻辑关
			logic.IsEnable = 0;
			typeIconBtn.UnSelectedImagePath = "ZigeeLogic/nofunction.png";
			typeBjBtn.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
			}