From 771e755167fa17de86c774337323cc64465f6ea3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 13 六月 2022 12:01:50 +0800
Subject: [PATCH] Merge branch 'lss' into wxr0114
---
HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs | 115 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
index 68285b6..26a6115 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs
@@ -17,6 +17,7 @@
private Button randomBtn;//闅忔満瀵嗙爜Btn
private FrameLayout codeLayout;
private ImageView codeIV;// 浜岀淮鐮�
+ private Button codeSaveTipBtn;
private Button codeTip;//浜岀淮鐮佹湁鏁堟湡鎻愮ず
private Button visitorVoucherBtn;
private VisitorTempPassword tempPassword;
@@ -48,13 +49,14 @@
};
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, "璁垮閭�璇�").LoadTopView_SettingText(click, "娴嬭瘯璁板綍");
+ new TopViewDiv(bodyView, Language.StringByID(StringId.VisitorInvitation))
+ .LoadTopView_SettingText(click, Language.StringByID(StringId.VisitorRecord));
}
else
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, "璁垮閭�璇�").LoadTopView();
+ new TopViewDiv(bodyView, Language.StringByID(StringId.VisitorInvitation)).LoadTopView();
}
#endregion
@@ -69,7 +71,7 @@
// 鎻愮ず鏂囧瓧
bodyScrolView.AddChidren(new Button()
{
- Text = "*鎮ㄥ彂璧疯瀹簩缁寸爜鍚庯紝璇ヤ簩缁寸爜灏嗗湪鎮ㄨ缃殑鏈夋晥鏈熷唴锛屽彲鑷敱鍒风爜杩涜杩涘嚭锛岃璋ㄦ厧鍒嗕韩璇ヤ簩缁寸爜銆�",
+ Text = Language.StringByID(StringId.VisitorTip),
IsMoreLines = true,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextColor = CSS_Color.PromptingColor1,
@@ -81,7 +83,7 @@
#region 鎵嬫満鍙�
bodyScrolView.AddChidren(new Button()
{
- Text = "鎵嬫満鍙�",
+ Text = Language.StringByID(StringId.PhoneNumber),
Y = Application.GetRealWidth(10),
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
@@ -97,7 +99,8 @@
Width = Application.GetRealWidth(335),
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
- PlaceholderText = "杈撳叆璁垮鎵嬫満鍙�",
+
+ PlaceholderText = Language.StringByID(StringId.InputPhoneNumberOfTheVisitor),
Text = tempPassword.phone,
IsNumberKeyboardType = true,
PlaceholderTextColor = CSS_Color.PromptingColor1,
@@ -117,7 +120,7 @@
bodyScrolView.AddChidren(new Button() { Height = Application.GetRealWidth(10), });
bodyScrolView.AddChidren(new Button()
{
- Text = "鍔ㄦ�佸瘑鐮�",
+ Text = Language.StringByID(StringId.linshimima),
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
Height = Application.GetRealHeight(20),
@@ -137,7 +140,7 @@
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
Width = Application.GetRealWidth(335),
- PlaceholderText = "杈撳叆璁�6浣嶅瘑鐮�",
+ PlaceholderText = Language.StringByID(StringId.Input6_DigitsTemporaryPassword),
Text = tempPassword.tempPwd,
PlaceholderTextColor = CSS_Color.PromptingColor1,
};
@@ -148,7 +151,7 @@
{
X = Application.GetRealWidth(275),
Width = Application.GetRealWidth(80),
- Text = "闅忔満鐢熸垚",
+ Text = Language.StringByID(StringId.RandomGeneration),
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.TextFontSize,
@@ -181,7 +184,7 @@
startLayout.AddChidren(new Button()
{
- Text = "浜岀淮鐮佺敓鏁堟椂闂�",
+ Text = Language.StringByID(StringId.EffectiveTime),
X = Application.GetRealWidth(20),
Width = Application.GetRealWidth(130),
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -199,7 +202,7 @@
};
if (tempPassword.tempPwd == null || tempPassword.tempPwd == "")
{
- startTimeText.Text = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ startTimeText.Text = "";// System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
}
else
{
@@ -221,7 +224,7 @@
// dialog鍥炶皟
Action<string> startTimeAction = (str) =>
{
- startTimeText.Text = str +":00";
+ startTimeText.Text = str + ":00";
};
startTimeBtn.MouseUpEventHandler += (sender, e) =>
{
@@ -255,7 +258,7 @@
endLayout.AddChidren(new Button()
{
- Text = "浜岀淮鐮佸け鏁堟椂闂�",
+ Text = Language.StringByID(StringId.FailureTime),
X = Application.GetRealWidth(20),
Width = Application.GetRealWidth(130),
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -274,7 +277,7 @@
};
if (tempPassword.tempPwd == null || tempPassword.tempPwd == "")
{
- endTimeText.Text = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ endTimeText.Text = "";// System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
}
else
{
@@ -337,15 +340,17 @@
codeLayout.AddChidren(codeIV);
bodyScrolView.AddChidren(new Button() { Height = Application.GetRealWidth(20), });
- bodyScrolView.AddChidren(new Button()
+ codeSaveTipBtn = new Button()
{
X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(20),
- Text = "闀挎寜鍙互鎶婁簩缁寸爜淇濆瓨鍒扮浉鍐�",
+ Text = Language.StringByID(StringId.LongPressQRCodeSave),
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
- });
+ Visible = false,
+ };
+ bodyScrolView.AddChidren(codeSaveTipBtn);
#endregion
bodyScrolView.AddChidren(new Button() { Height = Application.GetRealWidth(28), });
@@ -384,21 +389,67 @@
};
visitorVoucherBtn.MouseUpEventHandler += (sender, e) =>
{
- if (phoneNumberEditText.Text == "" || pwdEditText.Text == "")
+ if (startTimeText.Text.Trim() == "")
{
+ var tip_dialog = new Tip()
+ {
+ Text = Language.StringByID(StringId.VisitorStartTime),
+ CloseTime = 2,
+ Direction = AMPopTipDirection.None
+ };
+ tip_dialog.Show(MainPage.BaseView);
return;
}
+
+ if (endTimeText.Text.Trim() == "")
+ {
+ var tip_dialog = new Tip()
+ {
+ Text = Language.StringByID(StringId.VisitorEndTime),
+ CloseTime = 2,
+ Direction = AMPopTipDirection.None
+ };
+ tip_dialog.Show(MainPage.BaseView);
+ return;
+ }
+
+ if (phoneNumberEditText.Text.Trim() == "" || phoneNumberEditText.Text.Trim().Length != 11)
+ {
+ var tip_dialog = new Tip()
+ {
+ Text = Language.StringByID(StringId.PhoneNumberErrorTip),
+ CloseTime = 2,
+ Direction = AMPopTipDirection.None
+ };
+ tip_dialog.Show(MainPage.BaseView);
+ phoneNumberEditText.Foucs = true;
+ return;
+ }
+
+ if (pwdEditText.Text.Trim() == "" || pwdEditText.Text.Trim().Length != 6)
+ {
+ var tip_dialog = new Tip()
+ {
+ Text = Language.StringByID(StringId.linshimima),
+ CloseTime = 2,
+ Direction = AMPopTipDirection.None
+ };
+ tip_dialog.Show(MainPage.BaseView);
+ pwdEditText.Foucs = true;
+ return;
+ }
+
string tip = "";
string message = "";
if (codeIV.ImageBytes == null)
{
- tip = "璁垮鍑瘉";
- message = "鐢熸垚璁垮浜岀淮鐮佸苟灏嗕复鏃跺瘑鐮佸彂閫佽嚦璁垮鎵嬫満.";
+ tip = Language.StringByID(StringId.tip);
+ message = Language.StringByID(StringId.VisitorTipContent);
}
else
{
- tip = "璁垮鍑瘉";
- message = "纭畾鍒犻櫎璁垮鍑瘉锛�";
+ tip = Language.StringByID(StringId.tip);
+ message = Language.StringByID(StringId.VisitorDelTipContent);
}
new LpTipDialog(Application.Activity, tip, message, new LpTipDialogCallBack(voucher_action)).Show();
};
@@ -413,11 +464,11 @@
string msg = "";
if (bol)
{
- msg = "淇濆瓨鎴愬姛锛�";
+ msg = Language.StringByID(StringId.SavedSuccessfully);
}
else
{
- msg = "淇濆瓨澶辫触锛�";
+ msg = Language.StringByID(StringId.saveFail);
}
EmptyTipView tipView = new EmptyTipView(msg, 160);
tipView.Gravity = Gravity.CenterHorizontal;
@@ -447,15 +498,15 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.textWhiteColor,
BackgroundColor = CSS_Color.DialogTransparentColor1,
- Text = "浜岀淮鐮佸凡澶辨晥",
+ Text = Language.StringByID(StringId.QRcodeIsInvalid),
};
codeLayout.AddChidren(codeTip);
}
- visitorVoucherBtn.Text = "鍒犻櫎璁垮鍑瘉";
+ visitorVoucherBtn.Text = Language.StringByID(StringId.CancleVisitorCredentials);
}
else
{
- visitorVoucherBtn.Text = "鐢熸垚璁垮鍑瘉";
+ visitorVoucherBtn.Text = Language.StringByID(StringId.GenerateVisitorCredentials);
}
}
@@ -488,9 +539,19 @@
{
pwd.id = pack.Data.ToString();
codeIV.ImageBytes = Scan.BytesFromText(pwdEditText.Text, codeIV.Width, codeIV.Height);
+ codeSaveTipBtn.Visible = true;
+ RefreshVisitorVoucherBtn();
+ }
+ else {
+ var tip_dialog = new Tip()
+ {
+ Text = pack.message,
+ CloseTime = 2,
+ Direction = AMPopTipDirection.None
+ };
+ tip_dialog.Show(MainPage.BaseView);
}
}
- RefreshVisitorVoucherBtn();
return result;
}
--
Gitblit v1.8.0