From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 16 七月 2024 13:59:56 +0800
Subject: [PATCH] 增加全部挂断

---
 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs |   55 +++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs
index e718b92..5c17463 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs
@@ -23,8 +23,9 @@
         Function device;
         VideoDoorlockUser doorlockUser;
         public Action delCallBackAction;
-
+        public Action<string> updataUserNameAction;
         Loading waitPage;
+
 
         public VideoDoorlockUserManagerPage(Function function,VideoDoorlockUser user)
         {
@@ -33,12 +34,23 @@
             doorlockUser = user;
             BackgroundColor = CSS_Color.BackgroundColor;
             waitPage = new Loading();
-            bodyView.AddChidren(waitPage);
-            waitPage.Hide();
+
+        }
+
+        public override void RemoveFromParent()
+        {
+            base.RemoveFromParent();
+            bodyView = null;
+            if (waitPage != null)
+            {
+                waitPage.RemoveFromParent();
+                waitPage = null;
+            }
         }
 
         public void LoadPage()
         {
+            bodyView.AddChidren(waitPage);
             new TopViewDiv(bodyView, Language.StringByID(StringId.UserManagement)).LoadTopView();
 
             contentView = new VerticalScrolViewLayout()
@@ -115,7 +127,7 @@
                     {
                         return;
                     }
-                    if (System.Text.Encoding.Default.GetBytes(str).Length > 20)
+                    if (System.Text.Encoding.Unicode.GetBytes(str).Length > 20)
                     {
                         new Tip()
                         {
@@ -125,17 +137,20 @@
                         }.Show(bodyView);
                         return;
                     }
-                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
                     new System.Threading.Thread(() =>
                     {
                         try
                         {
+                            Application.RunOnMainThread(() => {
+                                waitPage.Start(Language.StringByID(StringId.PleaseWait));
+                            });
                             var pack = ApiUtlis.Ins.HttpRequest.EditDoorlockUserName(device.deviceId, doorlockUser.extUserId, str);
                             if (pack.Code == StateCode.SUCCESS)
                             {
                                 Application.RunOnMainThread(() =>
                                 {
                                     btnUserName.Text = str;
+                                    updataUserNameAction?.Invoke(str);
                                 });
                             }
                             else
@@ -143,7 +158,10 @@
                                 //澶辫触鎻愮ず
                                 Application.RunOnMainThread(() =>
                                 {
-                                    if (!string.IsNullOrEmpty(pack.message))
+                                    if (string.IsNullOrEmpty(pack.message))
+                                    {
+                                        pack.message = Language.StringByID(StringId.OperationFailed);
+                                    }
                                     {
                                         var tip = new Tip()
                                         {
@@ -172,7 +190,7 @@
                     { IsBackground = true }.Start();
                 };
                 var pa = new PublicAssmebly();
-                pa.entryMaxLength = 30;
+                pa.entryMaxLength = 20;
                 pa.LoadDialog_EditParater(StringId.ChangeName, "", callBack, StringId.UesrNameCannotBeEmpty, 0, new List<string>());
             };
             btnUserName.MouseUpEventHandler = eventHandler;
@@ -330,11 +348,13 @@
                     fingerprintView.AddChidren(btnClearFingerprints);
                     btnClearFingerprints.MouseUpEventHandler = (sender, e) =>
                     {
-                        waitPage.Start(Language.StringByID(StringId.PleaseWait));
                         new System.Threading.Thread(() =>
                         {
                             try
                             {
+                                Application.RunOnMainThread(() => {
+                                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
+                                });
                                 var pack = ApiUtlis.Ins.HttpRequest.DeleteDoorlockUserFingerPassword(device.deviceId, doorlockUser.lockUserIndex);
                                 if (pack != null && pack.Code == StateCode.SUCCESS)
                                 {
@@ -440,11 +460,13 @@
                     digitalPasswordView.AddChidren(btnClearDigitalPassword);
                     btnClearDigitalPassword.MouseUpEventHandler = (sender, e) =>
                     {
-                        waitPage.Start(Language.StringByID(StringId.PleaseWait));
                         new System.Threading.Thread(() =>
                         {
                             try
                             {
+                                Application.RunOnMainThread(() => {
+                                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
+                                });
                                 var pack = ApiUtlis.Ins.HttpRequest.DeleteDoorlockUserNumberPassword(device.deviceId, doorlockUser.lockUserIndex);
                                 if (pack != null && pack.Code == StateCode.SUCCESS)
                                 {
@@ -549,11 +571,13 @@
                     };
                     nfcView.AddChidren(btnClearNfc);
                     btnClearNfc.MouseUpEventHandler = (sender, e) => {
-                        waitPage.Start(Language.StringByID(StringId.PleaseWait));
                         new System.Threading.Thread(() =>
                         {
                             try
                             {
+                                Application.RunOnMainThread(() => {
+                                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
+                                });
                                 var pack = ApiUtlis.Ins.HttpRequest.DeleteDoorlockUserCardPassword(device.deviceId, doorlockUser.lockUserIndex);
                                 if (pack != null && pack.Code == StateCode.SUCCESS)
                                 {
@@ -657,11 +681,13 @@
                     };
                     faceView.AddChidren(btnClearFace);
                     btnClearFace.MouseUpEventHandler = (sender, e) => {
-                        waitPage.Start(Language.StringByID(StringId.PleaseWait));
                         new System.Threading.Thread(() =>
                         {
                             try
                             {
+                                Application.RunOnMainThread(() => {
+                                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
+                                });
                                 var pack = ApiUtlis.Ins.HttpRequest.DeleteDoorlockUserFacePassword(device.deviceId, doorlockUser.lockUserIndex);
                                 if (pack != null && pack.Code == StateCode.SUCCESS)
                                 {
@@ -737,11 +763,13 @@
             {
                 new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DeleteDoorlockUserTip, () =>
                 {
-                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
                     new System.Threading.Thread(() =>
                     {
                         try
                         {
+                            Application.RunOnMainThread(() => {
+                                waitPage.Start(Language.StringByID(StringId.PleaseWait));
+                            });
                             var pack = ApiUtlis.Ins.HttpRequest.DeleteDoorlockUser(device.deviceId, doorlockUser.lockUserIndex);
                             if (pack != null && pack.Code == StateCode.SUCCESS)
                             {
@@ -758,6 +786,9 @@
                             {
                                 Application.RunOnMainThread(() =>
                                 {
+                                    if (string.IsNullOrEmpty(pack.message)) {
+                                        pack.message = Language.StringByID(StringId.OperationFailed);
+                                    }
                                     //澶辫触鎻愮ず
                                     var tip = new Tip()
                                     {

--
Gitblit v1.8.0