From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 080a209..27de3ca 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -98,12 +98,6 @@
};
contentView.AddChidren(btnBackIcon);
- btnBack = new Button()
- {
- Width = Application.GetRealWidth(100),
- };
- contentView.AddChidren(btnBack);
-
Button btnTilte = new Button()
{
Gravity = Gravity.CenterHorizontal,
@@ -117,6 +111,12 @@
};
contentView.AddChidren(btnTilte);
+
+ btnBack = new Button()
+ {
+ Width = Application.GetRealWidth(70),
+ };
+ contentView.AddChidren(btnBack);
LoadEventList();
}
@@ -147,7 +147,7 @@
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
@@ -177,7 +177,7 @@
UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
@@ -210,7 +210,7 @@
};
//濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
contentView.AddChidren(btnSetting);
}
@@ -357,7 +357,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