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/FunctionButton.cs | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionButton.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionButton.cs index ca424b1..fba65f2 100755 --- a/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionButton.cs +++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/FunctionButton.cs @@ -17,6 +17,10 @@ /// </summary> public Button ImageBG; /// <summary> + /// ClickBtn + /// </summary> + public Button ClickBtn; + /// <summary> /// v_Selected /// </summary> private bool v_Selected; @@ -79,21 +83,29 @@ 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); + + ClickBtn = new Button + { + Tag = Tag + }; + AddChidren(ClickBtn); } @@ -121,6 +133,8 @@ public void SetStatu(bool statu) { ImageBG.IsSelected = NameBtn.IsSelected = statu; + NameBtn.IsBold = statu; } + } } -- Gitblit v1.8.0