From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorPirDirectionForm.cs | 111 ++++++++++++++++++++++++++-----------------------------
1 files changed, 53 insertions(+), 58 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorPirDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorPirDirectionForm.cs
index 060a400..5d83487 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorPirDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/SensorPirDirectionForm.cs
@@ -28,69 +28,64 @@
/// </summary>
private void InitMiddleFrame()
{
- ////鍥剧墖
- //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";
- //framePic.AddChidren(btnPic);
+ //鍥剧墖
+ var framePic = new FrameLayout();
+ framePic.Width = Application.GetMinRealAverage(860);
+ framePic.Height = Application.GetMinRealAverage(714);
+ framePic.Gravity = Gravity.CenterHorizontal;
+ framePic.Y = Application.GetRealHeight(130);
+ bodyFrameLayout.AddChidren(framePic);
+ var btnPic = new PicViewControl(framePic.Width, framePic.Height, false);
+ btnPic.UnSelectedImagePath = "Instruct/SensorPir.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);
- //btnGreanLinght.TextAlignment = TextAlignment.Center;
- //btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
- //btnGreanLinght.TextSize = 10;
- //btnGreanLinght.TextID = R.MyInternationalizationString.uGreanPilotLampLinght;
- //framePic.AddChidren(btnGreanLinght);
+ //鎸囩ず鐏彉缁裤�侀棯鐑�
+ var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(455), Application.GetMinRealAverage(45), false);
+ btnGreanLinght.X = Application.GetMinRealAverage(398);
+ btnGreanLinght.Y = Application.GetMinRealAverage(300);
+ btnGreanLinght.TextAlignment = TextAlignment.Center;
+ btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnGreanLinght.TextSize = 10;
+ btnGreanLinght.TextID = R.MyInternationalizationString.uPilotLinghtInCreanAndLinght;
+ framePic.AddChidren(btnGreanLinght);
- ////鎸囩ず鐏�
- //var btnLinght = new NormalViewControl(Application.GetMinRealAverage(250), Application.GetMinRealAverage(45), false);
- //btnLinght.X = Application.GetMinRealAverage(340);
- //btnLinght.Y = Application.GetMinRealAverage(514);
- //btnLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
- //btnLinght.TextSize = 10;
- //btnLinght.TextID = R.MyInternationalizationString.uPilotLamp;
- //framePic.AddChidren(btnLinght);
+ //鎸囩ず鐏�
+ var btnLinght = new NormalViewControl(Application.GetMinRealAverage(250), Application.GetMinRealAverage(45), false);
+ btnLinght.X = Application.GetMinRealAverage(398);
+ btnLinght.Y = Application.GetMinRealAverage(642);
+ btnLinght.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnLinght.TextSize = 10;
+ btnLinght.TextID = R.MyInternationalizationString.uPilotLamp;
+ framePic.AddChidren(btnLinght);
- ////闀挎寜5绉�(鎸夐敭)
- //string textMsg = Language.StringByID(R.MyInternationalizationString.uLongClickPanelSomeSecond);
- //if (textMsg.Contains("{0}") == true)
- //{
- // 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);
- //btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;
- //btnSecond.TextSize = 10;
- //btnSecond.Text = textMsg;
- //framePic.AddChidren(btnSecond);
+ //閽堝瓟寮忛噸缃寜閿�
+ var btnReset = new NormalViewControl(Application.GetMinRealAverage(250), Application.GetMinRealAverage(45), false);
+ btnReset.X = Application.GetMinRealAverage(512);
+ btnReset.Y = Application.GetMinRealAverage(512);
+ btnReset.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnReset.TextSize = 10;
+ btnReset.TextID = R.MyInternationalizationString.uPinholeTypeResetButton;
+ framePic.AddChidren(btnReset);
- ////闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤�侀棯鐑�
- ////杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
- //string[] msgArry = Language.StringByID(R.MyInternationalizationString.uAddThreeLoadRelayMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
+ //闀挎寜鍥剧ず鎸夐敭5绉掍互涓婏紝鎸囩ず鐏彉缁裤��
+ //闂儊杩涘叆閰嶇綉鐘舵�併�傜豢鐏唲鐏垯閰嶇綉鎴愬姛
+ string[] msgArry = Language.StringByID(R.MyInternationalizationString.uAddSensorPirMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
- //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(60), false);
- //msg2.Y = msg1.Bottom;
- //if (msgArry.Length > 1)
- //{
- // msg2.Text = msgArry[1];
- //}
- //msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
- //msg2.TextAlignment = TextAlignment.Center;
- //bodyFrameLayout.AddChidren(msg2);
+ 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(60), false);
+ msg2.Y = msg1.Bottom;
+ if (msgArry.Length > 1)
+ {
+ msg2.Text = msgArry[1];
+ }
+ msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ msg2.TextAlignment = TextAlignment.Center;
+ bodyFrameLayout.AddChidren(msg2);
}
#endregion
--
Gitblit v1.8.0