From fd9e8772f7122a0ca8096b98489b59ab6f716b1f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 11 一月 2021 14:55:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/NewFilePath' into WJC
---
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index 31e109f..556ac0f 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -100,8 +100,7 @@
btnBack = new Button()
{
- Width = Application.GetRealWidth(50),
- //BackgroundColor = CSS_Color.AuxiliaryColor2,
+ Width = Application.GetRealWidth(100),
};
contentView.AddChidren(btnBack);
@@ -146,8 +145,12 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
};
- contentView.AddChidren(btnSetting);
+ //濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ contentView.AddChidren(btnSetting);
+ }
btnSetting.MouseUpEventHandler = (sender, e) =>
{
editAction();
@@ -168,12 +171,16 @@
var btnSetting = new Button()
{
X = Application.GetRealWidth(337),
- Y = Application.GetRealHeight(29),
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
+ Y = Application.GetRealHeight(28),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
};
- contentView.AddChidren(btnSetting);
+ //濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ contentView.AddChidren(btnSetting);
+ }
btnSetting.MouseUpEventHandler = (sender, e) =>
{
@@ -201,7 +208,12 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
};
- contentView.AddChidren(btnSetting);
+
+ //濡傛灉鏄垚鍛橀殣钘忕紪杈戝姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ contentView.AddChidren(btnSetting);
+ }
btnSetting.MouseUpEventHandler += (sender, e) =>
{
--
Gitblit v1.8.0