~wjc/HomeApp.git

			@@ -20,34 +20,16 @@
			{
			case 0:
			{
			///Sone门锁主入口
			if (doorLock == null)
			{
			///防止抛异常
			doorLock = new DoorLock();
			}
			Send.CurrentDoorLock = doorLock;
			///进来刷新一次设备列表；
			Common.Logic.LogicDviceList.Clear();
			if (Common.Logic.LogicDviceList.Count == 0)
			{
			Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
			}
			var addLogicPage = new SoneLogicList();
			//new一个新逻辑对象；
			//新增正常自动化入口
			Common.Logic.CurrentLogic = new Common.Logic();
			Common.Logic.CurrentLogic.IsEnable = 1;//默认为开
			Common.Logic.CurrentLogic.LogicType = 0;//标记逻辑类型
			Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
			var addLogicPage = new AddLogicPage();
			UserView.HomePage.Instance.AddChidren(addLogicPage);
			UserView.HomePage.Instance.PageIndex += 1;
			addLogicPage.Show();

			////new一个新逻辑对象；
			////新增正常自动化入口
			//Common.Logic.CurrentLogic = new Common.Logic();
			//Common.Logic.CurrentLogic.IsEnable = 1;//默认为开
			//Common.Logic.CurrentLogic.LogicType = 0;//标记逻辑类型
			//Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
			//var addLogicPage = new AddLogicPage();
			//UserView.HomePage.Instance.AddChidren(addLogicPage);
			//UserView.HomePage.Instance.PageIndex += 1;
			//addLogicPage.Show();

			}
			break;
			@@ -78,33 +60,12 @@
			doorLockLogicList.Show();
			}
			break;
			case 2:
			{
			///Sone门锁主入口
			if (doorLock == null)
			{
			///防止抛异常
			doorLock = new DoorLock();
			}
			Send.CurrentDoorLock = doorLock;
			///进来刷新一次设备列表；
			Common.Logic.LogicDviceList.Clear();
			if (Common.Logic.LogicDviceList.Count == 0)
			{
			Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
			}
			var addLogicPage = new SoneLogicList();
			UserView.HomePage.Instance.AddChidren(addLogicPage);
			UserView.HomePage.Instance.PageIndex += 1;
			addLogicPage.Show();

			}
			break;

			}

			}



			#region ◆ 自动化__________________________
			/// <summary>
			/// 自动化功能代码入口
			@@ -280,9 +241,12 @@
			//下拉刷新自动化列表的事件
			logicScrolView.BeginHeaderRefreshingAction += () =>
			{
			//重新刷新logic列表
			Common.Logic.LogicList.Clear();
			Read(logicScrolView, no);
			if (!Config.Instance.Home.IsVirtually)
			{//虚拟的不获取网关逻辑列表
			//重新刷新logic列表
			Common.Logic.LogicList.Clear();
			Read(logicScrolView, no);
			}
			//关闭刷新View；
			logicScrolView.EndHeaderRefreshing();
			};
			@@ -297,37 +261,48 @@
			/// <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
			{
			if (Common.Logic.LogicList.Count == 0)
			if (!Config.Instance.Home.IsVirtually)//虚拟的不获取网关逻辑列表
			{
			var Idlist1 = await Send.GetLogicId(0);//
			var Idlist2 = await Send.GetLogicId(2);//门锁常开模式
			if (Idlist1.Count != 0)
			if (Common.Logic.LogicList.Count == 0)
			{
			var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
			for (int j = 0; j < listlogic1.Count; j++)
			var Idlist1 = await Send.GetLogicId(0);//
			var Idlist2 = await Send.GetLogicId(2);//门锁常开模式
			if (Idlist1.Count != 0)
			{
			var logic = listlogic1[j];
			if (logic.LogicType != 0)
			var listlogic1 = await Send.ReadList(Idlist1.Count, 0);
			for (int j = 0; j < listlogic1.Count; j++)
			{
			continue;
			var logic = listlogic1[j];
			if (logic.LogicType != 0)
			{
			continue;
			}
			Common.Logic.LogicList.Add(logic);
			}
			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++)
			if (Idlist2.Count != 0)
			{
			var logic = listlogic2[j];
			if (logic.LogicType != 2)
			var listlogic2 = await Send.ReadList(Idlist2.Count, 2);
			for (int j = 0; j < listlogic2.Count; j++)
			{
			continue;
			var logic = listlogic2[j];
			if (logic.LogicType != 2)
			{
			continue;
			}
			Common.Logic.LogicList.Add(logic);
			}
			Common.Logic.LogicList.Add(logic);
			}
			}
			}
			@@ -347,6 +322,7 @@
			/// <param name="refresview">Refresview.</param>
			private static async void Automationview(VerticalRefreshLayout refresview, bool no)
			{

			refresview.RemoveAll();
			if (Common.Logic.LogicList.Count == 0 && no == false)
			{
			@@ -478,7 +454,10 @@
			logic.IsEnable = 0;
			StatusColor(logic, logicRowlayout, 0);
			}
			Send.LogicControlSwitch(logic);
			if (!Config.Instance.Home.IsVirtually)
			{
			Send.LogicControlSwitch(logic);
			}
			//Logic.Send.AddModifyLogic(logic);
			};
			if (logic.IsEnable == 1)
			@@ -540,7 +519,10 @@
			{
			Common.Logic.LogicList.Remove(logic);
			Automationview(refresview, no);
			Send.DelLogic(logic.LogicId);
			if (!Config.Instance.Home.IsVirtually)
			{
			Send.DelLogic(logic.LogicId);
			}
			};

			};
			@@ -716,7 +698,7 @@
			#endregion

			/// <summary>
			/// 门锁取消设置用的方法(相当一个关闭常开模式按钮,分类-自动化-不需要显示该自动化)
			/// 门锁失效设置用的方法(相当一个关闭常开模式按钮,分类-自动化-不需要显示该自动化)
			/// </summary>
			/// <param name="timeVlaue">时间值</param>
			/// <param name="common">设备</param>
			@@ -777,7 +759,7 @@
			}
			return exist;
			}


			///<summary>
			///获取逻辑信息
			/// 返回值：null不存在;其它值都存在;
			@@ -818,7 +800,8 @@
			return _if;
			}




			}
			}