From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 29 八月 2023 09:22:38 +0800 Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc --- HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs | 70 ++++++++++++++++++++++++++++------ 1 files changed, 57 insertions(+), 13 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorlockUserManagerPage.cs index 6f1f608..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,23 +137,42 @@ }.Show(bodyView); return; } - waitPage.Start(Language.StringByID(StringId.PleaseWait)); new System.Threading.Thread(() => { try { - var resultObj = ApiUtlis.Ins.HttpRequest.EditDoorlockUserName(device.deviceId, doorlockUser.extUserId, str); - if (resultObj.Code == StateCode.SUCCESS) + 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 { //澶辫触鎻愮ず - IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code); + Application.RunOnMainThread(() => + { + if (string.IsNullOrEmpty(pack.message)) + { + pack.message = Language.StringByID(StringId.OperationFailed); + } + { + var tip = new Tip() + { + MaxWidth = Application.GetRealWidth(300), + Text = $"{pack.message}({pack.Code})", + CloseTime = 3, + Direction = AMPopTipDirection.None + }; + tip.Show(MainPage.BaseView); + } + }); } } catch (Exception ex) @@ -317,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) { @@ -427,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) { @@ -536,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) { @@ -644,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) { @@ -724,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) { @@ -745,6 +786,9 @@ { Application.RunOnMainThread(() => { + if (string.IsNullOrEmpty(pack.message)) { + pack.message = Language.StringByID(StringId.OperationFailed); + } //澶辫触鎻愮ず var tip = new Tip() { -- Gitblit v1.8.0