From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs | 74 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
index 86513a8..367fc18 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
@@ -13,6 +13,10 @@
#region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
+ /// 娣诲姞鑱旂郴鏂瑰紡鐨勪簨浠�
+ /// </summary>
+ public Action AddPhoneEvent = null;
+ /// <summary>
/// 淇℃伅鎻愮ず鎺т欢
/// </summary>
private NormalViewControl btnErrorMsg = null;
@@ -42,10 +46,32 @@
btnIcon.InitControl();
btnIcon.ButtonClickEvent += ((sender, e) =>
{
+ Contacts.ContactAction = (phoneName, phoneNum) =>
+ {
+ if (string.IsNullOrEmpty(phoneName) == true)
+ {
+ return;
+ }
+ //鎵嬫満鍙锋娴�
+ if (this.CheckPhoneNumber("86", phoneNum, phoneName) == false)
+ {
+ return;
+ }
+ //淇濆瓨鑱旂郴浜�
+ this.SaveCoercePhoneNumber("86", phoneNum, phoneName);
+ };
+ Contacts.Open();
});
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
+
+ //閲嶅啓搴曞眰杩斿洖鎸夐敭浜嬩欢
+ this.BackButtonClickEvent = (sender) =>
+ {
+ this.AddPhoneEvent = null;
+ this.CloseForm();
+ };
}
/// <summary>
@@ -69,15 +95,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);
@@ -101,12 +128,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);
@@ -153,18 +182,25 @@
/// </summary>
/// <param name="areaCode"></param>
/// <param name="phoneNum"></param>
+ /// <param name="strNote"></param>
private async void SaveCoercePhoneNumber(string areaCode, string phoneNum, string strNote)
{
- Dictionary<string, string> dicPhone = new Dictionary<string, string>();
- dicPhone[phoneNum] = areaCode;
+ var listPhone = new List<string>();
+ listPhone.Add(areaCode + "-" + phoneNum);
+ var listNote = new List<string>();
+ listNote.Add(strNote);
//鍙樻洿
- var result = await HdlSafeguardLogic.Current.SetCoercePhoneNumber(dicPhone);
+ var result = await HdlSafeguardLogic.Current.SetCoercePhoneNumber(listPhone, listNote);
if (result == false)
{
return;
}
this.CloseForm();
+
+ //璋冪敤鍥炶皟鍑芥暟
+ this.AddPhoneEvent?.Invoke();
+ this.AddPhoneEvent = null;
}
#endregion
@@ -188,8 +224,8 @@
}
if (strNote == string.Empty)
{
- //璇疯緭鍏ュ娉ㄥ悕绉�
- btnErrorMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInpuBackup);
+ //璇疯緭鍏ュ娉ㄥ唴瀹�
+ btnErrorMsg.Text = Language.StringByID(R.MyInternationalizationString.uPlesaeInputNoteInformation);
return false;
}
@@ -216,13 +252,5 @@
}
#endregion
-
-
-
-
-
-
-
-
}
}
--
Gitblit v1.8.0