From fdc47d950498e088260a3b04028703adc0f878e0 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 30 三月 2020 10:54:27 +0800
Subject: [PATCH] 2020-03-30-1
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
index 702fbec..8fa4707 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
@@ -44,6 +44,15 @@
{
Contacts.ContactAction = (phoneName, phoneNum) =>
{
+ if (string.IsNullOrEmpty(phoneName) == true)
+ {
+ return;
+ }
+ //鎵嬫満鍙锋娴�
+ if (this.CheckPhoneNumber("86", phoneNum, phoneName) == false)
+ {
+ return;
+ }
//淇濆瓨鑱旂郴浜�
this.SaveCoercePhoneNumber("86", phoneNum, phoneName);
};
@@ -75,15 +84,16 @@
btnArea.TextAlignment = TextAlignment.Center;
btnArea.TextColor = UserCenterColor.Current.TextGrayColor1;
frameBack.AddChidren(btnArea);
- btnArea.ButtonClickEvent += (sender, e) =>
- {
- var form = new AreaCodeSelectForm();
- form.AddForm();
- form.FinishSelectEvent += (code) =>
- {
- btnArea.Text = "+" + code;
- };
- };
+ //鐩墠鍙拡瀵�+86
+ //btnArea.ButtonClickEvent += (sender, e) =>
+ //{
+ // var form = new AreaCodeSelectForm();
+ // form.AddForm();
+ // form.FinishSelectEvent += (code) =>
+ // {
+ // btnArea.Text = "+" + code;
+ // };
+ //};
//鐢佃瘽杈撳叆妗�
var txtPhone = new TextInputControl(Application.GetRealWidth(634), btnArea.Height, false);
txtPhone.X = btnArea.Right + Application.GetRealWidth(35);
@@ -107,12 +117,14 @@
btnLine.Y = Application.GetRealHeight(150);
btnLine.Gravity = Gravity.CenterHorizontal;
frameBack.AddChidren(btnLine);
+ //鑱斿姩绾跨殑鐘舵��
+ txtPhone.btnLine = btnLine;
//澶囨敞
var txtNote = new TextInputControl(Application.GetRealWidth(740), txtPhone.Height, false);
txtNote.X = ControlCommonResourse.XXLeft;
txtNote.Y = btnLine.Bottom + Application.GetRealHeight(60);
- txtNote.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup);
+ txtNote.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPlesaeInputNoteInformation);
frameBack.AddChidren(txtNote);
//鍙栨秷鍥炬爣
var btnCancel2 = new MostRightIconControl(69, 69);
@@ -197,8 +209,8 @@
}
if (strNote == string.Empty)
{
- //璇疯緭鍏ュ娉ㄥ悕绉�
- btnErrorMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup);
+ //璇疯緭鍏ュ娉ㄥ唴瀹�
+ btnErrorMsg.Text = Language.StringByID(R.MyInternationalizationString.uPlesaeInputNoteInformation);
return false;
}
@@ -225,13 +237,5 @@
}
#endregion
-
-
-
-
-
-
-
-
}
}
--
Gitblit v1.8.0