From 702cad5d5236fe14c714fdc0f0d02a2399b772ac Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 10 四月 2024 16:07:30 +0800
Subject: [PATCH] Delete Shared.IOS-1.dll

---
 HDL_ON/UI/UI0-Public/TopViewDiv.cs |   37 +++++++++++++++++++++----------------
 1 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 8bcda0b..0bf2eb4 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -42,6 +42,8 @@
         /// </summary>
         Action backAction;
 
+        public int maginY = 0;
+
         public TopViewDiv(FrameLayout frame, string str)
         {
             baseView = frame;
@@ -84,7 +86,7 @@
         {
             contentView = new FrameLayout()
             {
-                Height = Application.GetRealHeight(64),
+                Height = Application.GetRealHeight(64+ maginY),
                 BackgroundColor = color,
             };
             baseView.AddChidren(contentView);
@@ -92,7 +94,7 @@
             Button btnBackIcon = new Button()
             {
                 X = Application.GetRealWidth(10),
-                Y = Application.GetRealHeight(29),
+                Y = Application.GetRealHeight(29 + maginY),
                 Width = Application.GetRealWidth(40),
                 Height = Application.GetRealWidth(28),
                 UnSelectedImagePath = "Public/BackIcon.png",
@@ -102,7 +104,7 @@
             btnTilte = new Button()
             {
                 Gravity = Gravity.CenterHorizontal,
-                Y = Application.GetRealHeight(30),
+                Y = Application.GetRealHeight(30 + maginY),
                 Width = Application.GetRealWidth(270),
                 Height = Application.GetRealHeight(25),
                 TextAlignment = TextAlignment.Center,
@@ -142,7 +144,7 @@
             var btnSetting = new Button()
             {
                 X = Application.GetRealWidth(337),
-                Y = Application.GetRealHeight(29),
+                Y = Application.GetRealHeight(29 + maginY),
                 Width = Application.GetMinRealAverage(28),
                 Height = Application.GetMinRealAverage(28),
                 UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
@@ -172,7 +174,7 @@
             var btnSetting = new Button()
             {
                 X = Application.GetRealWidth(337-37),
-                Y = Application.GetRealHeight(20),
+                Y = Application.GetRealHeight(20 + maginY),
                 Width = Application.GetMinRealAverage(28+37),
                 Height = Application.GetMinRealAverage(28+19),
                 TextID = StringId.CombinedDimming,
@@ -199,13 +201,14 @@
         public void LoadTopView_FunctionTop(Function function, Action action,bool locationSet = true)
         {
             backAction = action;
+            maginY = 10;
 
             LoadTopView();
 
             var btnSetting = new Button()
             {
                 X = Application.GetRealWidth(337),
-                Y = Application.GetRealHeight(28),
+                Y = Application.GetRealHeight(28 + maginY),
                 Width = Application.GetMinRealAverage(32),
                 Height = Application.GetMinRealAverage(32),
                 UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
@@ -225,6 +228,8 @@
             };
         }
 
+
+
         /// <summary>
         /// 鎴块棿鏍囬鍖哄煙
         /// </summary>
@@ -237,7 +242,7 @@
             var btnSetting = new Button()
             {
                 X = Application.GetRealWidth(337),
-                Y = Application.GetRealHeight(29),
+                Y = Application.GetRealHeight(29 + maginY),
                 Width = Application.GetMinRealAverage(28),
                 Height = Application.GetMinRealAverage(28),
                 UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
@@ -261,17 +266,17 @@
         /// <param name="room"></param>
         /// <param name="skipAction"></param>
         /// <param name="text"></param>
-        public void LoadTopView_SettingText(Action skipAction,string text)
+        public void LoadTopView_SettingText(Action skipAction,string text,bool isDelColor = false)
         {
             LoadTopView();
             
             var btnSetting = new Button()
             {
-                X = Application.GetRealWidth(337-100),
-                Y = Application.GetRealHeight(29),
+                X = Application.GetRealWidth(355-100),
+                Y = Application.GetRealHeight(29 + maginY),
                 Width = Application.GetMinRealAverage(100),
                 Height = Application.GetMinRealAverage(28),
-                TextColor = CSS_Color.MainColor,
+                TextColor = isDelColor ?CSS_Color.WarningColor: CSS_Color.MainColor,
                 TextSize = CSS_FontSize.TextFontSize,
                 TextAlignment = TextAlignment.CenterRight,
                 Text = text,
@@ -296,7 +301,7 @@
             var btnAddIcon = new Button()
             {
                 X = Application.GetRealWidth(337),
-                Y = Application.GetRealHeight(29),
+                Y = Application.GetRealHeight(29 + maginY),
                 Width = Application.GetMinRealAverage(28),
                 Height = Application.GetMinRealAverage(28),
                 UnSelectedImagePath = "Public/AddIcon.png",
@@ -347,7 +352,7 @@
             var btnAddIcon = new Button()
             {
                 X = Application.GetRealWidth(337),
-                Y = Application.GetRealHeight(29),
+                Y = Application.GetRealHeight(29 + maginY),
                 Width = Application.GetMinRealAverage(28),
                 Height = Application.GetMinRealAverage(28),
                 UnSelectedImagePath = "Public/LinkIotIcon.png",
@@ -374,7 +379,7 @@
             var btnAddIcon = new Button()
             {
                 X = Application.GetRealWidth(337),
-                Y = Application.GetRealHeight(29),
+                Y = Application.GetRealHeight(29 + maginY),
                 Width = Application.GetMinRealAverage(28),
                 Height = Application.GetMinRealAverage(28),
                 UnSelectedImagePath = "Public/Iot_agreement_icon.png",
@@ -440,7 +445,7 @@
             var btnAddIcon = new Button()
             {
                 X = Application.GetRealWidth(337),
-                Y = Application.GetRealHeight(29),
+                Y = Application.GetRealHeight(29 + maginY),
                 Width = Application.GetMinRealAverage(28),
                 Height = Application.GetMinRealAverage(28),
                 UnSelectedImagePath = "Public/AddIcon.png",
@@ -490,7 +495,7 @@
             var btnAddIcon = new Button()
             {
                 X = Application.GetRealWidth(337),
-                Y = Application.GetRealHeight(29),
+                Y = Application.GetRealHeight(29+maginY),
                 Width = Application.GetMinRealAverage(28),
                 Height = Application.GetMinRealAverage(28),
                 UnSelectedImagePath = "Public/AddIcon.png",

--
Gitblit v1.8.0