From e5f993f52e09eb46878baced83bb8492f147d41c Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 17:58:40 +0800
Subject: [PATCH] 2019-11-04-1

---
 ZigbeeApp/Shared/Phone/UserCenter/Safety/AddCoerceContactForm.cs |   89 +++++++++++++++++++++++---------------------
 1 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddCoerceContactForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddCoerceContactForm.cs
index 475218a..e354e1d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddCoerceContactForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AddCoerceContactForm.cs
@@ -8,68 +8,71 @@
     /// <summary>
     /// 娣诲姞鑳佽揩鑱旂郴浜�
     /// </summary>
-    public class AddCoerceContactForm : UserCenterCommonForm
+    public class AddCoerceContactForm : EditorCommonForm
     {
         /// <summary>
         /// 淇℃伅鎻愮ず鎺т欢
         /// </summary>
-        private ViewNormalControl txtMsg = null;
+        private NormalViewControl txtMsg = null;
         /// <summary>
         /// 鐢佃瘽鍒楄〃
-        /// </summary>
-        private List<Safeguard.PushTargetInfo> listPhoneData = null;
-
+        /// </summary>
+        private List<Safeguard.PushTargetInfo> listPhoneData = null;
+
         /// <summary>
         /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
         /// </summary>
-        /// <param name="listData"></param>
-        public void ShowForm(List<Safeguard.PushTargetInfo> listData)
-        {
-            this.listPhoneData = listData;
-
-            //璁剧疆澶撮儴淇℃伅
+        /// <param name="listData"></param>
+        public void ShowForm(List<Safeguard.PushTargetInfo> listData)
+        {
+            this.listPhoneData = listData;
+
+            //璁剧疆澶撮儴淇℃伅
             base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddContactPersion));
 
             //鍒濆鍖栦腑閮ㄤ俊鎭�
-            this.InitMiddleFrame();
-        }
-
-        /// <summary>
-        /// 鍒濆鍖栦腑閮ㄤ俊鎭�
-        /// </summary>
-        private void InitMiddleFrame()
+            this.InitMiddleFrame();
+        }
+
+        /// <summary>
+        /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+        /// </summary>
+        private void InitMiddleFrame()
         {
+            //娓呯┖bodyFrame
+            this.ClearBodyFrame();
+
             var row = new RowLayout();
             row.Height = ControlCommonResourse.ListViewRowHeight;
             bodyFrameLayout.AddChidren(row);
 
             //鑱旂郴鐢佃瘽
-            var txtPhone = new PhoneAreaControl();
-            txtPhone.Gravity = Gravity.CenterVertical;
-            row.AddChidren(txtPhone);
-            txtPhone.InitControl(this);
-            txtPhone.txtPhone.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputContactWay);
+            //var txtPhone = new PhoneAreaControl();
+            //txtPhone.Gravity = Gravity.CenterVertical;
+            //row.AddChidren(txtPhone);
+            //txtPhone.InitControl(this);
+            //txtPhone.txtPhone.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputContactWay);
 
             //鎻愮ず淇℃伅
-            this.txtMsg = new ViewNormalControl(800, true);
+            this.txtMsg = new NormalViewControl(800, true);
             txtMsg.X = ControlCommonResourse.XXLeft;
             txtMsg.Y = row.Bottom + Application.GetRealHeight(5);
             txtMsg.TextColor = UserCenterColor.Current.Red;
             bodyFrameLayout.AddChidren(txtMsg);
 
             //瀹屾垚
-            var btnfinish = new TopLayoutFinshView();
-            topFrameLayout.AddChidren(btnfinish);
-            btnfinish.MouseUpEventHandler += (sender, e) =>
-            {
-                //鎵ц淇濆瓨鎵嬫満鎿嶄綔
-                this.SavePhoneNumber(txtPhone.AreaCode, txtPhone.PhoneNumber);
-            };
-        }
-
+            //var btnfinish = new TopLayoutFinshView();
+            //topFrameLayout.AddChidren(btnfinish);
+            //btnfinish.MouseUpEventHandler += (sender, e) =>
+            //{
+            //    //鎵ц淇濆瓨鎵嬫満鎿嶄綔
+            //    this.SavePhoneNumber(txtPhone.AreaCode, txtPhone.PhoneNumber);
+            //};
+        }
+
         /// <summary>
         /// 鎵ц淇濆瓨鎵嬫満鎿嶄綔
-        /// </summary>
+        /// </summary>
         private void SavePhoneNumber(string areaCode, string phoneNum)
         {
             //鎵嬫満鍙锋娴�
@@ -80,20 +83,20 @@
 
             //鍙樻洿鑱旂郴浜烘柟寮�
             this.ChangedCoercePhoneNumber(areaCode, phoneNum);
-        }
-
+        }
+
         /// <summary>
         /// 鍙樻洿鑱旂郴浜烘柟寮�
         /// </summary>
-        /// <param name="areaCode"></param>
-        /// <param name="phoneNum"></param>
+        /// <param name="areaCode"></param>
+        /// <param name="phoneNum"></param>
         private async void ChangedCoercePhoneNumber(string areaCode, string phoneNum)
         {
             Dictionary<string, string> dicPhone = new Dictionary<string, string>();
             dicPhone[phoneNum] = areaCode;
 
             //鍙樻洿
-            var result = await Common.LocalSafeguard.Current.SetCoercePhoneNumber(dicPhone);
+            var result = await HdlSafeguardLogic.Current.SetCoercePhoneNumber(dicPhone);
             if (result == false)
             {
                 return;
@@ -113,13 +116,13 @@
 
                 this.CloseForm();
             });
-        }
-
+        }
+
         /// <summary>
         /// 妫�娴嬫墜鏈哄彿
         /// </summary>
         /// <param name="areaCode"></param>
-        /// <param name="phone"></param>
+        /// <param name="phone"></param>
         private bool CheckPhoneNumber(string areaCode, string phone)
         {
             //杈撳叆涓虹┖
@@ -131,7 +134,7 @@
             }
 
             //妫�娴嬫墜鏈哄彿鏍煎紡
-            if (UserCenterLogic.CheckPhoneNumber(phone, areaCode) == false)
+            if (HdlCheckLogic.Current.CheckPhoneNumber(phone, areaCode) == false)
             {
                 //杩欎笉鏄竴涓湁鏁堢殑鎵嬫満鍙�
                 txtMsg.Text = Language.StringByID(R.MyInternationalizationString.uThisIsNotPhoneNumberType);

--
Gitblit v1.8.0