~wjc/HomeApp.git

			@@ -13,7 +13,7 @@
			/// <summary>
			/// 其它界面跳进来的入口
			/// </summary>
			public static void SkipAddLogic(int intvalue,UserCenter.MemberInfoRes accountObj = null,DoorLock doorLock=null)
			public static void SkipAddLogic(int intvalue,DoorLock doorLock=null,UserCenter.MemberInfoRes accountObj = null)
			{
			/// 0.正常自动化;1.门锁自动化;2.门锁常开.关;
			switch (intvalue)
			@@ -56,22 +56,49 @@
			doorLockLogicList.Show();
			} break;
			case 2: {
			///进来刷新一次设备列表；
			Common.Logic.LogicDviceList.Clear();
			if (Common.Logic.LogicDviceList.Count == 0)
			{
			Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
			Common.Logic.LogicDviceList.Clear();
			if (Common.Logic.LogicDviceList.Count == 0)
			{
			Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
			}
			//读取系统当前时间：时-分
			int h =int.Parse(DateTime.Now.ToString("hh"));
			int m = int.Parse(DateTime.Now.ToString("mm"));
			//默认一个时间段(开始时间为:系统当前，结束时间为:开始时间+1个时间)
			Dictionary<string, string> timeDictionary = new Dictionary<string, string>();
			timeDictionary.Add("Type", "5");
			timeDictionary.Add("IsValid", "1");
			timeDictionary.Add("StartHour", h.ToString());
			timeDictionary.Add("StartMin", m.ToString());
			if (h + 1 == 24)
			{
			//结束时间超出24小时处理方法;
			timeDictionary.Add("StopHour", h.ToString());
			timeDictionary.Add("StopMin", "59");
			}
			else
			{
			timeDictionary.Add("StopHour", (h + 1).ToString());
			timeDictionary.Add("StopMin", m.ToString());
			}
			Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
			actionsInfo.Add("LinkType", 8);
			actionsInfo.Add("DeviceAddr", doorLock.DeviceAddr);
			actionsInfo.Add("Epoint", doorLock.DeviceEpoint);
			actionsInfo.Add("PassData", "055704010112");//默认门锁常开

			//new一个新逻辑对象；
			//新增门锁常开模式自动化入口；
			Common.Logic.CurrentLogic = new Common.Logic();
			Common.Logic.CurrentLogic.IsEnable = 1;//默认为开
			Common.Logic.CurrentLogic.LogicType = 2;//标记逻辑类型
			Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.openmode);
			var logicCommunalPage = new LogicCommunalPage();
			UserView.HomePage.Instance.AddChidren(logicCommunalPage);
			Common.Logic.CurrentLogic.Conditions.Add(timeDictionary);//添加条件
			Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//添加目标
			var oneLogic = new OneLogic();
			UserView.HomePage.Instance.AddChidren(oneLogic);
			UserView.HomePage.Instance.PageIndex += 1;
			logicCommunalPage.Show(() => { });
			oneLogic.Show(false);
			} break;
			}

			@@ -455,14 +482,26 @@
			TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
			};
			logicRowlayout.AddRightView(edit);
			if (logic.LogicType==2) {
			edit.TextID=MyInternationalizationString.look;
			}
			edit.MouseUpEventHandler += (sender, e) =>
			{
			Common.Logic.CurrentLogic = logic;
			var logicCommunalPage = new LogicCommunalPage();
			HomePage.Instance.AddChidren(logicCommunalPage);
			HomePage.Instance.PageIndex += 1;
			logicCommunalPage.Show(() => { logicnameBtn.Text = logic.LogicName; Automationview(refresview, no); });

			if (Common.Logic.CurrentLogic.LogicType == 2)
			{
			var oneLogic = new OneLogic();
			UserView.HomePage.Instance.AddChidren(oneLogic);
			UserView.HomePage.Instance.PageIndex += 1;
			oneLogic.Show(true);
			}
			else
			{
			var logicCommunalPage = new LogicCommunalPage();
			HomePage.Instance.AddChidren(logicCommunalPage);
			HomePage.Instance.PageIndex += 1;
			logicCommunalPage.Show(() => { logicnameBtn.Text = logic.LogicName; Automationview(refresview, no); });
			}
			};

			///删除
			@@ -658,87 +697,112 @@
			#endregion

			/// <summary>
			/// 门锁取消设置用的方法
			/// 门锁取消设置用的方法(相当一个关闭常开模式按钮,分类-自动化-不需要显示该自动化)
			/// </summary>
			/// <param name="timeVlaue">时间值</param>
			/// <param name="common">设备</param>
			/// <returns></returns>
			public static void LockAddModifyLogic(int timeVlaue, CommonDevice common)
			public static void LockAddModifyLogic(int timeVlaue, CommonDevice common)
			{

			//读取系统当前时间：时-分
			var h = DateTime.Now.ToString("hh");
			var m = DateTime.Now.ToString("mm");
			Dictionary<string, string> timeConditionsInfo = new Dictionary<string, string>();
			timeConditionsInfo.Add("Type", "0");
			timeConditionsInfo.Add("IsValid", "1");
			timeConditionsInfo.Add("DateType", "0");
			timeConditionsInfo.Add("RemindTime", "0");
			timeConditionsInfo.Add("EnDelay", "0");
			timeConditionsInfo.Add("DelayTime", "0");
			timeConditionsInfo.Add("StartHour", timeVlaue.ToString());
			timeConditionsInfo.Add("StartMin", "0");
			timeConditionsInfo.Add("DelayTime", "0");
			timeConditionsInfo.Add("StartHour", h);
			timeConditionsInfo.Add("StartMin", m);
			timeConditionsInfo.Add("DoorLockOpenDelayTime", timeVlaue.ToString());
			Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
			actionsInfo.Add("LinkType", 8);
			actionsInfo.Add("DeviceAddr", common.DeviceAddr);
			actionsInfo.Add("Epoint", common.DeviceEpoint);
			actionsInfo.Add("PassData", "055704010112");//默认门锁常开
			actionsInfo.Add("PassData", "055704010113");//默认门锁常关

			Common.Logic currentLogic = new Common.Logic();
			currentLogic.IsEnable = 1;//默认为开
			currentLogic.TimeAttribute.Repeat = 0;//执行一次
			currentLogic.LogicType = 2;//标记逻辑类型
			currentLogic.LogicType = 3;//标记逻辑类型
			currentLogic.LogicName = Language.StringByID(R.MyInternationalizationString.openmode);
			currentLogic.Conditions.Add(timeConditionsInfo);
			currentLogic.Actions.Add(actionsInfo);
			//修改或者添加是根据逻辑id值（0新增；1，修改）
			Exist(3);//查找是否存在设置过失效时间(有的话删除，再添加)
			Send.AddModifyLogic(currentLogic);

			}

			///<summary>
			/// 门锁删除逻辑
			/// s-one门锁是否存在自动化的方法(true为存在)
			/// </summary>
			public static async void LockDelLogic(CommonDevice common)
			public static async System.Threading.Tasks.Task<bool> Exist(int valueInt=2)
			{
			int logicId = 0;
			bool exist = false;
			var Idlist = await Send.GetLogicId(valueInt);
			if (Idlist.Count != 0)
			{
			if (valueInt==3) {
			for (int i = 0; i < Idlist.Count; i++)
			{
			//valueInt=3一条特殊的自动化(用来设置失效时间)
			Send.DelLogic(Idlist[i]);
			}
			}
			exist = true;
			}
			return exist;
			}

			///<summary>
			/// s-one门锁确认取消(使满足条件所有逻辑失能一次)发送的方法
			/// </summary>
			public static async void LockCloseLogic(CommonDevice common)
			{
			//读取系统当前时间：时-分
			int h =int.Parse(DateTime.Now.ToString("hh"));
			int m= int.Parse(DateTime.Now.ToString("mm"));
			//转化为多少分钟;
			int s = h * 60 + m;
			var logicList = new List<Common.Logic>();
			logicList.Clear();
			var Idlist = await Send.GetLogicId(2);
			if (Idlist.Count != 0)
			{ //先去读取网关看是否存在数据;
			var listlogic = await Send.ReadList(Idlist.Count, 2);
			for (int j = 0; j < listlogic.Count; j++)
			var list = await Send.ReadList(Idlist.Count, 2);
			for (int j = 0; j < list.Count; j++)
			{
			var logic = listlogic[j];
			foreach (var actions in logic.Actions)
			var logic = list[j];
			foreach (var conditions in logic.Conditions)
			{
			var linkType = actions["LinkType"].ToString();
			if (linkType != "8")
			var linkType = conditions["Type"];
			if (linkType == "5")
			{
			//用户有可能在自动化那里再次编辑;
			//必须过滤掉不需要的信息(输出功能延时:是没有DeviceAddr和Epoint),否则有异常;
			continue;
			int startMin = int.Parse(conditions["StartMin"]);
			int startHour = int.Parse(conditions["StartHour"]);
			int stopMin = int.Parse(conditions["StopMin"]);
			int stopHour = int.Parse(conditions["StopHour"]);
			int s1 = startMin + startHour * 60;//开始时间值
			int s2 = stopMin + stopHour * 60;//结束时间值
			if (s >= s1&&s<=s2)
			{
			//查找系统时间值是否属于这个范围；
			logicList.Add(logic);
			}
			}
			var obj1 = actions["DeviceAddr"].ToString();
			var obj2 = actions["Epoint"].ToString();
			if (common.DeviceAddr == obj1 && common.DeviceEpoint.ToString() == obj2)
			{
			logicId = logic.LogicId;
			break;
			//找到跳出循环体
			}

			}
			if (logicId != 0)
			{
			break;
			//找到跳出循环体
			}

			}
			}
			if (logicId == 0)
			foreach (var logic in logicList)
			{
			//没有找到logicId删除没有意义;
			return;
			logic.IsEnable = 3;//改变逻辑使能状态;
			//用foreach发送命令；
			Send.AddModifyLogic(logic);
			}
			Send.DelLogic(logicId);
			}

			}
			}