WJC
2019-10-29 45e4e387f3ef259b9e225fdd543e20be285a5112
ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs
old mode 100644 new mode 100755
@@ -161,7 +161,7 @@
            };
            deviceframelayout.AddChidren(devicerow);
            ///设备状态条件
            var btndevice = new Button {
                //Text = "设备状态条件",
@@ -183,11 +183,6 @@
            EventHandler<MouseEventArgs> devicestateclick = (sender, e) =>
            {
                Common.Logic.LogicDviceList.Clear();
                if (Common.Logic.LogicDviceList.Count == 0)
                {
                    Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
                }
                var deviceStateCondition = new DeviceStateCondition();
                UserView.HomePage.Instance.AddChidren(deviceStateCondition);
                UserView.HomePage.Instance.PageIndex += 1;
@@ -360,7 +355,7 @@
            existencerowlayout.MouseUpEventHandler += logicclick;
            #endregion
            #endregion
@@ -701,7 +696,7 @@
                UserView.HomePage.Instance.PageIndex += 1;
                logicCommunalPage.Show(() => { });
            };
        }
        /// <summary>
        /// 地理围栏View
@@ -785,7 +780,7 @@
            typeRow.AddChidren(Btncomplete);
            #endregion
            #region  ------在家   离家
            #region  ------在家   离家
            #region ------在家
            var athomeFrameLayout = new FrameLayout
@@ -819,7 +814,7 @@
            athomeRowLayout.AddChidren(athomeSelected);
            #endregion
            #region -------离家
            #region -------离家
            var leavehomeFrameLayout = new FrameLayout
            {
                Height = Application.GetRealHeight(160),
@@ -1063,14 +1058,14 @@
                Width = Application.GetRealWidth(200),
                TextAlignment = TextAlignment.CenterRight,
                X = Btntitle.Right + Application.GetRealWidth(100),
            };
            timetype.AddChidren(Btncomplete);
            #endregion
            #region  -------立即执行   时间范围
            #region  -------立即执行
            #region  -------立即执行
            var timepointFrameLayout = new FrameLayout
            {
                Height = Application.GetRealHeight(160),
@@ -1136,7 +1131,7 @@
            time1row.AddChidren(timeSelected);
            #endregion
            ///立即执行点击事件
            EventHandler<MouseEventArgs> timepointclick = (sedner14, e14) =>
            {