From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
index 86513a8..9e3a6c2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
@@ -42,6 +42,17 @@
btnIcon.InitControl();
btnIcon.ButtonClickEvent += ((sender, e) =>
{
+ Contacts.ContactAction = (phoneName, phoneNum) =>
+ {
+ //鎵嬫満鍙锋娴�
+ if (this.CheckPhoneNumber("86", phoneNum, phoneName) == false)
+ {
+ return;
+ }
+ //淇濆瓨鑱旂郴浜�
+ this.SaveCoercePhoneNumber("86", phoneNum, phoneName);
+ };
+ Contacts.Open();
});
//鍒濆鍖栦腑閮ㄤ俊鎭�
@@ -101,6 +112,8 @@
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);
@@ -153,13 +166,16 @@
/// </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;
--
Gitblit v1.8.0