From 7c2541f609e8235c4c33b4fb2ee27125f73f8ee6 Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期五, 24 六月 2022 13:28:36 +0800
Subject: [PATCH] 2022-06-24
---
HDL-ON_Android/Scan.cs | 2 ++
HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs | 47 ++++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/HDL-ON_Android/Scan.cs b/HDL-ON_Android/Scan.cs
index f4f5de5..5748cf2 100644
--- a/HDL-ON_Android/Scan.cs
+++ b/HDL-ON_Android/Scan.cs
@@ -122,6 +122,8 @@
public static byte[] BytesFromText(string text, int width = 300, int height = 300)
{
+ if (text == "") return null;
+
var barcodeWriter = new ZXing.Mobile.BarcodeWriter
{
Format = ZXing.BarcodeFormat.QR_CODE,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
index 7cceca1..fb79e54 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
@@ -119,8 +119,27 @@
PlaceholderTextColor = CSS_Color.PromptingColor1,
};
bodyScrolView.AddChidren(phoneNumberEditText);
- // 鍒嗗壊绾�
- bodyScrolView.AddChidren(new Button()
+ phoneNumberEditText.Foucs = true;
+ phoneNumberEditText.FoucsChanged = (sender, e) =>
+ {
+ if (!phoneNumberEditText.Foucs)
+ {
+ //鎵嬫満鍙风爜閿欒鎻愮ず
+ if (!Utlis.CheckPhoneNumber(phoneNumberEditText.Text.Trim(), "86"))
+ {
+ var tip_dialog = new Tip()
+ {
+ Text = Language.StringByID(StringId.PhoneNumberErrorTip),
+ CloseTime = 2,
+ Direction = AMPopTipDirection.None
+ };
+ tip_dialog.Show(MainPage.BaseView);
+ }
+ }
+ };
+
+ // 鍒嗗壊绾�
+ bodyScrolView.AddChidren(new Button()
{
X = Application.GetRealWidth(20),
Width = Application.GetRealWidth(335),
@@ -154,10 +173,24 @@
TextColor = CSS_Color.FirstLevelTitleColor,
Width = Application.GetRealWidth(335),
PlaceholderText = Language.StringByID(StringId.Input6_DigitsTemporaryPassword),
- Text = tempPassword.tempPwd,
+ IsNumberKeyboardType = true,
PlaceholderTextColor = CSS_Color.PromptingColor1,
};
pwdLayout.AddChidren(pwdEditText);
+ pwdEditText.FoucsChanged = (sender, e) =>
+ {
+ if (!pwdEditText.Foucs)
+ {
+ // 6浣嶅瘑鐮侀獙璇�
+ var tip_dialog = new Tip()
+ {
+ Text = Language.StringByID(StringId.Input6_DigitsTemporaryPassword),
+ CloseTime = 2,
+ Direction = AMPopTipDirection.None
+ };
+ tip_dialog.Show(MainPage.BaseView);
+ }
+ };
//闅忔満瀵嗙爜Btn
randomBtn = new Button()
@@ -443,7 +476,7 @@
{
var tip_dialog = new Tip()
{
- Text = Language.StringByID(StringId.linshimima),
+ Text = Language.StringByID(StringId.Input6_DigitsTemporaryPassword),
CloseTime = 2,
Direction = AMPopTipDirection.None
};
@@ -497,9 +530,11 @@
/// </summary>
private void RefreshVisitorVoucherBtn()
{
+ if (tempPassword == null) return;
+
if (tempPassword.tempPwd != null && tempPassword.tempPwd != "")
{
- codeIV.ImageBytes = Scan.BytesFromText(pwdEditText.Text, codeIV.Width, codeIV.Height);
+ codeIV.ImageBytes = Scan.BytesFromText(tempPassword.tempPwd, codeIV.Width, codeIV.Height);
//鍒ゆ柇浜岀淮鐮佹槸鍚﹀け鏁�
DateTime endTime = DateTime.Parse(tempPassword.validEndTime);
DateTime currentTime = DateTime.Now;
@@ -514,11 +549,13 @@
Text = Language.StringByID(StringId.QRcodeIsInvalid),
};
codeLayout.AddChidren(codeTip);
+ visitorVoucherBtn.Visible = false;
}
visitorVoucherBtn.Text = Language.StringByID(StringId.CancleVisitorCredentials);
}
else
{
+ visitorVoucherBtn.Visible = true;
visitorVoucherBtn.Text = Language.StringByID(StringId.GenerateVisitorCredentials);
}
}
--
Gitblit v1.8.0