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/PswGestureSecirityForm.cs | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs
index 62aa0e3..e002904 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswGestureSecirityForm.cs
@@ -43,7 +43,7 @@
frameBack.Width = Application.GetRealWidth(965);
frameBack.Height = Application.GetRealHeight(1486);
frameBack.BackgroundColor = UserCenterColor.Current.White;
- frameBack.Radius = 6;
+ frameBack.Radius = 8;
bodyFrameLayout.AddChidren(frameBack);
//鎵嬪娍楠岃瘉鎺т欢
@@ -83,13 +83,9 @@
};
//Touch ID寮�閿�
- var btnTouch = new NormalClickButton(frameBack.Width / 2, Application.GetRealHeight(127));
- btnTouch.BackgroundColor = 0xfff5f6fa;
- btnTouch.oldBackgroundColor = 0xfff5f6fa;
- btnTouch.Gravity = Gravity.BottomLeft;
- btnTouch.Text = i_TouchText;
- btnTouch.TextColor = UserCenterColor.Current.TextColor1;
+ var btnTouch = new BottomLeftClickButton(frameBack.Width / 2, Application.GetRealHeight(127));
frameBack.AddChidren(btnTouch);
+ btnTouch.InitControl(i_TouchText);
if (UserCenterResourse.Option.FingerprintAuthentication == false)
{
//娌℃湁鍚敤Touch ID
@@ -143,13 +139,9 @@
};
//瀵嗙爜寮�閿�
- var btnPsw = new NormalClickButton(frameBack.Width / 2, Application.GetRealHeight(127));
- btnPsw.BackgroundColor = 0xff232323;
- btnPsw.oldBackgroundColor = 0xfff5f6fa;
- btnPsw.Text = i_PasswordText;
- btnPsw.TextColor = UserCenterColor.Current.White;
- btnPsw.Gravity = Gravity.BottomRight;
+ var btnPsw = new BottomRightClickButton(frameBack.Width - btnTouch.Width, btnTouch.Height);
frameBack.AddChidren(btnPsw);
+ btnPsw.InitControl(i_PasswordText);
if (string.IsNullOrEmpty(UserCenterResourse.Option.PswAuthentication) == true)
{
//娌℃湁鍚敤瀵嗙爜寮�閿�
--
Gitblit v1.8.0