From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/DimmableLightOneLoadDirectionForm.cs | 111 +++++++++++++++++++------------------------------------
1 files changed, 39 insertions(+), 72 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/DimmableLightOneLoadDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/DimmableLightOneLoadDirectionForm.cs
index 2a8ee07..d16048c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/DimmableLightOneLoadDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/DimmableLightOneLoadDirectionForm.cs
@@ -7,45 +7,42 @@
/// <summary>
/// 1璺皟鍏夊櫒灏忔ā鍧楃殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class DimmableLightOneLoadDirectionForm : EditorCommonForm
+ public class DimmableLightOneLoadDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- public void ShowForm()
- {
- //璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));
-
- //鍒濆鍖栦腑閮ㄤ俊鎭�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄤ俊鎭�
- /// </summary>
- private void InitMiddleFrame()
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
- //鍥剧墖
- var framePic = new FrameLayout();
- framePic.Width = Application.GetMinRealAverage(873);
- framePic.Height = Application.GetMinRealAverage(665);
- framePic.Gravity = Gravity.CenterHorizontal;
- framePic.Y = Application.GetRealHeight(144);
- bodyFrameLayout.AddChidren(framePic);
- var btnPic = new PicViewControl(framePic.Width, framePic.Height, false);
- btnPic.UnSelectedImagePath = "Instruct/DimmableLightOneLoad.png";
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //鍥剧墖
+ var framePic = new FrameLayout();
+ framePic.Width = this.GetPictrueRealSize(873);
+ framePic.Height = this.GetPictrueRealSize(665);
+ framePic.Gravity = Gravity.CenterHorizontal;
+ framePic.Y = Application.GetRealHeight(144);
+ bodyFrameLayout.AddChidren(framePic);
+ var btnPic = new PicViewControl(framePic.Width, framePic.Height, false);
+ btnPic.UnSelectedImagePath = "Instruct/DimmableLightOneLoad.png";
framePic.AddChidren(btnPic);
//缁胯壊鎸囩ず鐏棯鐑�
- var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(360), Application.GetMinRealAverage(45), false);
- btnGreanLinght.X = Application.GetMinRealAverage(442);
- btnGreanLinght.Y = Application.GetMinRealAverage(368);
+ var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(360), this.GetPictrueRealSize(45), false);
+ btnGreanLinght.X = this.GetPictrueRealSize(442);
+ btnGreanLinght.Y = this.GetPictrueRealSize(368);
btnGreanLinght.TextAlignment = TextAlignment.Center;
btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
btnGreanLinght.TextSize = 10;
@@ -53,9 +50,9 @@
framePic.AddChidren(btnGreanLinght);
//鎸囩ず鐏�
- var btnLinght = new NormalViewControl(Application.GetMinRealAverage(250), Application.GetMinRealAverage(45), false);
- btnLinght.X = Application.GetMinRealAverage(340);
- btnLinght.Y = Application.GetMinRealAverage(514);
+ var btnLinght = new NormalViewControl(this.GetPictrueRealSize(250), this.GetPictrueRealSize(45), false);
+ btnLinght.X = this.GetPictrueRealSize(340);
+ btnLinght.Y = this.GetPictrueRealSize(514);
btnLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
btnLinght.TextSize = 10;
btnLinght.TextID = R.MyInternationalizationString.uPilotLamp;
@@ -67,9 +64,9 @@
{
textMsg = string.Format(textMsg, "5");
}
- var btnSecond = new NormalViewControl(Application.GetMinRealAverage(400), Application.GetMinRealAverage(45), false);
- btnSecond.X = Application.GetMinRealAverage(518);
- btnSecond.Y = Application.GetMinRealAverage(545);
+ var btnSecond = new NormalViewControl(this.GetPictrueRealSize(400), this.GetPictrueRealSize(45), false);
+ btnSecond.X = this.GetPictrueRealSize(518);
+ btnSecond.Y = this.GetPictrueRealSize(545);
btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;
btnSecond.TextSize = 10;
btnSecond.Text = textMsg;
@@ -82,8 +79,8 @@
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;
+ msg1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ msg1.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg1);
var msg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
msg2.Y = msg1.Bottom;
@@ -91,39 +88,9 @@
{
msg2.Text = msgArry[1];
}
- msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
- msg2.TextAlignment = TextAlignment.Center;
+ msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ msg2.TextAlignment = TextAlignment.Center;
bodyFrameLayout.AddChidren(msg2);
- //鏌ョ湅甯姪
- 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