From 82a773d1783549caca563831aac8affc059deedf Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 07 十一月 2019 10:56:13 +0800 Subject: [PATCH] 合并了全部的代码,IOS 图片需要从新引入工程 --- ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs | 35 +---------------------------------- 1 files changed, 1 insertions(+), 34 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs index 2751f57..5dae3ab 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/CurtainAutoOpenDirectionForm.cs @@ -7,7 +7,7 @@ /// <summary> /// Zigbee鏅鸿兘寮�鍚堝笜鐢垫満鐨勬坊鍔犳楠ょ晫闈� /// </summary> - public class CurtainAutoOpenDirectionForm : EditorCommonForm + public class CurtainAutoOpenDirectionForm : DirectionCommonForm { #region 鈻� 鍒濆鍖朹____________________________ @@ -28,9 +28,6 @@ /// </summary> private void InitMiddleFrame() { - //娓呯┖bodyFrame - this.ClearBodyFrame(); - //鍥剧墖 var framePic = new FrameLayout(); framePic.Width = Application.GetMinRealAverage(873); @@ -95,36 +92,6 @@ msg3.TextColor = UserCenterColor.Current.TextGrayColor3; msg3.TextAlignment = TextAlignment.Center; bodyFrameLayout.AddChidren(msg3); - //鏌ョ湅甯姪 - var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(50), false); - btnHelp.Y = Application.GetRealHeight(1388); - btnHelp.TextSize = 12; - btnHelp.TextAlignment = TextAlignment.Center; - btnHelp.TextColor = UserCenterColor.Current.TextOrangeColor; - btnHelp.Text = Language.StringByID(R.MyInternationalizationString.uSearchHelp); - btnHelp.ButtonClickEvent += (sender, e) => - { - var form = new DeviceDirectionHelpForm(); - form.AddForm(string.Empty); - }; - bodyFrameLayout.AddChidren(btnHelp); - //搴曠嚎 - int lineWidth = btnHelp.GetRealWidthByText(12); - var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false); - btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor; - btnLine.Gravity = Gravity.CenterHorizontal; - btnLine.Y = btnHelp.Bottom - Application.GetRealHeight(8); - bodyFrameLayout.AddChidren(btnLine); - - //涓嬩竴姝� - var btnNext = new BottomClickButton(); - btnNext.TextID = R.MyInternationalizationString.uNextway; - bodyFrameLayout.AddChidren(btnNext); - btnNext.ButtonClickEvent += (sender, e) => - { - var form = new Device.DeviceSearchForm(); - form.AddForm(this.FormID); - }; } #endregion -- Gitblit v1.8.0