From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs | 146 +++++++++++++++++++++++++++++++-----------------
1 files changed, 94 insertions(+), 52 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs
index 5c4653d..f792ccc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/SecondAuthenticationForm.cs
@@ -47,27 +47,37 @@
frameTop.BackgroundColor = UserCenterColor.Current.White;
bodyFrameLayout.AddChidren(frameTop);
- var rowFinger = new FrameRowControl(frameTop.rowSpace / 2);
- rowFinger.UseClickStatu = false;
- frameTop.AddChidren(rowFinger);
- //鎸囩汗楠岃瘉
- var btnFinger = rowFinger.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uFingerprintAuthentication), 400, 58);
- btnFinger.Y = Application.GetRealHeight(12) + rowFinger.chidrenYaxis;
- rowFinger.AddChidren(btnFinger, ChidrenBindMode.NotBind);
- //浠呭鏈満鏈夋晥
- var btnEffect= rowFinger.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uOnlyEffectToThisPhone), 400, 40);
- btnEffect.Y = Application.GetRealHeight(72) + rowFinger.chidrenYaxis;
- btnEffect.TextSize = 12;
- btnEffect.TextColor = UserCenterColor.Current.TextGrayColor1;
- rowFinger.AddChidren(btnEffect, ChidrenBindMode.NotBind);
- //寮�鍏虫寜閽�
- var btnFingerSwicth = rowFinger.AddMostRightSwitchIcon();
- btnFingerSwicth.IsSelected = UserCenterResourse.AccountOption.FingerprintAuthentication;
- //搴曠嚎
- rowFinger.AddBottomLine();
+ MostRightIconControl btnFingerSwicth = null;
+ var touchIDSupper = TouchIDUtils.getTouchIDSupperType();
+ if (touchIDSupper == TouchIDUtils.TouchIDSupperType.TouchID)
+ {
+ var rowFinger = new FrameRowControl(frameTop.rowSpace / 2);
+ rowFinger.UseClickStatu = false;
+ frameTop.AddChidren(rowFinger);
+ //鎸囩汗楠岃瘉
+ var btnFinger = rowFinger.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uFingerprintAuthentication), 400, 58);
+ btnFinger.Y = Application.GetRealHeight(12) + rowFinger.chidrenYaxis;
+ rowFinger.AddChidren(btnFinger, ChidrenBindMode.NotBind);
+ //浠呭鏈満鏈夋晥
+ var btnEffect = rowFinger.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uOnlyEffectToThisPhone), 400, 40);
+ btnEffect.Y = Application.GetRealHeight(72) + rowFinger.chidrenYaxis;
+ btnEffect.TextSize = 12;
+ btnEffect.TextColor = UserCenterColor.Current.TextGrayColor1;
+ rowFinger.AddChidren(btnEffect, ChidrenBindMode.NotBind);
+ //寮�鍏虫寜閽�
+ btnFingerSwicth = rowFinger.AddMostRightSwitchIcon();
+ btnFingerSwicth.IsSelected = UserCenterResourse.AccountOption.FingerprintAuthentication;
+ //搴曠嚎
+ rowFinger.AddBottomLine();
+ }
var rowPsw = new FrameRowControl(frameTop.rowSpace / 2);
frameTop.AddChidren(rowPsw);
+ //濡傛灉杩欎釜鎵嬫満涓嶆敮鎸乀ouchId鐨勮瘽,鍒欏鍣ㄥ噺鍘昏繖涓鐨勯珮搴�
+ if (touchIDSupper != TouchIDUtils.TouchIDSupperType.TouchID)
+ {
+ frameTop.Height -= rowPsw.Height;
+ }
//瀵嗙爜楠岃瘉
rowPsw.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uPasswordAuthentication), 400);
//鍙崇澶�
@@ -158,40 +168,43 @@
btnMsg2.TextColor = UserCenterColor.Current.TextGrayColor2;
//鎸囩汗楠岃瘉
- btnFingerSwicth.ButtonClickEvent += (sender, e) =>
+ if (btnFingerSwicth != null)
{
- if (btnFingerSwicth.IsSelected == false)
+ btnFingerSwicth.ButtonClickEvent += (sender, e) =>
{
- TouchIDUtils.TouchIDSupperType type = TouchIDUtils.getTouchIDSupperType();
- if (type == TouchIDUtils.TouchIDSupperType.None)
+ if (btnFingerSwicth.IsSelected == false)
{
- //寮�鍚寚绾归獙璇佸け璐ワ紒璇峰墠寰�鎵嬫満{0}璁剧疆寮�鍚寚绾瑰紑閿侀獙璇�
- string msg = Language.StringByID(R.MyInternationalizationString.uUseFingerprintAuthenticationFailMsg);
- msg = msg.Replace("{0}", "\r\n");
- this.ShowMassage(ShowMsgType.Normal, msg);
- return;
+ TouchIDUtils.TouchIDSupperType type = TouchIDUtils.getTouchIDSupperType();
+ if (type == TouchIDUtils.TouchIDSupperType.None)
+ {
+ //寮�鍚寚绾归獙璇佸け璐ワ紒璇峰墠寰�鎵嬫満{0}璁剧疆寮�鍚寚绾瑰紑閿侀獙璇�
+ string msg = Language.StringByID(R.MyInternationalizationString.uUseFingerprintAuthenticationFailMsg);
+ msg = msg.Replace("{0}", "\r\n");
+ this.ShowMassage(ShowMsgType.Normal, msg);
+ return;
+ }
+ //灏員ouch ID鐢ㄤ簬銆孼igBee銆峽0}鏇存敼瀹夐槻璁剧疆鍜屽紑鍚棬閿佹椂浣跨敤
+ string msg2 = Language.StringByID(R.MyInternationalizationString.uUseFingerprintAuthenticationMsg);
+ msg2 = msg2.Replace("{0}", "\r\n");
+ this.ShowMassage(ShowMsgType.Confirm, msg2, () =>
+ {
+ //濡傛灉璁剧疆鏈夊畨鍏ㄩ獙璇�,鎯宠淇敼瀹�,蹇呴』鍏堥�氳繃瀹夊叏楠岃瘉
+ //濡傛灉娌℃湁璁剧疆鏈夊畨鍏ㄩ獙璇�,鍒欐棤闇�楠岃瘉
+ HdlCheckLogic.Current.CheckSecondarySecurity(
+ () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); },//澶勭悊鎸囩汗楠岃瘉
+ () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); });//澶勭悊鎸囩汗楠岃瘉
+ });
}
- //灏員ouch ID鐢ㄤ簬銆孼igBee銆峽0}鏇存敼瀹夐槻璁剧疆鍜屽紑鍚棬閿佹椂浣跨敤
- string msg2 = Language.StringByID(R.MyInternationalizationString.uUseFingerprintAuthenticationMsg);
- msg2 = msg2.Replace("{0}", "\r\n");
- this.ShowMassage(ShowMsgType.Confirm, msg2, () =>
+ else
{
//濡傛灉璁剧疆鏈夊畨鍏ㄩ獙璇�,鎯宠淇敼瀹�,蹇呴』鍏堥�氳繃瀹夊叏楠岃瘉
//濡傛灉娌℃湁璁剧疆鏈夊畨鍏ㄩ獙璇�,鍒欐棤闇�楠岃瘉
HdlCheckLogic.Current.CheckSecondarySecurity(
- () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); },//澶勭悊鎸囩汗楠岃瘉
- () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); });//澶勭悊鎸囩汗楠岃瘉
- });
- }
- else
- {
- //濡傛灉璁剧疆鏈夊畨鍏ㄩ獙璇�,鎯宠淇敼瀹�,蹇呴』鍏堥�氳繃瀹夊叏楠岃瘉
- //濡傛灉娌℃湁璁剧疆鏈夊畨鍏ㄩ獙璇�,鍒欐棤闇�楠岃瘉
- HdlCheckLogic.Current.CheckSecondarySecurity(
- () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); },//澶勭悊鎸囩汗楠岃瘉
- () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); });//澶勭悊鎸囩汗楠岃瘉
- }
- };
+ () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); },//澶勭悊鎸囩汗楠岃瘉
+ () => { this.DoFingerprintAuthentication(btnFingerSwicth, btnLockSwicth); });//澶勭悊鎸囩汗楠岃瘉
+ }
+ };
+ }
//瀵嗙爜楠岃瘉
rowPsw.ButtonClickEvent += (sender, e) =>
{
@@ -362,10 +375,10 @@
return;
}
btnTitle.CanClick = false;
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
this.ShowProgressBar();
- var result = await HdlBackupLogic.Current.LoadHideOption();
+ var result = HdlBackupLogic.Current.LoadHideOption();
this.CloseProgressBar();
if (result == true)
{
@@ -392,21 +405,50 @@
dialogForm.ComfirmClickEvent += ((textValue) =>
{
dialogForm.CloseDialog();
- if (textValue == "2887")
+ if (textValue.StartsWith("2887") == true)
{
- //寮�鍚殣钘忚彍鍗�
- UserCenterResourse.HideOption.CenterHideMenu = 1;
+ var myTime = DateTime.Now;
+ string strTime1 = myTime.ToString("HHmm");
+ int value1 = Convert.ToInt32(strTime1.Substring(3, 1));
+ string check1 = "2887" + strTime1 + (7 + value1).ToString();
+
+ myTime = myTime.AddMinutes(-1);
+ string strTime2 = myTime.ToString("HHmm");
+ int value2 = Convert.ToInt32(strTime2.Substring(3, 1));
+ string check2 = "2887" + strTime2 + (7 + value2).ToString();
+
+ myTime = myTime.AddMinutes(2);
+ string strTime3 = myTime.ToString("HHmm");
+ int value3 = Convert.ToInt32(strTime3.Substring(3, 1));
+ string check3 = "2887" + strTime3 + (7 + value3).ToString();
+
+ if (textValue == check1 || textValue == check2 || textValue == check3)
+ {
+ //寮�鍚殣钘忚彍鍗�
+ UserCenterResourse.HideOption.CenterHideMenu = 1;
+ }
}
- if (textValue == "0001")
+ if (textValue == "84651666")
{
- var form = new Guide.GuideHouseForm();
- form.ShowFrom();
+ //鏄剧ず璁惧鍘嗗彶鐗堟湰
+ UserCenterResourse.HideOption.DeviceHistory = 1;
}
if (textValue == "12349")
{
//寮哄埗璺宠浆鐪熷疄璁惧鐣岄潰
UserCenterResourse.HideOption.GotoRealDeviceForm = 1;
}
+ if (textValue == "12348")
+ {
+ //寮哄埗璺宠浆缃戝叧鐣岄潰
+ UserCenterResourse.HideOption.GotoGatewayProductInfoForm = 1;
+ }
+ if (textValue == "abcdef1")
+ {
+ //寮哄埗鍙樻洿甯稿紑妯″紡鐨勬椂闂翠负鍒嗛挓
+ UserCenterResourse.HideOption.DoorLockNomallyOpenTimeMode = 1;
+ }
+
this.ShowMassage(ShowMsgType.Tip, "Ok!");
});
}
--
Gitblit v1.8.0