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/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
index eba5ae8..22daafb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SceneFunctionSwitchControl.cs
@@ -43,19 +43,21 @@
public void InitControl()
{
var btnTemp = new NormalViewControl(10, 10, false);
+ btnTemp.TextSize = 16;
btnTemp.TextID = R.MyInternationalizationString.uScence;
//鍦烘櫙妗�(鐐瑰嚮鑼冨洿鏈夌偣灏忥紝闇�瑕佹墿澶у畠鐨勭偣鍑昏寖鍥�)
var frameScene = new FrameLayoutControl();
frameScene.UseClickStatu = false;
frameScene.Height = Application.GetRealHeight(90);
- frameScene.Width = btnTemp.GetRealWidthByText(16);
+ frameScene.Width = btnTemp.GetRealWidthByText();
frameScene.X = ControlCommonResourse.XXLeft;
this.AddChidren(frameScene);
//鍦烘櫙
var btnScene = new NormalViewControl(frameScene.Width, Application.GetRealHeight(63), false);
btnScene.Text = btnTemp.Text;
btnScene.TextSize = 16;
+ btnScene.IsBold = true;
btnScene.TextColor = UserCenterColor.Current.TextColor2;
frameScene.AddChidren(btnScene, ChidrenBindMode.BindEventOnly);
//搴曠嚎
@@ -71,7 +73,7 @@
var frameFunc = new FrameLayoutControl();
frameFunc.UseClickStatu = false;
frameFunc.Height = Application.GetRealHeight(90);
- frameFunc.Width = btnTemp.GetRealWidthByText(16);
+ frameFunc.Width = btnTemp.GetRealWidthByText();
frameFunc.X = frameScene.Right + Application.GetRealWidth(58);
this.AddChidren(frameFunc);
//鍔熻兘
@@ -98,8 +100,10 @@
this.m_nowSelectIndex = 1;
btnScene.TextSize = 16;
+ btnScene.IsBold = true;
btnScene.TextColor = UserCenterColor.Current.TextColor2;
btnFunc.TextSize = 14;
+ btnFunc.IsBold = false;
btnFunc.TextColor = UserCenterColor.Current.TextGrayColor3;
btnSceneLine.Visible = true;
btnFuncLine.Visible = false;
@@ -117,8 +121,10 @@
this.m_nowSelectIndex = 2;
btnScene.TextSize = 14;
+ btnScene.IsBold = false;
btnScene.TextColor = UserCenterColor.Current.TextGrayColor3;
btnFunc.TextSize = 16;
+ btnFunc.IsBold = true;
btnFunc.TextColor = UserCenterColor.Current.TextColor2;
btnFuncLine.Visible = true;
btnSceneLine.Visible = false;
--
Gitblit v1.8.0