合并代码

黄学彪

2020-01-09 fa6bcb2e9907772480f99205f36ec2a1ce735a22

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

@@ -65,7 +65,8 @@
            {
                Y = Application.GetRealHeight(CommonFormResouce.TopStatuFrameLayout_Height),
                Height = Application.GetRealHeight(CommonFormResouce.Topview_Height),
                Width = Application.GetRealWidth(CommonPage.AppRealWidth)
                Width = Application.GetRealWidth(CommonPage.AppRealWidth),
                BackgroundColor=ZigbeeColor.Current.GXCTopViewBackgroundColor
            };
            AddChidren(topView);

@@ -73,7 +74,7 @@
            {
                Y=Height-1,
                Height=1,
                BackgroundColor=ZigbeeColor.Current.GXCGrayLineColor3
                BackgroundColor=ZigbeeColor.Current.GXCGrayLineColor4
            };
            AddChidren(line);
        }