From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
index 3764cf8..e626f06 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
@@ -43,7 +43,7 @@
frameBack.Width = Application.GetRealWidth(965);
frameBack.Height = Application.GetRealHeight(1711);
frameBack.BackgroundColor = UserCenterColor.Current.White;
- frameBack.Radius = 6;
+ frameBack.Radius = 8;
bodyFrameLayout.AddChidren(frameBack);
//瀵嗙爜杈撳叆鎺т欢
@@ -86,13 +86,9 @@
};
//鎵嬪娍寮�閿�
- var btnGesture = new NormalClickButton(frameBack.Width / 2, Application.GetRealHeight(127));
- btnGesture.oldBackgroundColor = 0xfff5f6fa;
- btnGesture.BackgroundColor = 0xfff5f6fa;
- btnGesture.Text = i_GestureText;
- btnGesture.TextColor = UserCenterColor.Current.TextColor1;
- btnGesture.Gravity = Gravity.BottomLeft;
+ var btnGesture = new BottomLeftClickButton(frameBack.Width / 2, Application.GetRealHeight(127));
frameBack.AddChidren(btnGesture);
+ btnGesture.InitControl(i_GestureText);
if (string.IsNullOrEmpty(UserCenterResourse.Option.GestureAuthentication) == true)
{
//娌℃湁鍚敤鎵嬪娍寮�閿�
@@ -106,13 +102,9 @@
};
//Touch ID寮�閿�
- var btnTouch = new NormalClickButton(frameBack.Width / 2, Application.GetRealHeight(127));
- btnTouch.BackgroundColor = 0xff232323;
- btnTouch.oldBackgroundColor = 0xff232323;
- btnTouch.Text = i_TouchText;
- btnTouch.TextColor = UserCenterColor.Current.White;
- btnTouch.Gravity = Gravity.BottomRight;
+ var btnTouch = new BottomRightClickButton(frameBack.Width - btnGesture.Width, btnGesture.Height);
frameBack.AddChidren(btnTouch);
+ btnTouch.InitControl(i_TouchText);
if (UserCenterResourse.Option.FingerprintAuthentication == false)
{
//娌℃湁鍚敤Touch ID
--
Gitblit v1.8.0