~wjc/HomeApp.git

old mode 100644 new mode 100755

			@@ -13,7 +13,7 @@
			/// <summary>
			/// 其它界面跳进来的入口
			/// </summary>
			public static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null)
			public async static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null)
			{
			/// 0.正常自动化;1.门锁自动化;2.Sone门锁;
			switch (intvalue)
			@@ -30,7 +30,6 @@
			UserView.HomePage.Instance.AddChidren(addLogicPage);
			UserView.HomePage.Instance.PageIndex += 1;
			addLogicPage.Show();

			}
			break;
			case 1:
			@@ -60,13 +59,12 @@
			doorLockLogicList.Show();
			}
			break;


			}

			}


			#region ◆ 自动化__________________________
			public static bool If_once = true;//进来只读一次标识;
			/// <summary>
			/// 自动化功能代码入口
			/// </summary>
			@@ -244,6 +242,7 @@
			if (!Config.Instance.Home.IsVirtually)
			{//虚拟的不获取网关逻辑列表
			//重新刷新logic列表
			If_once = true;
			Common.Logic.LogicList.Clear();
			Read(logicScrolView, no);
			}
			@@ -274,35 +273,39 @@
			{
			if (!Config.Instance.Home.IsVirtually)//虚拟的不获取网关逻辑列表
			{
			if (Common.Logic.LogicList.Count == 0)
			{
			var Idlist1 = await Send.GetLogicId(0);//
			var Idlist2 = await Send.GetLogicId(2);//门锁常开模式
			if (Idlist1.Count != 0)
			{
			var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
			for (int j = 0; j < listlogic1.Count; j++)
			{
			var logic = listlogic1[j];
			if (logic.LogicType != 0)
			{
			continue;
			}
			Common.Logic.LogicList.Add(logic);
			}
			}
			if (Idlist2.Count != 0)
			{
			var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
			for (int j = 0; j < listlogic2.Count; j++)
			{
			var logic = listlogic2[j];
			if (logic.LogicType != 2)
			{
			continue;
			}
			Common.Logic.LogicList.Add(logic);
			}
			if (If_once)
			{
			if (Common.Logic.LogicList.Count == 0)
			{
			If_once = false;
			var Idlist1 = await Send.GetLogicId(0);//
			var Idlist2 = await Send.GetLogicId(2);//门锁常开模式
			if (Idlist1.Count != 0)
			{
			var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
			for (int j = 0; j < listlogic1.Count; j++)
			{
			var logic = listlogic1[j];
			if (logic.LogicType != 0)
			{
			continue;
			}
			Common.Logic.LogicList.Add(logic);
			}
			}
			if (Idlist2.Count != 0)
			{
			var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
			for (int j = 0; j < listlogic2.Count; j++)
			{
			var logic = listlogic2[j];
			if (logic.LogicType != 2)
			{
			continue;
			}
			Common.Logic.LogicList.Add(logic);
			}
			}
			}
			}
			}
			@@ -716,12 +719,20 @@
			timeConditionsInfo.Add("EnDelay", "0");
			timeConditionsInfo.Add("DelayTime", "0");
			timeConditionsInfo.Add("StartHour", h);
			timeConditionsInfo.Add("StartMin", m);
			timeConditionsInfo.Add("DoorLockOpenDelayTime", timeVlaue.ToString());
			timeConditionsInfo.Add("StartMin", m);
			if (UserCenter.UserCenterResourse.HideOption.DoorLockNomallyOpenTimeMode == 1)
			{
			//强制变更时间模式为分钟
			timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 60).ToString());
			}
			else
			{
			timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 3600).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("Epoint", "200");
			actionsInfo.Add("PassData", "055704010113");//默认门锁常关

			Dictionary<string, string> accounts = new Dictionary<string, string>();
			@@ -755,37 +766,32 @@
			/// </summary>
			public static async System.Threading.Tasks.Task<int> Exist(int valueInt, ZigBee.Device.DoorLock doorLock)
			{

			int exist = 0;
			var Idlist = await Send.GetLogicId(valueInt);
			if (Idlist.Count != 0)
			var IdList = await Send.GetLogicId(valueInt);
			if (IdList.Count != 0)
			{
			//默认取第一个逻辑ID
			var id = Idlist[0];
			if (valueInt != 3)
			for (int i = 0; i < IdList.Count; i++)
			{
			exist = id;
			}
			else
			{
			var logic = await Send.GetLogic(id, 3);
			var id = IdList[i];
			var logic = await Send.GetLogic(id, valueInt);
			if (logic != null)
			{
			if (ExistLogic(logic, doorLock))
			{
			exist = id;
			}
			else
			{
			exist = 0;
			///找到退出
			break;
			}
			}

			}
			}
			return exist;
			}

			///<summary>
			///获取门锁逻辑信息
			///获取门锁时效性逻辑信息
			/// 返回值：null不存在;其它值都存在;
			/// </summary>
			public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon(ZigBee.Device.DoorLock doorLock)
			@@ -809,14 +815,12 @@
			///删除该门锁所有时效性自动化
			/// 返回值：true成功;false失败;
			/// </summary>
			public static async System.Threading.Tasks.Task<bool> GetLogicAll(ZigBee.Device.DoorLock doorLock)
			public static async System.Threading.Tasks.Task<bool> DelAllLogic(ZigBee.Device.DoorLock doorLock)
			{
			bool _if = false;
			var Idlist = await Send.GetLogicId(3);
			if (Idlist.Count != 0)
			{
			_if = true;

			for (int i = 0; i < Idlist.Count; i++)
			{
			int id = Idlist[i];
			@@ -827,7 +831,16 @@
			{
			//本来只有一条时效性自动化，
			//防止特殊情况,找到就删除掉;
			//var valueInt = await Send.DelLogic(id);
			//if (valueInt == 0)
			//{
			// _if = true;
			//}
			//(考虑性能默认删除成功，直接返回成功结果true)
			_if = true;
			Send.DelLogic(id);


			}
			}
			}
			@@ -841,22 +854,18 @@
			/// <returns></returns>
			public static bool ExistLogic(Common.Logic logic, ZigBee.Device.DoorLock doorLock)
			{
			bool yes = false;
			for (int j = 0; j < logic.Accounts.Count; j++)
			{
			//Option4是设备mac；Option2是设备端口；
			if (logic.Accounts[j]["Option4"].ToString() != doorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != doorLock.DeviceEpoint.ToString())
			//Option4是设备mac；
			if (logic.Accounts[j]["Option4"].ToString() == doorLock.DeviceAddr)
			{
			//查找是否是那个门锁；
			//如果不是该门锁联动事件不显示出来;
			yes = false;
			return true;
			}
			else
			{
			yes = true;
			}

			}
			return yes;
			return false;
			}

			}