合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

old mode 100755
new mode 100644
@@ -101,7 +101,8 @@
                Height = Application.GetMinRealAverage(63),
                TextColor = ZigbeeColor.Current.GXCTextGrayColor,
                SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                TextAlignment=TextAlignment.CenterLeft
                TextAlignment=TextAlignment.CenterLeft,
                TextSize=15
            };
            AddChidren(NameButton);

@@ -156,7 +157,9 @@
                Height = Application.GetMinRealAverage(60),
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
                TextAlignment=TextAlignment.CenterLeft
                TextAlignment=TextAlignment.CenterLeft,
                TextSize=14,
                IsBold=true
            };
            AddChidren(StatuButton);

@@ -177,9 +180,10 @@
        /// SetStatu
        /// </summary>
        /// <param name="statu"></param>
        public void SetStatu(bool statu)
        private void SetStatu(bool statu)
        {
            NameButton.IsSelected = IconButton.IsSelected = SwitchButton.IsSelected = StatuButton.IsSelected = CardBG.IsSelected = statu;
            NameButton.IsBold = statu;
        }

        /// <summary>