合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs

@@ -42,7 +42,7 @@
                v_Selected = value;
                try
                {
                    SetOnLineStatu(v_Selected);
                    SetStatu(v_Selected);
                }
                catch
                {
@@ -66,7 +66,7 @@
            Y = Application.GetRealHeight(y);
            Width = Application.GetRealWidth(1022);
            Height = Application.GetRealHeight(127);
            BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
            //BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
        }

        /// <summary>
@@ -110,6 +110,7 @@
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize=14,
                Tag = Tag
            };
            AddChidren(NameBtn);
@@ -121,7 +122,8 @@
                Width = Application.GetRealWidth(400),
                Height = Application.GetRealHeight(49),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
                TextSize=10
            };
            AddChidren(StatuBtn);

@@ -140,9 +142,9 @@
            var line = new Button()
            {
                X = Application.GetRealWidth(200),
                Y = Height - 2,
                Y = Height - 1,
                Width = Application.GetRealWidth(821),
                Height = 2,
                Height = 1,
                BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor,
                Tag = Tag
            };
@@ -187,6 +189,8 @@
        public void SetStatu(bool statu)
        {
            SwitchBtn.IsSelected = statu;
            NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = statu;
            NameBtn.IsBold = statu;
        }

        /// <summary>