~xm/HomeApp.git

old mode 100755 new mode 100644

			@@ -8,7 +8,7 @@

			namespace Shared.Phone.Device.Logic
			{
			public class SkipView:FrameLayout
			public class SkipView : FrameLayout
			{
			/// <summary>
			/// 其它界面跳进来的入口
			@@ -60,12 +60,12 @@
			doorLockLogicList.Show();
			}
			break;


			}

			}



			#region ◆ 自动化__________________________
			/// <summary>
			/// 自动化功能代码入口
			@@ -315,14 +315,14 @@
			Automationview(logicScrolView, no);
			CommonPage.Loading.Hide();
			}
			static RowLayout selectedRow = new RowLayout() { Tag = "0" };//记录左滑状态
			//static RowLayout selectedRow = new RowLayout() { Tag = "0" };//记录左滑状态
			/// <summary>
			/// 加载自动化列表界面
			/// </summary>
			/// <param name="refresview">Refresview.</param>
			private static async void Automationview(VerticalRefreshLayout refresview, bool no)
			{


			refresview.RemoveAll();
			if (Common.Logic.LogicList.Count == 0 && no == false)
			{
			@@ -400,18 +400,18 @@
			//左滑菜单事件
			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)
			{
			//实现android显示逻辑列表的圆角;
			fLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
			logicRowlayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);


			}
			i++;
			var logicnameBtn = new Button
			@@ -717,7 +717,7 @@
			timeConditionsInfo.Add("DelayTime", "0");
			timeConditionsInfo.Add("StartHour", h);
			timeConditionsInfo.Add("StartMin", m);
			timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue6060).ToString());
			timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 60).ToString());
			//timeConditionsInfo.Add("DoorLockOpenDelayTime", (timeVlaue * 3600).ToString());
			Dictionary<string, object> actionsInfo = new Dictionary<string, object>();
			actionsInfo.Add("LinkType", 8);