2020-03-25-1

WJC

2020-03-25 98c998ca98ee014266f65a517d672df0cd97f244

 ZigbeeApp/Shared/Phone/Device/Category/Category.cs

old mode 100755
new mode 100644
@@ -789,14 +789,15 @@
        /// </summary>
        private void Add_Automation()
        {
            //new一个新逻辑对象；
            Common.Logic.CurrentLogic = new Common.Logic();
            Common.Logic.CurrentLogic.IsEnable = 1;//默认为开
            Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
            var addLogicPage = new Shared.Phone.Device.Logic.AddLogicPage();
            UserView.HomePage.Instance.AddChidren(addLogicPage);
            UserView.HomePage.Instance.PageIndex += 1;
            addLogicPage.Show();
            ////new一个新逻辑对象；
            //Common.Logic.CurrentLogic = new Common.Logic();
            //Common.Logic.CurrentLogic.IsEnable = 1;//默认为开
            //Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
            //var addLogicPage = new Shared.Phone.Device.Logic.AddLogicPage();
            //UserView.HomePage.Instance.AddChidren(addLogicPage);
            //UserView.HomePage.Instance.PageIndex += 1;
            //addLogicPage.Show();
            Shared.Phone.Device.Logic.SkipView.SkipAddLogic(0);
        }
        /// <summary>
        /// HidenFloor
@@ -2302,7 +2303,13 @@
            }
            foreach (var logic in Common.Logic.LogicList)
            {



                var fLayout = new FrameLayout
                {
                    Height = Application.GetRealHeight(190 + 30),
                    Width = Application.GetRealWidth(1080 - 58),
                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                };
                refresview.AddChidren(fLayout);



                var logicRowlayout = new RowLayout
                {
@@ -2312,7 +2319,7 @@
                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,



                };
                refresview.AddChidren(logicRowlayout);
                fLayout.AddChidren(logicRowlayout);



@@ -2417,13 +2424,13 @@
                };
                var line = new Button
                {
                    Y = Application.GetRealHeight(215),
                    Height = Application.GetRealHeight(5),

                    Y = fLayout.Height - 1,
                    Height = 1,
                    X = Application.GetRealWidth(58),
                    Width = Application.GetRealWidth(1080 - 58),
                    BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                    X = Application.GetRealWidth(58),
                };
                logicRowlayout.AddChidren(line);
                fLayout.AddChidren(line);
            }

        }