From b9c9c77fe50a9098f62a338c44c8598690177b90 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 23 十二月 2020 10:58:23 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 00e6b30..fd70da5 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -133,15 +133,20 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/AddIcon.png",
};
- topView.AddChidren(btnAddIconBg);
-
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ topView.AddChidren(btnAddIconBg);
+ }
btnAddIcon = new Button()
{
X = Application.GetRealWidth(337-20),
Width = Application.GetMinRealAverage(28+30),
Height = Application.GetMinRealAverage(28+29),
};
- topView.AddChidren(btnAddIcon);
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ topView.AddChidren(btnAddIcon);
+ }
#endregion
contentPageView = new PageLayout()
@@ -400,7 +405,10 @@
Width = Application.GetRealWidth(32),
UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
};
- view.AddChidren(btnSettingIcon);
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ view.AddChidren(btnSettingIcon);
+ }
Button btnCollection;
btnCollection = new Button()
--
Gitblit v1.8.0