~wjc/HomeApp.git

			@@ -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,19 +59,17 @@
			doorLockLogicList.Show();
			}
			break;


			}

			}


			#region ◆ 自动化__________________________
			/// <summary>
			/// 自动化功能代码入口
			/// </summary>
			public static void ShowAutotionView(FrameLayout functionSceneAutoBodyView)
			{
			// functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
			//functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
			#region ---推荐模板的组件
			//推荐模板背景控件
			var bjFrameLayout = new FrameLayout
			@@ -242,8 +239,7 @@
			logicScrolView.BeginHeaderRefreshingAction += () =>
			{
			if (!Config.Instance.Home.IsVirtually)
			{
			//虚拟的不获取网关逻辑列表
			{//虚拟的不获取网关逻辑列表
			//重新刷新logic列表
			Common.Logic.LogicList.Clear();
			Read(logicScrolView, no);
			@@ -262,6 +258,14 @@
			/// <param name="logicScrolView"></param>
			private static async void Read(VerticalRefreshLayout logicScrolView, bool no)
			{
			//if (Config.Instance.HomeId != UserCenter.UserCenterResourse.AccountOption.OldHomeStringId)
			//{
			// //切换住宅清除之前缓存数据;
			// Common.Logic.LogicList.Clear();
			// Common.Logic.LockLogicList.Clear();
			// Common.Logic.SoneLogicList.Clear();
			//}

			CommonPage.Loading.Start();
			try
			{
			@@ -696,7 +700,7 @@
			/// <param name="timeVlaue">时间值</param>
			/// <param name="common">设备</param>
			/// <returns></returns>
			public static async System.Threading.Tasks.Task<bool> LockAddModifyLogic(int timeVlaue, CommonDevice common)
			public static async System.Threading.Tasks.Task<int> LockAddModifyLogic(int timeVlaue, CommonDevice common)
			{
			//读取系统当前时间：时-分
			var h = DateTime.Now.ToString("HH");
			@@ -709,13 +713,26 @@
			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>();
			accounts.Add("Type", "8");
			accounts.Add("Option4", common.DeviceAddr.ToString());//用于判断识别是哪个门锁;
			accounts.Add("Option2", common.DeviceEpoint.ToString());

			Common.Logic currentLogic = new Common.Logic();
			currentLogic.IsEnable = 1;//默认为开
			@@ -724,14 +741,15 @@
			currentLogic.LogicName = Language.StringByID(R.MyInternationalizationString.openmode);
			currentLogic.Conditions.Add(timeConditionsInfo);
			currentLogic.Actions.Add(actionsInfo);
			currentLogic.Accounts.Add(accounts);
			var logicIfon = await Send.AddModifyLogic(currentLogic);
			if (logicIfon != null && logicIfon.LogicId != 0)
			{
			//添加门锁失效时间的历史记录
			UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog((DoorLock)common, 9003, timeVlaue.ToString());
			return true;//表示添加成功;
			return logicIfon.LogicId;//表示添加成功;
			}
			return false;//表示添加失败;
			return 0;//表示添加失败;

			}

			@@ -740,24 +758,37 @@
			/// 注意(参数:2-常开自动化;3-失效时间自动化);
			/// 返回值：0不存在;其它值都存在;
			/// </summary>
			public static async System.Threading.Tasks.Task<int> Exist(int valueInt)
			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
			exist = Idlist[0];
			for (int i = 0; i < IdList.Count; i++)
			{
			var id = IdList[i];
			var logic = await Send.GetLogic(id, valueInt);
			if (logic != null)
			{
			if (ExistLogic(logic, doorLock))
			{
			exist = id;
			///找到退出
			break;
			}
			}

			}
			}
			return exist;
			}

			///<summary>
			///获取逻辑信息
			///获取门锁时效性逻辑信息
			/// 返回值：null不存在;其它值都存在;
			/// </summary>
			public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon()
			public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon(ZigBee.Device.DoorLock doorLock)
			{
			Common.Logic logic = null;
			var Idlist = await Send.GetLogicId(3);
			@@ -766,33 +797,71 @@
			//默认取第一个逻辑ID(时效性只有一条逻辑)
			int exist = Idlist[0];
			logic = await Send.GetLogic(exist, 3);
			if (!ExistLogic(logic, doorLock))
			{
			logic = null;
			}
			}
			return logic;
			}

			///<summary>
			///删除所有时效性自动化
			///删除该门锁所有时效性自动化
			/// 返回值：true成功;false失败;
			/// </summary>
			public static async System.Threading.Tasks.Task<bool> GetLogicAll()
			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];
			//本来只有一条时效性自动化，
			//防止特殊情况,找到就删除掉;
			Send.DelLogic(id);
			var logic = await Send.GetLogic(id, 3);
			if (logic != null)
			{
			if (ExistLogic(logic, doorLock))
			{
			//本来只有一条时效性自动化，
			//防止特殊情况,找到就删除掉;
			//var valueInt = await Send.DelLogic(id);
			//if (valueInt == 0)
			//{
			// _if = true;
			//}
			//(考虑性能默认删除成功，直接返回成功结果true)
			_if = true;
			Send.DelLogic(id);


			}
			}
			}
			}
			return _if;
			}


			/// <summary>
			/// 查找这一条自动化是否属于该门锁
			/// </summary>
			/// <returns></returns>
			public static bool ExistLogic(Common.Logic logic, ZigBee.Device.DoorLock doorLock)
			{
			for (int j = 0; j < logic.Accounts.Count; j++)
			{
			//Option4是设备mac；
			if (logic.Accounts[j]["Option4"].ToString() == doorLock.DeviceAddr)
			{
			//查找是否是那个门锁；
			//如果不是该门锁联动事件不显示出来;
			return true;
			}

			}
			return false;
			}

			}
			}