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/UI0-Public/PublicAssmeblyBLL.cs |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 32da33a..3488b00 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -23,8 +23,12 @@
                 switch (function.spk)
                 {
                     case SPK.GroupControl:
-                         var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
-                         dialog.ShowDialog();
+                         //var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
+                         //dialog.ShowDialog();
+                         var groupControlPage = new GroupControlPage_V2(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
+                        MainPage.BasePageView.AddChidren(groupControlPage);
+                        groupControlPage.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
+                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                         break;
                     case SPK.AirSwitch:
                         var airSwitchPage = new AirSwitchPage(function);

--
Gitblit v1.8.0