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/FunctionBaseInfoSetPage.cs |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
index 4080a14..d9ae722 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs
@@ -72,11 +72,14 @@
         public void LoadPage(bool locationSetting = true)
         {
             bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-            new TopViewDiv(bodyView, Language.StringByID(StringId.Setting)).LoadTopView();
+            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Setting));
+            topView.maginY = 10;
+            topView.LoadTopView();
+
 
             var contentView = new VerticalScrolViewLayout()
             {
-                Y = Application.GetRealHeight(64),
+                Y = Application.GetRealHeight(64+10),
                 Height = Application.GetRealHeight(600),
                 ScrollEnabled = false,
             };
@@ -526,7 +529,12 @@
                     Radius = (uint)Application.GetRealWidth(22),
                     BackgroundColor = CSS_Color.MainBackgroundColor,
                 };
-                contentView.AddChidren(delTextBtn);
+                //濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+                if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+                {
+                    contentView.AddChidren(delTextBtn);
+                }
+
 
                 EventHandler<MouseEventArgs> ClickEvent = (sener, e) =>
                 {

--
Gitblit v1.8.0