From 9357cb33aca71fa48046dd5dceea9dfe310264d6 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 11 四月 2024 13:50:15 +0800
Subject: [PATCH] OnPro文本替换1
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index dde5cce..0bf2eb4 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -26,6 +26,7 @@
/// </summary>
Button btnBack;
+ public Button btnTilte;
/// <summary>
/// 鏍囬鍚嶇О
/// </summary>
@@ -40,6 +41,8 @@
/// 鍚庨��鏃惰Е鍙戝浜嬩欢
/// </summary>
Action backAction;
+
+ public int maginY = 0;
public TopViewDiv(FrameLayout frame, string str)
{
@@ -79,11 +82,11 @@
/// </summary>
/// <param name="frame"></param>
/// <param name="tilte"></param>
- public void LoadTopView(uint color = CSS_Color.TopViewColor)
+ public void LoadTopView(uint color = CSS_Color.TopViewColor)//,Action<List<Function> action
{
contentView = new FrameLayout()
{
- Height = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(64+ maginY),
BackgroundColor = color,
};
baseView.AddChidren(contentView);
@@ -91,17 +94,17 @@
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",
};
contentView.AddChidren(btnBackIcon);
- Button btnTilte = new Button()
+ 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,
@@ -110,6 +113,7 @@
Text = title
};
contentView.AddChidren(btnTilte);
+
btnBack = new Button()
@@ -140,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",
@@ -170,8 +174,8 @@
var btnSetting = new Button()
{
X = Application.GetRealWidth(337-37),
- Y = Application.GetRealHeight(20),
- Width = Application.GetMinRealAverage(38+37),
+ Y = Application.GetRealHeight(20 + maginY),
+ Width = Application.GetMinRealAverage(28+37),
Height = Application.GetMinRealAverage(28+19),
TextID = StringId.CombinedDimming,
TextSize = CSS_FontSize.TextFontSize,
@@ -197,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",
@@ -223,6 +228,8 @@
};
}
+
+
/// <summary>
/// 鎴块棿鏍囬鍖哄煙
/// </summary>
@@ -235,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",
@@ -259,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,
@@ -294,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",
@@ -345,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",
@@ -372,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",
@@ -438,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",
@@ -488,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