From d53f7315de145266e6465d9f95d11d1712b9a91b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 18 十二月 2020 20:55:28 +0800
Subject: [PATCH] 20201218-6
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
old mode 100644
new mode 100755
index 6aa31b3..8ac9bfb
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -69,7 +69,10 @@
};
bodyView.AddChidren(topView);
- if (DB_ResidenceData.Instance.GatewayType == 0 || DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ //涓嶆槸A缃戝叧鎴栬�呮槸鎴愬憳 鍙厑璁告坊鍔犲満鏅殣钘忚嚜鍔ㄥ寲
+ var HideAutoPage = DB_ResidenceData.Instance.GatewayType != 1 || DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
+ //鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
+ if (HideAutoPage)
{
btnSceneTilte = new Button()
{
@@ -146,7 +149,11 @@
bodyView.AddChidren(contentPageView);
LoadScenePageView();
- LoadAutomationPageView();
+ //鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
+ if (!HideAutoPage)
+ {
+ LoadAutomationPageView();
+ }
LoadEventList();
}
@@ -360,7 +367,12 @@
SelectedImagePath = "Collection/CollectionIcon.png",
IsSelected = scene.collect,
};
- view.AddChidren(btnCollection);
+ //view.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ view.AddChidren(btnCollection);
+ }
btnCollection.MouseUpEventHandler = (sender, e) => {
scene.collect = btnCollection.IsSelected = !btnCollection.IsSelected;
scene.CollectScene();
@@ -479,6 +491,18 @@
{
if (!btnAutomationTitle.IsSelected)
{
+ //濡傛灉鏄垚鍛�
+ if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ //濡傛灉娌℃湁鍦烘櫙鏉冮檺
+ if (!DB_ResidenceData.Instance.CurrentRegion.isAllowCreateScene)
+ {
+ //鎻愮ず娌℃湁鍦烘櫙鐨勫垱寤烘潈闄�
+ Utlis.ShowTip(Language.StringByID(StringId.PermissionDenied));
+ return;
+ }
+ }
+
Action action = () =>
{
LoadSceneFunctionControlZone();
--
Gitblit v1.8.0