2020-03-19-1

WJC

2020-03-19 6144d4267f92db9be96a7003f4352732bfe9bb3b

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

@@ -17,7 +17,6 @@
    /// </summary>
    public class Category : FrameLayout, ZigBee.Common.IStatus
    {

        #region ◆ 变量____________________________
        /// <summary>
        /// The instance.
@@ -2113,8 +2112,8 @@
            //推荐模板开关控件
            var recommendswitchBtn = new Button
            {
                Width = Application.GetMinRealAverage(104),
                Height = Application.GetMinRealAverage(63),
                Width = Application.GetRealWidth(104),
                Height = Application.GetRealHeight(63),
                UnSelectedImagePath = "ZigeeLogic/logicclose.png",
                SelectedImagePath = "ZigeeLogic/logicopen.png",
                X = bjFrameLayout.Width - Application.GetRealWidth(104 + 58),
@@ -2345,6 +2344,7 @@
                    Width = Application.GetRealWidth(1080 - 58),
                    LineColor = ZigbeeColor.Current.LogicBackgroundColor,
                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                    SubViewWidth = Application.GetRealWidth(184),//改变编辑控件宽度多少；

                };
                refresview.AddChidren(logicRowlayout);
@@ -2367,12 +2367,13 @@

                var logicswitchBtn = new Button
                {
                    Width = Application.GetMinRealAverage(104),
                    Height = Application.GetMinRealAverage(63),
                    Width = Application.GetRealWidth(104),
                    Height = Application.GetRealHeight(63),
                    UnSelectedImagePath = "ZigeeLogic/logicclose.png",
                    SelectedImagePath = "ZigeeLogic/logicopen.png",
                    X = logicRowlayout.Width - Application.GetRealWidth(104 + 58),
                    Y = Application.GetRealHeight(58 + 30 + 9 + 30),

                };
                logicRowlayout.AddChidren(logicswitchBtn);

@@ -2517,8 +2518,8 @@
                var iconindex = iconIndexlist[i];
                var typebjBtn = new FrameLayout
                {
                    Width = Application.GetRealWidth(82),
                    Height = Application.GetRealHeight(82),
                    Width = Application.GetMinRealAverage(82),
                    Height = Application.GetMinRealAverage(82),
                    X = Application.GetRealWidth(58) + Application.GetRealWidth(12 + (12 + 82 + 45 + 12) * i),
                    Y = Application.GetRealHeight(58 + 30 + 30),
                    Radius = (uint)Application.GetRealHeight(41),
@@ -2528,8 +2529,8 @@

                var typeIconBtn = new Button
                {
                    Width = Application.GetRealWidth(58),
                    Height = Application.GetRealHeight(58),
                    Width = Application.GetMinRealAverage(58),
                    Height = Application.GetMinRealAverage(58),
                    Gravity = Gravity.Center,

                };