Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

old mode 100755
new mode 100644
@@ -33,7 +33,7 @@
        public TopFrameLayout()
        {
            BackgroundColor = ZigbeeColor.Current.GXCTopViewBackgroundColor;
            Width = Application.GetRealWidth(CommonPage.AppRealWidth);
            Width = Application.GetRealWidth(CommonFormResouce.AppRealWidth);
            Height = Application.GetRealHeight(CommonFormResouce.TopFrameLayout_Height);
        }

@@ -110,11 +110,12 @@
        {
            topTitle = new Button
            {
                X=Application.GetRealWidth(164),
                Height = Application.GetRealHeight(CommonFormResouce.TopFrameLayout_Height - CommonFormResouce.TopStatuFrameLayout_Height),
                Width = Application.GetRealWidth(CommonFormResouce.TopTitle_Width),
                TextSize = CommonFormResouce.TopTitle_TextSize,
                TextColor = ZigbeeColor.Current.GXCTitleBlackTitle,
                Gravity = Gravity.CenterHorizontal,
                TextAlignment=TextAlignment.CenterLeft
            };
            topView.AddChidren(topTitle);
        }