2019-10-29-2

WJC

2019-10-29 18dcc85b17b351cf7948e22908d5128231aea2e0

 ZigbeeApp/Shared/Phone/Device/Logic/AddLogicPage.cs

old mode 100755
new mode 100644
@@ -80,7 +80,7 @@
                BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
            };
            middle.AddChidren(timeframelayout);

            

            var timeiconBtn = new Button
            {
@@ -161,7 +161,7 @@
            };
            deviceframelayout.AddChidren(devicerow);


          
            ///设备状态条件
            var btndevice = new Button {
                //Text = "设备状态条件",
@@ -355,7 +355,7 @@
            existencerowlayout.MouseUpEventHandler += logicclick;
            #endregion


            

            #endregion

@@ -696,7 +696,7 @@
                UserView.HomePage.Instance.PageIndex += 1;
                logicCommunalPage.Show(() => { });
            };

           
        }
        /// <summary>
        /// 地理围栏View
@@ -780,7 +780,7 @@
            typeRow.AddChidren(Btncomplete);
            #endregion

            #region  ------在家   离家
            #region  ------在家   离家  
            #region ------在家

            var athomeFrameLayout = new FrameLayout
@@ -814,7 +814,7 @@
            athomeRowLayout.AddChidren(athomeSelected);
            #endregion

            #region -------离家
            #region -------离家 
            var leavehomeFrameLayout = new FrameLayout
            {
                Height = Application.GetRealHeight(160),
@@ -1058,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),
@@ -1131,7 +1131,7 @@
            time1row.AddChidren(timeSelected);
            #endregion


        
            ///立即执行点击事件
            EventHandler<MouseEventArgs> timepointclick = (sedner14, e14) =>
            {