From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs | 30 +++++++++---------------------
1 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
index 1608b0c..3e676f5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
@@ -16,23 +16,12 @@
public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1921 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };
#region 鈼� 搴曢儴鏈夊渾瑙掑竷灞�__________________________
public FrameLayout shadowRadiusFrameLayout = new FrameLayout { BackgroundColor = 0x0f000000 };
- public FrameLayout bottomRadiusFrameLayout1 = new FrameLayout()
- {
- Height = Application.GetRealHeight(100),
- Y = Application.GetRealHeight(930),
- Radius = 17,
- BackgroundColor = ZigbeeColor.Current.XMWhite,
- };
- public FrameLayout bottomRadiusFrameLayout2 = new FrameLayout()
- {
- Height = Application.GetRealHeight(806 - 50),
- Y = Application.GetRealHeight(930 + 48),
- BackgroundColor = ZigbeeColor.Current.XMWhite,
- };
+
public FrameLayout bottomRadiusFrameLayout = new FrameLayout()
{
- Height = Application.GetRealHeight(806),
+ Height = Application.GetRealHeight(906),
Y = Application.GetRealHeight(930),
+ BackgroundColor = ZigbeeColor.Current.XMWhite,
};
public Button btnCancel = new Button
@@ -186,10 +175,9 @@
/// </summary>
/// <param name="frameLayout"></param>
public void BottomRadiusFrameLayout(FrameLayout frameLayout)
- {
- this.shadowRadiusFrameLayout.AddChidren(this.bottomRadiusFrameLayout1);
- this.shadowRadiusFrameLayout.AddChidren(this.bottomRadiusFrameLayout2);
+ {
this.shadowRadiusFrameLayout.AddChidren(this.bottomRadiusFrameLayout);
+ this.bottomRadiusFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
this.bottomRadiusFrameLayout.AddChidren(btnCancel);
this.bottomRadiusFrameLayout.AddChidren(btnBottomTitle);
this.bottomRadiusFrameLayout.AddChidren(btnFinish);
@@ -341,14 +329,14 @@
ZigBee.Device.DoorLock.RemoteUnlockCount--;
string tipText = Language.StringByID(R.MyInternationalizationString.OperrateFailed) + "," + Language.StringByID(R.MyInternationalizationString.Surplus) + ZigBee.Device.DoorLock.RemoteUnlockCount.ToString() + Language.StringByID(R.MyInternationalizationString.Opportunity);
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = tipText, Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show((View)sender1);
+ new Tip() { MaxWidth = 150, Text = tipText, Direction = AMPopTipDirection.Down, CloseTime = 2 }.Show(editInputPassword);
return;
}
}
else
{
CommonPage.Loading.Hide();
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show((View)sender1);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Down, CloseTime = 2 }.Show(editInputPassword);
return;
}
};
@@ -536,7 +524,7 @@
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.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.DoorlockConfirm);
doorDialog3.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
{
dialog3.Close();
@@ -547,7 +535,7 @@
{
System.Threading.Tasks.Task.Run(async () =>
{
- Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
+ Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
try
{
Application.RunOnMainThread(() =>
--
Gitblit v1.8.0