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/ArmCenter/PushConfigPage.cs |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/PushConfigPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/PushConfigPage.cs
index 6576dcb..078c574 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/PushConfigPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/PushConfigPage.cs
@@ -15,14 +15,16 @@
         }
         public void Show(Entity.SecurityAlarm alarm)
         {
-      
-            new TopViewDiv(bodyView, Language.StringByID(StringId.fasongtongzhi)).LoadTopView();
+
+            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.fasongtongzhi));
+            topView.maginY = 10;
+            topView.LoadTopView();
 
             this.BackgroundColor = CSS.CSS_Color.BackgroundColor;
 
             var viewLayout = new FrameLayout()
             {
-                Y = Application.GetRealHeight(64),
+                Y = Application.GetRealHeight(64+10),
                 Height = Application.GetRealHeight(527),
             };
             bodyView.AddChidren(viewLayout);
@@ -69,11 +71,20 @@
             appPush.frameLayout.Radius = (uint)Application.GetRealHeight(12);
             appPush.btnText.TextID = StringId.apptuisong;
             appPush.btnText.X = Application.GetRealWidth(12);
+
+            if (MainPage.NoLoginMode)
+            {
+                appPush.btnNextIcon.Visible = false;
+            }
             viewLayout.AddChidren(appPush.FLayoutView(false));
             //瀹氫箟涓�涓眬閮ㄨ处鍙峰垪琛ㄧ敤鏉ヨ褰曢�変腑鏁版嵁;
             List<string> selectedAccountList = new List<string>();
             appPush.btnClick.MouseUpEventHandler += (sender, e) =>
             {
+                if (MainPage.NoLoginMode)
+                {
+                    return;
+                }
                 var userList = new List<HDL_ON.Entity.ResidenceMemberInfo>();
                 Loading loading = new Loading();
                 this.AddChidren(loading);
@@ -82,7 +93,7 @@
                 {
                     try
                     {
-                        userList = Send.GetResidenceMemberAccount();
+                        userList = Send.Current.GetResidenceMemberAccount();
 
                     }
                     catch { }

--
Gitblit v1.8.0