~xm/HomeApp.git

			@@ -13,13 +13,14 @@
			/// <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)
			{
			case 0:
			{

			//new一个新逻辑对象；
			//新增正常自动化入口
			Common.Logic.CurrentLogic = new Common.Logic();
			@@ -315,7 +316,7 @@
			Automationview(logicScrolView, no);
			CommonPage.Loading.Hide();
			}
			//static RowLayout selectedRow = new RowLayout() { Tag = "0" };//记录左滑状态
			static RowLayout selectedRow = new RowLayout() { Tag = "0" };//记录左滑状态
			/// <summary>
			/// 加载自动化列表界面
			/// </summary>
			@@ -400,11 +401,11 @@
			//左滑菜单事件
			logicRowlayout.OpenMenuAction += () =>
			{
			//if (selectedRow.Tag.ToString() != logicRowlayout.Tag.ToString())
			//{ //保留左滑只有一个;
			// selectedRow.HideMenu();//
			//}
			//selectedRow = logicRowlayout;
			if (selectedRow.Tag.ToString() != logicRowlayout.Tag.ToString())
			{ //保留左滑只有一个;
			selectedRow.HideMenu();//
			}
			selectedRow = logicRowlayout;
			};
			if (i == 1)
			{
			@@ -716,9 +717,16 @@
			timeConditionsInfo.Add("EnDelay", "0");
			timeConditionsInfo.Add("DelayTime", "0");
			timeConditionsInfo.Add("StartHour", h);
			timeConditionsInfo.Add("StartMin", m);
			timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 60).ToString());
			//timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 3600).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);
			@@ -858,4 +866,3 @@

			}
			}