From 95abe9c68247fb8213871a59be4b0f33830dc188 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 30 六月 2023 14:18:38 +0800
Subject: [PATCH] 安卓定位优化,组控更新,修改密码验证码输入问题修复

---
 HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
index a639e02..9eba782 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs
@@ -405,17 +405,17 @@
         /// </summary>
         void LoadEvent_DivSkipEvent()
         {
-            if (function.spk == SPK.GroupControl)
-            {
-                EventHandler<MouseEventArgs> handler = (sender, e) => {
-                    var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
-                    dialog.ShowDialog();
-                };
-                this.MouseUpEventHandler = handler;
-                btnName.MouseUpEventHandler = handler;
-                btnFromFloor.MouseUpEventHandler = handler;
-                return;
-            }
+            //if (function.spk == SPK.GroupControl)
+            //{
+            //    EventHandler<MouseEventArgs> handler = (sender, e) => {
+            //        var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
+            //        dialog.ShowDialog();
+            //    };
+            //    this.MouseUpEventHandler = handler;
+            //    btnName.MouseUpEventHandler = handler;
+            //    btnFromFloor.MouseUpEventHandler = handler;
+            //    return;
+            //}
             var eventHandler = new PublicAssmebly().LoadEvent_SkipFunctionControlPage(function, btnCollectionIcon, btnName, btnFromFloor, UI2.FuntionControlView.VideoDoorLock.CommonMethod.Comerom.room,this.action);
             this.MouseUpEventHandler = eventHandler;
             btnName.MouseUpEventHandler = eventHandler;

--
Gitblit v1.8.0