From 691b0f2434acc1685b43f873657c9230726ffe6f Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期二, 19 四月 2022 13:38:20 +0800
Subject: [PATCH] 1.增加人脸、可视对讲入口 2.增加清除推送角标数值接口 3.修改初始化全视通、登出全视通

---
 ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs
index 7eead35..6fb528b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordAddNewForm.cs
@@ -12,6 +12,10 @@
         #region 鈻� 鍙橀噺澹版槑___________________________
 
         /// <summary>
+        /// 瀵嗙爜鏀瑰彉浜嬩欢
+        /// </summary>
+        public Action<string> PasswordChangedEvent = null;
+        /// <summary>
         /// 鐢ㄦ埛璐﹀彿
         /// </summary>
         private int pswNo = 0;
@@ -68,8 +72,6 @@
                     string msg = this.CheckPassword(firstPsw, pssword);
                     if (msg != string.Empty)
                     {
-                        //璇烽噸澶嶈緭鍏ユ柊瀹夐槻瀵嗙爜
-                        pswControl.ResetControlInfo(Language.StringByID(R.MyInternationalizationString.uPleaseRepeatInputNewSafetyPassword));
                         //璁剧疆閿欒淇℃伅
                         pswControl.SetErrorMsg(msg);
                         return;
@@ -113,11 +115,19 @@
 
             //鐣岄潰鐩存帴鍏抽棴
             this.CloseForm();
-            //鍏抽棴缂栬緫鐣岄潰
-            this.CloseFormByFormName("PasswordUserEditorForm");
 
-            var form = new PasswordUserEditorForm();
-            form.AddForm(this.pswNo, pswValue1, i_titleText);
+            if (UserCenterResourse.DicActionForm.ContainsKey("PasswordUserEditorForm") == false)
+            {
+                var form = new PasswordUserEditorForm();
+                form.AddForm(this.pswNo, pswValue1, i_titleText);
+            }
+            else
+            {
+                //鍥炶皟鍑芥暟
+                this.PasswordChangedEvent?.Invoke(pswValue1);
+                this.PasswordChangedEvent = null;
+
+            }
         }
 
         #endregion

--
Gitblit v1.8.0