From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 118 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 64 insertions(+), 54 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index e20fdc3..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,13 +19,14 @@
/// <summary>
/// 鍐呭鍖哄煙
/// </summary>
- FrameLayout contentView;
+ public FrameLayout contentView;
/// <summary>
/// 鍚庨��鎸夐挳
/// </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,29 +82,29 @@
/// </summary>
/// <param name="frame"></param>
/// <param name="tilte"></param>
- public void LoadTopView()
+ public void LoadTopView(uint color = CSS_Color.TopViewColor)//,Action<List<Function> action
{
contentView = new FrameLayout()
{
- Height = Application.GetRealHeight(64),
- BackgroundColor = CSS_Color.TopViewColor,
+ Height = Application.GetRealHeight(64+ maginY),
+ BackgroundColor = color,
};
baseView.AddChidren(contentView);
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",
@@ -169,11 +173,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 + maginY),
+ 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);
@@ -193,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",
@@ -231,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",
@@ -255,17 +264,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,
@@ -290,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",
@@ -334,49 +343,50 @@
/// </summary>
/// <param name="frame"></param>
/// <param name="tilte"></param>
- public void LoadTopView_Add3tyIot(string type, Action<string, string> callBack)
+ public void LoadTopView_Add3tyIot( Action<string, string> callBack)
{
- LoadTopView();
+ LoadTopView(CSS_Color.MainBackgroundColor);
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",
+ UnSelectedImagePath = "Public/LinkIotIcon.png",
};
contentView.AddChidren(btnAddIcon);
btnAddIcon.MouseUpEventHandler += (sender, e) =>
{
- if (type == "floors")
- {
- Action<string> callBackAction = (floorName) =>
- {
- callBack("add", floorName);
- };
- string newFloorName = "1F";
- for (int i = 0; i < SpatialInfo.CurrentSpatial.FloorList.Count + 1;)
- {
- newFloorName = ++i + "F";
- if (null == SpatialInfo.CurrentSpatial.FloorList.Find((obj) => obj.roomName == newFloorName))
- {
- break;
- }
- }
- var fs = new List<string>();
- foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
- {
- fs.Add(f.roomName);
- }
- new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors, newFloorName, callBackAction, StringId.FloorNameCannotBeEmpty,
- StringId.AddFloorFailed_FloorAlreadyExist, fs);
- }
- else
- {
- callBack("", "");
- }
+ var page = new Iot_BrandListPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ }
+
+
+ /// <summary>
+ /// 鍚慺ramelayout娣诲姞椤堕儴鍖哄煙,绗笁鏂瑰钩鍙�
+ /// </summary>
+ public void LoadTopView_3tyIot(Action action)
+ {
+ LoadTopView(CSS_Color.MainBackgroundColor);
+
+ var btnAddIcon = new Button()
+ {
+ X = Application.GetRealWidth(337),
+ Y = Application.GetRealHeight(29 + maginY),
+ Width = Application.GetMinRealAverage(28),
+ Height = Application.GetMinRealAverage(28),
+ UnSelectedImagePath = "Public/Iot_agreement_icon.png",
+ };
+ contentView.AddChidren(btnAddIcon);
+
+ btnAddIcon.MouseUpEventHandler += (sender, e) =>
+ {
+ action();
};
}
@@ -433,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",
@@ -483,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