From 0f13be8b24ef37fe16cd34c8411a907f93b7f304 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 28 十一月 2023 09:35:42 +0800
Subject: [PATCH] Merge branch 'Wxr-V2.4.2' into Google-2023-11-17-1
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 572cffe..890e81e 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;
@@ -82,9 +84,12 @@
/// <param name="tilte"></param>
public void LoadTopView(uint color = CSS_Color.TopViewColor)//,Action<List<Function> action
{
+#if __ANDROID__
+ maginY = 0;
+#endif
contentView = new FrameLayout()
{
- Height = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(64+ maginY),
BackgroundColor = color,
};
baseView.AddChidren(contentView);
@@ -92,7 +97,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 +107,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 +147,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 +177,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 +204,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",
@@ -239,7 +245,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",
@@ -270,7 +276,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,
@@ -298,7 +304,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",
@@ -349,7 +355,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",
@@ -376,7 +382,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",
@@ -442,7 +448,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",
@@ -492,7 +498,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