2019-12-24-02

WJC

2019-12-24 0480792bde7bcf770290ba3414bd615e563e7b43

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

@@ -722,6 +722,7 @@
            //new一个新逻辑对象；
            Common.Logic.CurrentLogic = new Common.Logic();
            Common.Logic.CurrentLogic.IsEnable = 1;//默认为开
            Common.Logic.CurrentLogic.LogicCustomPushText = Language.StringByID(MyInternationalizationString.defaulttext);
            Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.automation1);
            var addLogicPage = new Shared.Phone.Device.Logic.AddLogicPage();
            UserView.HomePage.Instance.AddChidren(addLogicPage);
@@ -1744,10 +1745,11 @@
        /// <summary>
        /// 自动化功能代码入口
        /// </summary>
        private async void ShowAutotion()
        private  void ShowAutotion()
        {



            functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;

            functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
           
            var bjFrameLayout = new FrameLayout
            {
                Width = Application.GetRealWidth(1080 - 58),
@@ -1807,14 +1809,13 @@
            var logicScrolView = new VerticalRefreshLayout//VerticalScrolViewLayout
            {
                Height = functionSceneAutoBodyView.Height - bjFrameLayout.Height - bjFrameLayout.Y - scenehorizontalScrol.Height - Application.GetRealHeight(30),
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                X = Application.GetRealWidth(58),
                //Radius = (uint)Application.GetRealHeight(50),
                Y = scenehorizontalScrol.Bottom,
            };
            functionSceneAutoBodyView.AddChidren(logicScrolView);
            logicScrolView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);


            recommendswitchBtn.MouseUpEventHandler += (sender, e) =>
            {
@@ -1961,7 +1962,7 @@
                var logicRowlayout = new RowLayout
                {
                    Height = Application.GetRealHeight(190 + 30),
                    Width = Application.GetRealWidth(1080),
                    Width = Application.GetRealWidth(1080-58),
                    LineColor = ZigbeeColor.Current.LogicBackgroundColor,
                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                };