合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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

@@ -1,4 +1,4 @@
using System;
       using System;
using System.Collections.Generic;
using Shared;
using Shared.Common;
@@ -14,7 +14,7 @@
        {
            Tag = "Logic";
        }
        public void Show()
        public void Show()                                                                                                                                                                                                                                                                                                                    
        {

            #region  最上面的布局代码
@@ -31,7 +31,7 @@
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                TextAlignment = TextAlignment.CenterLeft,
                X = Application.GetRealWidth(176),
                Width = Application.GetRealWidth(400),
                Width = Application.GetRealWidth(600),
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.selection,
@@ -129,8 +129,8 @@
            timeiconBtn.MouseUpEventHandler += timeclick;
            timerow.MouseUpEventHandler += timeclick;

            #endregion

            #endregion                
                                                                                                                                              
            #region   ----设备状态条件----
            var deviceframelayout = new FrameLayout
            {
@@ -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;