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/SensorCarbonMonoxideDirectionForm.cs | 50 ++++++++------------------------------------------
1 files changed, 8 insertions(+), 42 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorCarbonMonoxideDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorCarbonMonoxideDirectionForm.cs
index 8b499fe..5e9ceea 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorCarbonMonoxideDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorCarbonMonoxideDirectionForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 鐕冩皵浼犳劅鍣ㄧ殑娣诲姞姝ラ鐣岄潰
/// </summary>
- public class SensorCarbonMonoxideDirectionForm : EditorCommonForm
+ public class SensorCarbonMonoxideDirectionForm : DirectionCommonForm
{
#region 鈻� 鍒濆鍖朹____________________________
@@ -28,13 +28,10 @@
/// </summary>
private void InitMiddleFrame()
{
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
//鍥剧墖
var framePic = new FrameLayout();
- framePic.Width = Application.GetMinRealAverage(861);
- framePic.Height = Application.GetMinRealAverage(706);
+ framePic.Width = this.GetPictrueRealSize(861);
+ framePic.Height = this.GetPictrueRealSize(706);
framePic.Gravity = Gravity.CenterHorizontal;
framePic.Y = Application.GetRealHeight(135);
bodyFrameLayout.AddChidren(framePic);
@@ -43,9 +40,9 @@
framePic.AddChidren(btnPic);
//缁胯壊鎸囩ず鐏揩閫熼棯鐑�
- var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(501), Application.GetMinRealAverage(45), false);
- btnGreanLinght.X = Application.GetMinRealAverage(357);
- btnGreanLinght.Y = Application.GetMinRealAverage(326);
+ var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(501), this.GetPictrueRealSize(45), false);
+ btnGreanLinght.X = this.GetPictrueRealSize(357);
+ btnGreanLinght.Y = this.GetPictrueRealSize(326);
btnGreanLinght.TextAlignment = TextAlignment.Center;
btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
btnGreanLinght.TextSize = 10;
@@ -59,8 +56,8 @@
{
textMsg = string.Format(textMsg, "5");
}
- var btnSecond2 = new NormalViewControl(Application.GetMinRealAverage(357), Application.GetMinRealAverage(45), false);
- btnSecond2.Y = Application.GetMinRealAverage(222);
+ var btnSecond2 = new NormalViewControl(this.GetPictrueRealSize(357), this.GetPictrueRealSize(45), false);
+ btnSecond2.Y = this.GetPictrueRealSize(222);
btnSecond2.TextColor = UserCenterColor.Current.TextGrayColor3;
btnSecond2.TextSize = 10;
btnSecond2.TextAlignment = TextAlignment.Center;
@@ -86,37 +83,6 @@
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