From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 09:01:53 +0800
Subject: [PATCH] 更新
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 147 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 125 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
old mode 100755
new mode 100644
index 02b75d2..34c732e
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -98,13 +98,6 @@
};
contentView.AddChidren(btnBackIcon);
- btnBack = new Button()
- {
- Width = Application.GetRealWidth(50),
- //BackgroundColor = CSS_Color.AuxiliaryColor2,
- };
- contentView.AddChidren(btnBack);
-
Button btnTilte = new Button()
{
Gravity = Gravity.CenterHorizontal,
@@ -119,6 +112,12 @@
contentView.AddChidren(btnTilte);
+ btnBack = new Button()
+ {
+ Width = Application.GetRealWidth(70),
+ };
+ contentView.AddChidren(btnBack);
+
LoadEventList();
}
/// <summary>
@@ -132,7 +131,7 @@
LoadTopView();
}
- public void LoadTopView_RoomTop(Action backAction ,Action editAction)
+ public void LoadTopView_RoomTop(Action backAction, Action editAction)
{
this.backAction = backAction;
@@ -148,7 +147,7 @@
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
@@ -159,14 +158,13 @@
}
/// <summary>
- /// 鍚慺ramelayout娣诲姞椤堕儴鍖哄煙,鎷ユ湁閰嶇疆鍥炬爣鎸夐挳
+ /// 鐏厜鍔熻兘鍒楄〃鐣岄潰
+ /// 甯︾粍鍚堣皟鍏夌紪杈�
/// </summary>
- /// <param name="frame"></param>
- /// <param name="tilte"></param>
- public void LoadTopView_FunctionTop(Function function, Action action)
+ /// <param name="backAction"></param>
+ /// <param name="editAction"></param>
+ public void LoadTopView_LightFunction( Action editAction)
{
- backAction = action;
-
LoadTopView();
var btnSetting = new Button()
@@ -175,10 +173,39 @@
Y = Application.GetRealHeight(29),
Width = Application.GetMinRealAverage(28),
Height = Application.GetMinRealAverage(28),
+ UnSelectedImagePath = "FunctionIcon/Light/LightScene/SetLightSceneIcon.png",
+ };
+
+ contentView.AddChidren(btnSetting);
+ btnSetting.MouseUpEventHandler = (sender, e) =>
+ {
+ editAction();
+ };
+ }
+
+
+
+ /// <summary>
+ /// 鍚慺ramelayout娣诲姞椤堕儴鍖哄煙,鎷ユ湁閰嶇疆鍥炬爣鎸夐挳
+ /// </summary>
+ /// <param name="frame"></param>
+ /// <param name="tilte"></param>
+ public void LoadTopView_FunctionTop(Function function, Action action,bool locationSet = true)
+ {
+ backAction = action;
+
+ LoadTopView();
+
+ var btnSetting = new Button()
+ {
+ X = Application.GetRealWidth(337),
+ Y = Application.GetRealHeight(28),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
@@ -187,7 +214,7 @@
{
var infoView = new FunctionBaseInfoSetPage(function, action);
MainPage.BasePageView.AddChidren(infoView);
- infoView.LoadPage();
+ infoView.LoadPage(locationSet);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
}
@@ -211,7 +238,7 @@
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
@@ -243,14 +270,40 @@
btnAddIcon.MouseUpEventHandler += (sender, e) =>
{
- LoadEvent_AddEvent(type, callBack);
+ 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("", "");
+ }
};
}
/// <summary>
/// 妤煎眰绠＄悊椤堕儴鏍�
/// </summary>
- public void LoadTopView_FloorTopView(Action<string> callBack,Action action)
+ public void LoadTopView_FloorTopView(Action<string> callBack, Action action)
{
LoadTopView();
@@ -313,9 +366,36 @@
};
}
/// <summary>
+ /// 鍗忚绠＄悊椤堕儴
+ /// 甯︽挙閿�鍚屾剰鎸夐挳
+ /// </summary>
+ public void LoadTopView_WithdrawalConsent(Action withdrawalConsentAction)
+ {
+ LoadTopView();
+
+ var btnAddIcon = new Button()
+ {
+ X = Application.GetRealWidth(352-100),
+ Y = Application.GetRealHeight(29),
+ Width = Application.GetMinRealAverage(100),
+ Height = Application.GetMinRealAverage(28),
+ TextID = StringId.WithdrawalConsent,
+ TextAlignment = TextAlignment.CenterRight,
+ TextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ };
+ contentView.AddChidren(btnAddIcon);
+
+ btnAddIcon.MouseUpEventHandler += (sender, e) =>
+ {
+ withdrawalConsentAction?.Invoke();
+ };
+ }
+
+ /// <summary>
/// 鎴愬憳椤堕儴鏍�
/// </summary>
- public void LoadTopView_MemberTopView(Action callBack, Action action)
+ public void LoadTopView_MemberTopView(Action addAction, Action action)
{
LoadTopView();
backAction = action;
@@ -332,7 +412,30 @@
btnAddIcon.MouseUpEventHandler += (sender, e) =>
{
- callBack?.Invoke();
+ addAction?.Invoke();
+ };
+ }
+ /// <summary>
+ /// 瀹夐槻涓績椤堕儴鏍�
+ /// </summary>
+ public void LoadTopView_ArmCenter(Action skipAction)//(Action callBack, Action action)
+ {
+ LoadTopView();
+ //backAction = action;
+
+ var btnAddIcon = new Button()
+ {
+ X = Application.GetRealWidth(337),
+ Y = Application.GetRealHeight(29),
+ Width = Application.GetMinRealAverage(28),
+ Height = Application.GetMinRealAverage(28),
+ UnSelectedImagePath = "FunctionIcon/ArmCenter/HistoryIcon.png",
+ };
+ //contentView.AddChidren(btnAddIcon);
+
+ btnAddIcon.MouseUpEventHandler += (sender, e) =>
+ {
+ skipAction?.Invoke();
};
}
}
--
Gitblit v1.8.0