From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs | 51 +++++++++------------------------------------------
1 files changed, 9 insertions(+), 42 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs
index b281a1f..ab7c507 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 涓夋寜閿潰鏉跨殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class PanelThreeButtonDirectionForm : EditorCommonForm
+ public class PanelThreeButtonDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -27,10 +27,7 @@
/// 鍒濆鍖栦腑閮ㄤ俊鎭�
/// </summary>
private void InitMiddleFrame()
- {
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
+ {
//鍥剧墖
var framePic = new FrameLayout();
framePic.Width = Application.GetMinRealAverage(835);
@@ -43,9 +40,9 @@
framePic.AddChidren(btnPic);
//鎸夐敭鑳屽厜鐏棯鐑�
- var btnGreanLinght = new NormalViewControl(360, 40, true);
+ var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(360), Application.GetMinRealAverage(45), false);
btnGreanLinght.X = Application.GetMinRealAverage(442);
- btnGreanLinght.Y = Application.GetMinRealAverage(259);
+ btnGreanLinght.Y = Application.GetMinRealAverage(257);
btnGreanLinght.TextAlignment = TextAlignment.Center;
btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
btnGreanLinght.TextSize = 10;
@@ -58,9 +55,9 @@
{
textMsg = string.Format(textMsg, "5");
}
- var btnSecond = new NormalViewControl(400, 40, true);
+ var btnSecond = new NormalViewControl(Application.GetMinRealAverage(400), Application.GetMinRealAverage(45), false);
btnSecond.X = Application.GetMinRealAverage(441);
- btnSecond.Y = Application.GetMinRealAverage(585);
+ btnSecond.Y = Application.GetMinRealAverage(583);
btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;
btnSecond.TextSize = 10;
btnSecond.Text = textMsg;
@@ -70,13 +67,13 @@
//杩涘叆閰嶇綉鐘舵�併�傜豢鐏揩闂�3绉掑垯閰嶇綉鎴愬姛
string[] msgArry = Language.StringByID(R.MyInternationalizationString.uAddThreeButtonPanelMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
- var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(58), false);
+ var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
msg1.Y = Application.GetRealHeight(1037);
msg1.Text = msgArry[0];
msg1.TextColor = UserCenterColor.Current.TextGrayColor3;
msg1.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg1);
- var msg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(58), false);
+ var msg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
msg2.Y = msg1.Bottom;
if (msgArry.Length > 1)
{
@@ -84,37 +81,7 @@
}
msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
msg2.TextAlignment = TextAlignment.Center;
- bodyFrameLayout.AddChidren(msg2);
- //鏌ョ湅甯姪
- var btnHelp = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(49), 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);
- };
+ bodyFrameLayout.AddChidren(msg2);
}
#endregion
--
Gitblit v1.8.0