~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -19,7 +19,7 @@
			public string str1;

			Dictionary<string, string> timeBucketConditionsInfo = new Dictionary<string, string>();
			public void Show()
			public void Show(bool _if=false)
			{

			#region 上面的布局代码
			@@ -50,7 +50,9 @@
			TypeView typeView = new TypeView();
			middle.AddChidren(typeView.Show());
			typeView.textBtn.TextID = MyInternationalizationString.type;
			typeView.titleBtn.Width = Application.GetRealWidth(630+70);
			typeView.titleBtn.TextID = MyInternationalizationString.timeframe;
			typeView.backBtn.Visible = false;

			#endregion

			@@ -67,7 +69,9 @@

			TypeView endView = new TypeView();
			endView.frameLayout.Y = startView.frameLayout.Bottom;
			endView.frameLayout.Height = Application.GetRealHeight(160 + 20);//最后一行增加20高度;
			middle.AddChidren(endView.Show());
			endView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor;//改变最后一行线颜色;
			endView.textBtn.TextID = MyInternationalizationString.endtime;
			endView.titleBtn.Tag = "0";

			@@ -331,11 +335,21 @@
			}

			//LogicIfon.logicIfon.Addconditions(timeBucketConditionsInfo,timeBucketConditionsInfo.Type);
			if (_if) {
			//跳到S-one门锁
			var oneLogic = new OneLogic { };
			UserView.HomePage.Instance.AddChidren(oneLogic);
			UserView.HomePage.Instance.PageIndex += 1;
			oneLogic.Show(false);

			var logicCommunalPage = new LogicCommunalPage { };
			UserView.HomePage.Instance.AddChidren(logicCommunalPage);
			UserView.HomePage.Instance.PageIndex += 1;
			logicCommunalPage.Show(() => { });
			}
			else
			{
			var logicCommunalPage = new LogicCommunalPage { };
			UserView.HomePage.Instance.AddChidren(logicCommunalPage);
			UserView.HomePage.Instance.PageIndex += 1;
			logicCommunalPage.Show(() => { });
			}
			};
			}