From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs
index 4227c91..a9624fe 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/TopFrameLayout.cs
+++ b/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);
}
@@ -118,13 +119,15 @@
{
topTitle = new Button
{
- X=Application.GetRealWidth(164),
+ 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,
- TextAlignment=TextAlignment.CenterLeft
+ TextAlignment = TextAlignment.CenterLeft,
+ IsBold = true,
};
+
topView.AddChidren(topTitle);
}
/// <summary>
--
Gitblit v1.8.0