From 5986f63b75bd81c6cef262c670e9251c038cbf5d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 17 十二月 2019 17:21:07 +0800
Subject: [PATCH] 合并一个版本
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
index e2bcbed..1608b0c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
@@ -64,7 +64,7 @@
Height = Application.GetRealHeight(58),
Width = Application.GetRealWidth(101),
Text = Language.StringByID(R.MyInternationalizationString.Complete),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
TextSize = 14,
};
#endregion
@@ -150,6 +150,7 @@
Width = Application.GetRealWidth(1080 - 161),
Height = Application.GetRealWidth(69),
TextSize = 17,
+ IsBold = true,
X = Application.GetRealWidth(161 - 116),
};
titleFrameLayout.AddChidren(title);
@@ -207,22 +208,28 @@
doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(69);
doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(58);
doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(213);
- doorDialog.dialogMidFraFrameLayout.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBorder;
+ doorDialog.dialogMidFraFrameLayout.BackgroundColor = BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBorder;
+
+ var editInputPasswordFrameLayout = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(677) - 2,
+ Height = Application.GetRealHeight(69) - 2,
+ X = 1,
+ Y = 1,
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+ };
+ doorDialog.dialogMidFraFrameLayout.AddChidren(editInputPasswordFrameLayout);
var editInputPassword = new EditText()
{
- Width = Application.GetRealWidth(672),
- Height = Application.GetRealHeight(63),
- X = Application.GetRealWidth(3),
- Y = Application.GetRealHeight(3),
- TextSize = 14,
+ X = Application.GetRealHeight(25),
+ TextSize = 13,
PlaceholderTextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
PlaceholderText = Language.StringByID(R.MyInternationalizationString.InputUnlockPasswrd),
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
- TextAlignment = TextAlignment.CenterLeft,
- BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+ TextAlignment = TextAlignment.BottomLeft,
};
- doorDialog.dialogMidFraFrameLayout.AddChidren(editInputPassword);
+ editInputPasswordFrameLayout.AddChidren(editInputPassword);
doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
{
@@ -418,9 +425,8 @@
var dialog = new Dialog { };
var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog, Language.StringByID(R.MyInternationalizationString.Tip));
doorDialog.Show();
- doorDialog.dialogMidFraFrameLayout.Width = Application.GetRealWidth(415);
doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
- doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(190);
+ doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.BindRemoteUnlockDoorlock);
@@ -523,12 +529,12 @@
var dialog3 = new Dialog { };
var doorDialog3 = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog3, Language.StringByID(R.MyInternationalizationString.UnlockRequest));
doorDialog3.Show();
- doorDialog3.dialogMidFraFrameLayout.Width = Application.GetRealWidth(415);
doorDialog3.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
- doorDialog3.dialogMidFraFrameLayout.X = Application.GetRealWidth(228);
+ doorDialog3.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
doorDialog3.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
doorDialog3.dialogMidFraFrameLayout.AddChidren(doorDialog3.dialogMidText);
doorDialog3.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.SureToOpenDoorLock);
+ doorDialog3.dialogMidText.TextAlignment = TextAlignment.Center;
doorDialog3.dialogMidFraFrameLayout.AddChidren(doorDialog3.dialogMidText);
doorDialog3.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.Confrim);
doorDialog3.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
--
Gitblit v1.8.0