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/UI2/3-Intelligence/IntelligencePage.cs | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 7fd9097..85ad984 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -61,6 +61,7 @@
public void LoadPage()
{
+ MainPage.CurPageIndex = 2;
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
#region top
topView = new FrameLayout()
@@ -71,7 +72,7 @@
bodyView.AddChidren(topView);
//涓嶆槸A缃戝叧鎴栬�呮槸鎴愬憳 鍙厑璁告坊鍔犲満鏅殣钘忚嚜鍔ㄥ寲
- var HideAutoPage = DB_ResidenceData.Instance.GatewayType != 1 || DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
+ var HideAutoPage = DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
//鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
if (HideAutoPage)
{
@@ -129,7 +130,7 @@
Height = Application.GetMinRealAverage(28),
UnSelectedImagePath = "Public/AddIcon.png",
};
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
topView.AddChidren(btnAddIconBg);
}
@@ -139,7 +140,7 @@
Width = Application.GetMinRealAverage(28+30),
Height = Application.GetMinRealAverage(28+29),
};
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
topView.AddChidren(btnAddIcon);
}
@@ -229,7 +230,7 @@
sceneFunctionView = new VerticalScrolViewLayout()
{
- Y = Application.GetRealHeight(53),
+ Y = Application.GetRealHeight(53),
Height = Application.GetRealHeight(667 - 64 - 49 - 52 + 30),
};
scenePageView.AddChidren(sceneFunctionView);
@@ -395,7 +396,7 @@
Width = Application.GetRealWidth(32),
UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
};
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (scene.userId == UserInfo.Current.ID)
{
view.AddChidren(btnSettingIcon);
}
@@ -411,12 +412,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);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // view.AddChidren(btnCollection);
+ //}
btnCollection.MouseUpEventHandler = (sender, e) => {
scene.collect = btnCollection.IsSelected = !btnCollection.IsSelected;
scene.CollectScene();
@@ -582,7 +583,7 @@
if (!btnAutomationTitle.IsSelected)
{
//濡傛灉鏄垚鍛�
- if (DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
//濡傛灉娌℃湁鍦烘櫙鏉冮檺
if (!DB_ResidenceData.Instance.CurrentRegion.isAllowCreateScene)
--
Gitblit v1.8.0