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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
index 9ea0ffd..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);
@@ -424,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);
@@ -529,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