From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:46:32 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 02a2f3d..0cacd40 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);
}
@@ -365,7 +365,7 @@
/// </summary>
public void LoadTopView_ArmCenter(Action skipAction)//(Action callBack, Action action)
{
- //LoadTopView();
+ LoadTopView();
//backAction = action;
var btnAddIcon = new Button()
--
Gitblit v1.8.0