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 |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswAddContactForm.cs
index 8a14e1a..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;
@@ -61,6 +65,13 @@
 
             //鍒濆鍖栦腑閮ㄤ俊鎭�
             this.InitMiddleFrame();
+
+            //閲嶅啓搴曞眰杩斿洖鎸夐敭浜嬩欢
+            this.BackButtonClickEvent = (sender) =>
+            {
+                this.AddPhoneEvent = null;
+                this.CloseForm();
+            };
         }
 
         /// <summary>
@@ -84,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);
@@ -185,6 +197,10 @@
                 return;
             }
             this.CloseForm();
+
+            //璋冪敤鍥炶皟鍑芥暟
+            this.AddPhoneEvent?.Invoke();
+            this.AddPhoneEvent = null;
         }
 
         #endregion

--
Gitblit v1.8.0