From 691dbe24f5724f153e07947c7b75bdfea5f0b6d5 Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期二, 24 九月 2024 16:15:15 +0800 Subject: [PATCH] 离线控制模式 --- HDL_ON/UI/UI0-Public/TopViewDiv.cs | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs index 31658f6..e20186f 100644 --- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs +++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs @@ -11,7 +11,7 @@ /// <summary> /// 鐖剁獥浣� /// </summary> - FrameLayout baseView; + public FrameLayout baseView; /// <summary> /// 鐖剁獥浣揇ialog /// </summary> @@ -19,7 +19,7 @@ /// <summary> /// 鍐呭鍖哄煙 /// </summary> - FrameLayout contentView; + public FrameLayout contentView; /// <summary> /// 鍚庨��鎸夐挳 @@ -144,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", @@ -174,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, @@ -201,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", @@ -227,8 +228,6 @@ }; } - - /// <summary> /// 鎴块棿鏍囬鍖哄煙 /// </summary> @@ -241,7 +240,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", @@ -272,7 +271,7 @@ var btnSetting = new Button() { X = Application.GetRealWidth(355-100), - Y = Application.GetRealHeight(29), + Y = Application.GetRealHeight(29 + maginY), Width = Application.GetMinRealAverage(100), Height = Application.GetMinRealAverage(28), TextColor = isDelColor ?CSS_Color.WarningColor: CSS_Color.MainColor, @@ -300,7 +299,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", @@ -351,7 +350,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", @@ -378,7 +377,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", @@ -444,7 +443,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", @@ -494,7 +493,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