From 4fef29b9ab9f2632f15a0d45005f92d91de5d4e5 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期四, 27 七月 2023 14:26:59 +0800
Subject: [PATCH] feature 萤石sdk更新
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 63e8ba3..572cffe 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>
@@ -79,7 +80,7 @@
/// </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()
{
@@ -98,7 +99,7 @@
};
contentView.AddChidren(btnBackIcon);
- Button btnTilte = new Button()
+ btnTilte = new Button()
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(30),
@@ -110,6 +111,7 @@
Text = title
};
contentView.AddChidren(btnTilte);
+
btnBack = new Button()
@@ -169,11 +171,15 @@
var btnSetting = new Button()
{
- X = Application.GetRealWidth(337),
- Y = Application.GetRealHeight(29),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
- UnSelectedImagePath = "FunctionIcon/Light/LightScene/SetLightSceneIcon.png",
+ X = Application.GetRealWidth(337-37),
+ Y = Application.GetRealHeight(20),
+ Width = Application.GetMinRealAverage(28+37),
+ Height = Application.GetMinRealAverage(28+19),
+ TextID = StringId.CombinedDimming,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.MainColor,
+ IsMoreLines = true
+ //UnSelectedImagePath = "FunctionIcon/Light/LightScene/SetLightSceneIcon.png",
};
contentView.AddChidren(btnSetting);
@@ -219,6 +225,8 @@
};
}
+
+
/// <summary>
/// 鎴块棿鏍囬鍖哄煙
/// </summary>
@@ -255,17 +263,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),
+ X = Application.GetRealWidth(355-100),
Y = Application.GetRealHeight(29),
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,
--
Gitblit v1.8.0