~wjc/HomeApp.git

			@@ -10,10 +10,11 @@
			{
			public class SkipView:FrameLayout
			{

			/// <summary>
			/// 其它界面跳进来的入口
			/// </summary>
			public async static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null)
			public async static void SkipAddLogic(int intvalue, DoorLock doorLock = null, MemberInfoRes accountObj = null)
			{
			/// 0.正常自动化;1.门锁自动化;2.Sone门锁;
			switch (intvalue)
			@@ -40,7 +41,7 @@
			if (accountObj == null)
			{
			///防止抛异常
			Send.UserMemberInfoRes = new UserCenter.MemberInfoRes();
			Send.UserMemberInfoRes = new MemberInfoRes();
			}
			if (doorLock == null)
			{
			@@ -51,7 +52,7 @@
			Common.Logic.LogicDviceList.Clear();
			if (Common.Logic.LogicDviceList.Count == 0)
			{
			Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
			Common.Logic.LogicDviceList.AddRange(HdlDeviceCommonLogic.Current.listAllDevice.ToArray());
			}
			var doorLockLogicList = new DoorLockLogic.LockLogicList();
			UserView.HomePage.Instance.AddChidren(doorLockLogicList);
			@@ -73,6 +74,19 @@
			//functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
			#region ---推荐模板的组件
			//推荐模板背景控件


			var bjFrameLayout1 = new FrameLayout
			{
			Width = Application.GetRealWidth(1080 - 58),
			Height = Application.GetRealHeight(50),
			BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
			X = Application.GetRealWidth(58),
			//Radius = (uint)Application.GetRealHeight(50),
			Y = Application.GetRealHeight(30),

			};
			functionSceneAutoBodyView.AddChidren(bjFrameLayout1);
			var bjFrameLayout = new FrameLayout
			{
			Width = Application.GetRealWidth(1080 - 58),
			@@ -81,10 +95,10 @@
			X = Application.GetRealWidth(58),
			//Radius = (uint)Application.GetRealHeight(50),
			Y = Application.GetRealHeight(30),

			};
			functionSceneAutoBodyView.AddChidren(bjFrameLayout);
			bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
			bjFrameLayout1.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
			bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft\|HDLUtils.RectCornerBottomLeft);
			//图标控件
			var sigBtn = new Button
			{
			@@ -238,10 +252,10 @@
			};
			//下拉刷新自动化列表的事件
			logicScrolView.BeginHeaderRefreshingAction += () =>
			{
			{
			if (!Config.Instance.Home.IsVirtually)
			{//虚拟的不获取网关逻辑列表
			//重新刷新logic列表
			//重新刷新logic列表
			If_once = true;
			Common.Logic.LogicList.Clear();
			Read(logicScrolView, no);
			@@ -273,39 +287,40 @@
			{
			if (!Config.Instance.Home.IsVirtually)//虚拟的不获取网关逻辑列表
			{
			if (If_once)
			{
			if (Common.Logic.LogicList.Count == 0)
			{
			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);
			}
			}
			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);
			}
			}

			}
			}
			}
			@@ -319,6 +334,7 @@
			CommonPage.Loading.Hide();
			}
			static RowLayout selectedRow = new RowLayout() { Tag = "0" };//记录左滑状态

			/// <summary>
			/// 加载自动化列表界面
			/// </summary>
			@@ -514,7 +530,7 @@
			logicRowlayout.AddRightView(del);
			del.MouseUpEventHandler += (sender, e) =>
			{
			var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
			var alert = new ShowMsgControl(ShowMsgType.Confirm,
			Language.StringByID(MyInternationalizationString.doyouwanttodelete),
			Language.StringByID(MyInternationalizationString.confrim));
			alert.Show();
			@@ -719,15 +735,15 @@
			timeConditionsInfo.Add("EnDelay", "0");
			timeConditionsInfo.Add("DelayTime", "0");
			timeConditionsInfo.Add("StartHour", h);
			timeConditionsInfo.Add("StartMin", m);
			if (UserCenter.UserCenterResourse.HideOption.DoorLockNomallyOpenTimeMode == 1)
			{
			//强制变更时间模式为分钟
			timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 60).ToString());
			timeConditionsInfo.Add("StartMin", m);
			if (HdlUserCenterResourse.HideOption.DoorLockNomallyOpenTimeMode == 1)
			{
			//强制变更时间模式为分钟
			timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 60).ToString());
			}
			else
			{
			timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 3600).ToString());
			else
			{
			timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 3600).ToString());
			}
			Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
			actionsInfo.Add("LinkType", 8);
			@@ -752,7 +768,7 @@
			if (logicIfon != null && logicIfon.LogicId != 0)
			{
			//添加门锁失效时间的历史记录
			UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog((DoorLock)common, 9003, timeVlaue.ToString());
			HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog((DoorLock)common, 9003, timeVlaue.ToString());
			return logicIfon.LogicId;//表示添加成功;
			}
			return 0;//表示添加失败;
			@@ -868,6 +884,8 @@
			return false;
			}



			}
			}