From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs | 218 +++++++++++-------------------------------------------
1 files changed, 44 insertions(+), 174 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
index 9ea0ffd..95da582 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
@@ -64,7 +53,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 +139,7 @@
Width = Application.GetRealWidth(1080 - 161),
Height = Application.GetRealWidth(69),
TextSize = 17,
+ IsBold = true,
X = Application.GetRealWidth(161 - 116),
};
titleFrameLayout.AddChidren(title);
@@ -186,9 +176,8 @@
/// <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);
@@ -292,46 +281,15 @@
}
if (!UserCenterResourse.Option.DoorUnLockByRemote)
{
- var dialog2 = new Dialog { };
- var doorDialog2 = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog2, Language.StringByID(R.MyInternationalizationString.Tip));
- doorDialog2.Show();
- doorDialog2.dialogMidFraFrameLayout.Width = Application.GetRealWidth(674);
- doorDialog2.dialogMidFraFrameLayout.Height = Application.GetRealHeight(115);
- doorDialog2.dialogMidFraFrameLayout.X = Application.GetRealWidth(60);
- doorDialog2.dialogMidFraFrameLayout.Y = Application.GetRealHeight(167);
- doorDialog2.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.GoSetting);
- var midText1 = new Button()
- {
- Width = Application.GetRealWidth(674),
- Height = Application.GetRealHeight(115 / 2),
- TextSize = 14,
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- TextAlignment = TextAlignment.Center,
- TextID = R.MyInternationalizationString.RemoteUnlockBindSucessTip1,
- };
- doorDialog2.dialogMidFraFrameLayout.AddChidren(midText1);
- var midText2 = new Button()
- {
- Width = Application.GetRealWidth(674),
- Height = Application.GetRealHeight(115 / 2),
- Y = Application.GetRealHeight(115 / 2),
- TextSize = 14,
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- TextAlignment = TextAlignment.Center,
- TextID = R.MyInternationalizationString.RemoteUnlockBindSucessTip2,
- };
- doorDialog2.dialogMidFraFrameLayout.AddChidren(midText2);
-
- doorDialog2.dialogBtnCancel.MouseUpEventHandler += (sender2, e2) =>
- {
- dialog2.Close();
- };
- doorDialog2.dialogBtnConfirm.MouseUpEventHandler += async (sender2, e2) =>
+ string msg = Language.StringByID(R.MyInternationalizationString.RemoteUnlockBindSucessTip).Replace("{0}", "\r\n");
+ var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.GoSetting));
+ alert.Show();
+ //浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
+ alert.ConfirmClickEvent += () =>
{
var form = new UserCenter.UserMain.SecondAuthenticationForm();
- form.AddForm();
- dialog2.Close();
- };
+ form.AddForm();
+ };
}
doorLock.ReSave();
}
@@ -340,14 +298,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;
}
};
@@ -368,46 +326,15 @@
/// <param name="action">浜屾楠岃瘉鐨勭粨鏋滄垚鍔熷悗鐨勯�氱煡</param>
public static void SecurityRequest(ZigBee.Device.DoorLock doorLock, Action action)
{
- var dialog2 = new Dialog { };
- var doorDialog2 = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog2, Language.StringByID(R.MyInternationalizationString.Tip));
- doorDialog2.Show();
- doorDialog2.dialogMidFraFrameLayout.Width = Application.GetRealWidth(674);
- doorDialog2.dialogMidFraFrameLayout.Height = Application.GetRealHeight(115);
- doorDialog2.dialogMidFraFrameLayout.X = Application.GetRealWidth(60);
- doorDialog2.dialogMidFraFrameLayout.Y = Application.GetRealHeight(167);
- doorDialog2.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.GoSetting);
- var midText1 = new Button()
- {
- Width = Application.GetRealWidth(674),
- Height = Application.GetRealHeight(115 / 2),
- TextSize = 14,
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- TextAlignment = TextAlignment.Center,
- TextID = R.MyInternationalizationString.GoPersonalCenter,
- };
- doorDialog2.dialogMidFraFrameLayout.AddChidren(midText1);
- var midText2 = new Button()
- {
- Width = Application.GetRealWidth(674),
- Height = Application.GetRealHeight(115 / 2),
- Y = Application.GetRealHeight(115 / 2),
- TextSize = 14,
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- TextAlignment = TextAlignment.Center,
- TextID = R.MyInternationalizationString.OpenRemoteVerification,
- };
- doorDialog2.dialogMidFraFrameLayout.AddChidren(midText2);
-
- doorDialog2.dialogBtnCancel.MouseUpEventHandler += (sender2, e2) =>
- {
- dialog2.Close();
- };
- doorDialog2.dialogBtnConfirm.MouseUpEventHandler += async (sender2, e2) =>
+ string msg = Language.StringByID(R.MyInternationalizationString.GoPersonalCenter).Replace("{0}", "\r\n");
+ var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.GoSetting));
+ alert.Show();
+ //浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
+ alert.ConfirmClickEvent += () =>
{
var form = new UserCenter.UserMain.SecondAuthenticationForm();
form.AddForm();
- dialog2.Close();
- };
+ };
}
/// <summary>
@@ -421,22 +348,11 @@
{
if (doorLock.RemoteUnlockPassword == "")
{
- 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.Y = Application.GetRealHeight(202);
- doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
- doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.BindRemoteUnlockDoorlock);
- doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
- doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.GoSetting);
- doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
- {
- dialog.Close();
- };
- doorDialog.dialogBtnConfirm.MouseUpEventHandler += (sender1, e1) =>
+ string msgRemoteUnlockRequest = Language.StringByID(R.MyInternationalizationString.BindRemoteUnlockDoorlock);
+ var alertRemoteUnlockRequest = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msgRemoteUnlockRequest, Language.StringByID(R.MyInternationalizationString.GoSetting));
+ alertRemoteUnlockRequest.Show();
+ //浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
+ alertRemoteUnlockRequest.ConfirmClickEvent += () =>
{
if (UserCenterResourse.UserInfo.AuthorityNo == 1)
{
@@ -454,7 +370,6 @@
}
}
};
- dialog.Close();
}
else
{
@@ -475,7 +390,6 @@
}
}
};
- dialog.Close();
}
};
return;
@@ -483,71 +397,29 @@
if (!UserCenterResourse.Option.DoorUnLockByRemote)
{
- var dialog2 = new Dialog { };
- var doorDialog2 = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog2, Language.StringByID(R.MyInternationalizationString.Tip));
- doorDialog2.Show();
- doorDialog2.dialogMidFraFrameLayout.Width = Application.GetRealWidth(674);
- doorDialog2.dialogMidFraFrameLayout.Height = Application.GetRealHeight(115);
- doorDialog2.dialogMidFraFrameLayout.X = Application.GetRealWidth(60);
- doorDialog2.dialogMidFraFrameLayout.Y = Application.GetRealHeight(167);
- doorDialog2.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.GoSetting);
- var midText1 = new Button()
- {
- Width = Application.GetRealWidth(674),
- Height = Application.GetRealHeight(115 / 2),
- TextSize = 14,
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- TextAlignment = TextAlignment.Center,
- TextID = R.MyInternationalizationString.GoPersonalCenter,
- };
- doorDialog2.dialogMidFraFrameLayout.AddChidren(midText1);
- var midText2 = new Button()
- {
- Width = Application.GetRealWidth(674),
- Height = Application.GetRealHeight(115 / 2),
- Y = Application.GetRealHeight(115 / 2),
- TextSize = 14,
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- TextAlignment = TextAlignment.Center,
- TextID = R.MyInternationalizationString.OpenRemoteVerification,
- };
- doorDialog2.dialogMidFraFrameLayout.AddChidren(midText2);
-
- doorDialog2.dialogBtnCancel.MouseUpEventHandler += (sender2, e2) =>
- {
- dialog2.Close();
- };
- doorDialog2.dialogBtnConfirm.MouseUpEventHandler += async (sender2, e2) =>
+ string msgDoorUnLockByRemote = Language.StringByID(R.MyInternationalizationString.GoPersonalCenter).Replace("{0}", "\r\n");
+ var alertDoorUnLockByRemote = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msgDoorUnLockByRemote, Language.StringByID(R.MyInternationalizationString.GoSetting));
+ alertDoorUnLockByRemote.Show();
+ //浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
+ alertDoorUnLockByRemote.ConfirmClickEvent += () =>
{
var form = new UserCenter.UserMain.SecondAuthenticationForm();
form.AddForm();
- dialog2.Close();
- };
+ };
return;
}
- 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.Y = Application.GetRealHeight(202);
- doorDialog3.dialogMidFraFrameLayout.AddChidren(doorDialog3.dialogMidText);
- doorDialog3.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.SureToOpenDoorLock);
- doorDialog3.dialogMidFraFrameLayout.AddChidren(doorDialog3.dialogMidText);
- doorDialog3.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.Confrim);
- doorDialog3.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
- {
- dialog3.Close();
- };
- doorDialog3.dialogBtnConfirm.MouseUpEventHandler += (sender1, e1) =>
+ string msg = Language.StringByID(R.MyInternationalizationString.SureToOpenDoorLock);
+ var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
+ alert.Show();
+ //浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
+ alert.ConfirmClickEvent += () =>
{
action = () =>
{
System.Threading.Tasks.Task.Run(async () =>
{
- Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
+ Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
try
{
Application.RunOnMainThread(() =>
@@ -587,7 +459,7 @@
if (btnStatus != null)
{
btnStatus.Text = Language.StringByID(R.MyInternationalizationString.DoorLockOpen);
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnlockSuccess), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show((View)sender1);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnlockSuccess), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
}
});
System.Threading.Thread.Sleep(5000);
@@ -608,7 +480,7 @@
{
btnStatus.Text = Language.StringByID(R.MyInternationalizationString.CLose);
}
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnlockFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show((View)sender1);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnlockFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
});
}
}
@@ -631,7 +503,7 @@
{
btnStatus.Text = Language.StringByID(R.MyInternationalizationString.CLose);
}
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnlockFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show((View)sender1);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnlockFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
});
}
else
@@ -650,10 +522,9 @@
{
btnStatus.Text = Language.StringByID(R.MyInternationalizationString.CLose);
}
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.DoorlockPasswordDispear), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show((View)sender1);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.DoorlockPasswordDispear), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
CommonPage.Loading.Hide();
doorLock.RemoteUnlockPassword = "";
- dialog3.Close();
if (UserCenterResourse.UserInfo.AuthorityNo == 1)
{
var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
@@ -710,7 +581,7 @@
{
btnStatus.Text = Language.StringByID(R.MyInternationalizationString.CLose);
}
- 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.Up, CloseTime = 2 }.Show(CommonPage.Instance);
});
}
}
@@ -729,8 +600,7 @@
});
};
HdlCheckLogic.Current.CheckSecondarySecurity(action);
- dialog3.Close();
- };
+ };
}
// 鑾峰彇鍒板埌鍚嶇О鏇存敼鍥炶皟閫氱煡
public Action<string> devicNameSecAction;
--
Gitblit v1.8.0