From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs | 84 ++++--------------------------------------
1 files changed, 8 insertions(+), 76 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs
index 899a984..c4d4745 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/Help/DeviceDirectionHelpForm.cs
@@ -14,91 +14,23 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- /// <param name="i_deviceDiv">璁惧鍖哄垎</param>
- public void ShowForm(string i_deviceDiv)
+ /// <param name="deviceDiv">璁惧鍖哄垎</param>
+ public void ShowForm(string deviceDiv)
{
//璁剧疆澶撮儴淇℃伅
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>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
{
//娓呯┖bodyFrame
- this.ClearBodyFrame();
-
- if (i_deviceDiv == "Gateway")
- {
- //鍒濆鍖栫綉鍏冲府鍔╂帶浠�
- this.InitGatewayHelpControl();
- }
- else
- {
- //鍒濆鍖栬澶囧府鍔╂帶浠�
- this.InitDeviceHelpControl();
- }
- }
-
- /// <summary>
- /// 鍒濆鍖栬澶囧府鍔╂帶浠�
- /// </summary>
- private void InitDeviceHelpControl()
- {
- //璁惧娣诲姞鎸囧紩
- var btnHelp1 = new NormalViewControl(942, 60, true);
- btnHelp1.TextID = R.MyInternationalizationString.uAddDeviceHelp1;
- btnHelp1.X = ControlCommonResourse.XXLeft;
- btnHelp1.Y = Application.GetRealHeight(58);
- bodyFrameLayout.AddChidren(btnHelp1);
- //鍙兘鐢变簬褰撳墠缃戠粶杈冨樊鎴栬澶囧凡琚粬浜虹粦瀹氥��
- var btnHelp2 = new NormalViewControl(942, 50, true);
- btnHelp2.TextID = R.MyInternationalizationString.uAddDeviceHelp2;
- btnHelp2.X = ControlCommonResourse.XXLeft;
- btnHelp2.Y = btnHelp1.Bottom + Application.GetRealHeight(46);
- btnHelp2.TextSize = 12;
- btnHelp2.TextColor = UserCenterColor.Current.TextGrayColor3;
- bodyFrameLayout.AddChidren(btnHelp2);
- //1.璇风‘淇濇墜鏈轰笌璁惧涔嬮棿鐨勮窛绂昏冻澶熻繎锛屽苟涓斿懆鍥寸綉缁滅幆澧冩病鏈夊己骞叉壈銆�
- var btnHelp3 = new NormalViewControl(942, 100, true);
- btnHelp3.TextID = R.MyInternationalizationString.uAddDeviceHelp3;
- btnHelp3.IsMoreLines = true;
- btnHelp3.X = ControlCommonResourse.XXLeft;
- btnHelp3.Y = btnHelp2.Bottom + Application.GetRealHeight(46);
- btnHelp3.TextSize = 12;
- btnHelp3.TextColor = UserCenterColor.Current.TextGrayColor3;
- bodyFrameLayout.AddChidren(btnHelp3);
- //2.鍚屾椂闇�纭搴旂敤鐨勫畾浣嶆潈闄愭湭琚叧闂�傝嫢鎵嬪姩鍏抽棴浜嗗簲鐢ㄥ畾浣嶆潈闄愬彲鑳藉鑷存棤娉曡嚜鎷斿彂鐜拌澶囥��
- var btnHelp4 = new NormalViewControl(942, 100, true);
- btnHelp4.TextID = R.MyInternationalizationString.uAddDeviceHelp4;
- btnHelp4.IsMoreLines = true;
- btnHelp4.X = ControlCommonResourse.XXLeft;
- btnHelp4.Y = btnHelp3.Bottom + Application.GetRealHeight(35);
- btnHelp4.TextSize = 12;
- btnHelp4.TextColor = UserCenterColor.Current.TextGrayColor3;
- bodyFrameLayout.AddChidren(btnHelp4);
- //3.濡傛灉浠嶅缁堟棤娉曞彂鐜拌澶囷紝鍙兘鍥犱负璁惧宸茬粡琚粬浜虹粦瀹氫簡銆傚鏋滀綘骞朵笉娓呮鏄皝杩炴帴浜嗚澶囷紝鍙互杩涜閲嶇疆锛岄噸缃柟寮忚鏌ラ槄璇存槑涔︼紝鏍规嵁鎸囧紩鎿嶄綔銆�
- var btnHelp5 = new NormalViewControl(942, 150, true);
- btnHelp5.TextID = R.MyInternationalizationString.uAddDeviceHelp5;
- btnHelp5.IsMoreLines = true;
- btnHelp5.X = ControlCommonResourse.XXLeft;
- btnHelp5.Y = btnHelp4.Bottom + Application.GetRealHeight(35);
- btnHelp5.TextSize = 12;
- btnHelp5.TextColor = UserCenterColor.Current.TextGrayColor3;
- bodyFrameLayout.AddChidren(btnHelp5);
- }
-
- /// <summary>
- /// 鍒濆鍖栫綉鍏冲府鍔╂帶浠�
- /// </summary>
- private void InitGatewayHelpControl()
- {
-
+ this.ClearBodyFrame();
}
#endregion
--
Gitblit v1.8.0