From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期四, 02 一月 2020 19:51:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC --- ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs | 33 ++++++++------------------------- 1 files changed, 8 insertions(+), 25 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs index 8ed318f..4611304 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs @@ -13,36 +13,26 @@ /// <summary> /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓) - /// </summary> - /// <param name="i_deviceDiv">璁惧鍖哄垎</param> - public void ShowForm(string i_deviceDiv) + /// </summary> + public void ShowForm() { //璁剧疆澶撮儴淇℃伅 base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uSearchHelp)); //鍒濆鍖栦腑閮ㄤ俊鎭� - this.InitMiddleFrame(i_deviceDiv); + this.InitMiddleFrame(); } /// <summary> /// 鍒濆鍖栦腑閮ㄤ俊鎭� - /// </summary> - /// <param name="deviceDiv">璁惧鍖哄垎</param> - private void InitMiddleFrame(string i_deviceDiv) + /// </summary> + private void InitMiddleFrame() { //娓呯┖bodyFrame this.ClearBodyFrame(); - if (i_deviceDiv == "Device") - { - //鍒濆鍖栬澶囧府鍔╂帶浠� - this.InitDeviceHelpControl(); - } - else - { - //鍒濆鍖栫綉鍏冲府鍔╂帶浠� - this.InitGatewayHelpControl(); - } + //鍒濆鍖栬澶囧府鍔╂帶浠� + this.InitDeviceHelpControl(); } /// <summary> @@ -52,6 +42,7 @@ { //璁惧娣诲姞鎸囧紩 var btnHelp1 = new NormalViewControl(942, 60, true); + btnHelp1.IsBold = true; btnHelp1.TextID = R.MyInternationalizationString.uAddDeviceHelp1; btnHelp1.X = ControlCommonResourse.XXLeft; btnHelp1.Y = Application.GetRealHeight(58); @@ -91,14 +82,6 @@ btnHelp5.TextSize = 12; btnHelp5.TextColor = UserCenterColor.Current.TextGrayColor3; bodyFrameLayout.AddChidren(btnHelp5); - } - - /// <summary> - /// 鍒濆鍖栫綉鍏冲府鍔╂帶浠� - /// </summary> - private void InitGatewayHelpControl() - { - } #endregion -- Gitblit v1.8.0