代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -83,19 +83,21 @@
                Gravity = Gravity.CenterHorizontal,
                UnSelectedImagePath = imagePath,
                SelectedImagePath = selectedImagePath,
                Tag = Tag
                Tag = Tag,
                IsSelected=true
            };
            AddChidren(ImageBtn);

            NameBtn = new Button()
            {
                Y = Application.GetRealHeight(200),
                Width = Application.GetRealWidth(160),
                Width = Application.GetRealWidth(170),
                Height = Application.GetRealHeight(60),
                Gravity = Gravity.CenterHorizontal,
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
                Tag = Tag
                Tag = Tag,
                TextSize=11
            };
            AddChidren(NameBtn);

@@ -131,8 +133,8 @@
        public void SetStatu(bool statu)
        {
            ImageBG.IsSelected = NameBtn.IsSelected = statu;
            NameBtn.IsBold = statu;
        }


    }
}