From ea285ffe71284f5499e870f89c65b710d2d6a79c Mon Sep 17 00:00:00 2001 From: lss <lsc@hdlchina.com.cn> Date: 星期一, 27 六月 2022 10:54:32 +0800 Subject: [PATCH] Merge branch 'wxr0114' of http://59.41.255.150:6688/r/~wxr/OnPro into wxr0114 --- HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs | 109 ++++++++++++++++++++++++++++++++---------------------- 1 files changed, 64 insertions(+), 45 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs index fb79e54..efd1ad3 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/Visitor/VisitorQRCodePage.cs @@ -46,7 +46,7 @@ public void LoadPage() { #region 椤堕儴瀵艰埅鏍� - if (tempPassword == null|| tempPassword.id==null) + if (tempPassword == null || tempPassword.id == null) { tempPassword = new VisitorTempPassword(); @@ -112,34 +112,17 @@ Width = Application.GetRealWidth(335), TextSize = CSS_FontSize.TextFontSize, TextColor = CSS_Color.FirstLevelTitleColor, - + PlaceholderText = Language.StringByID(StringId.InputPhoneNumberOfTheVisitor), Text = tempPassword.phone, IsNumberKeyboardType = true, PlaceholderTextColor = CSS_Color.PromptingColor1, }; bodyScrolView.AddChidren(phoneNumberEditText); - 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); - } - } - }; + //phoneNumberEditText.Foucs = true; - // 鍒嗗壊绾� - bodyScrolView.AddChidren(new Button() + // 鍒嗗壊绾� + bodyScrolView.AddChidren(new Button() { X = Application.GetRealWidth(20), Width = Application.GetRealWidth(335), @@ -177,20 +160,6 @@ 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() @@ -204,11 +173,6 @@ }; pwdLayout.AddChidren(randomBtn); bodyScrolView.AddChidren(pwdLayout); - randomBtn.MouseUpEventHandler += (sender, e) => - { - string tPwd = getRandomPwd(); - pwdEditText.Text = tPwd; - }; // 鍒嗗壊绾� bodyScrolView.AddChidren(new Button() @@ -413,7 +377,6 @@ }; bodyScrolView.AddChidren(visitorVoucherBtn); - // Action voucher_action = () => { if (codeIV.ImageBytes == null) @@ -516,12 +479,68 @@ { msg = Language.StringByID(StringId.saveFail); } - EmptyTipView tipView = new EmptyTipView(msg, 160); - tipView.Gravity = Gravity.CenterHorizontal; - bodyView.AddChidren(tipView); + + var tip_dialog = new Tip() + { + Text = msg, + CloseTime = 2, + Direction = AMPopTipDirection.None + }; + tip_dialog.Show(MainPage.BaseView); #endif }; + if (tempPassword != null && tempPassword.id != null && tempPassword.id != "") + { + pwdEditText.Text = tempPassword.tempPwd; + pwdEditText.Enable = false; + phoneNumberEditText.Enable = false; + randomBtn.Enable = false; + startTimeBtn.Enable = false; + endTimeBtn.Enable = false; + } + else + { + 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); + } + }; + + randomBtn.MouseUpEventHandler += (sender, e) => + { + string tPwd = getRandomPwd(); + pwdEditText.Text = tPwd; + }; + + 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); + } + } + }; + } + RefreshVisitorVoucherBtn(); } -- Gitblit v1.8.0