From 35a2888945bcf1b7ef6f34d30f1709b9c848fce6 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 16 十二月 2020 15:17:18 +0800
Subject: [PATCH] 111
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 3 +--
.vs/HDL_APP_Project/xs/UserPrefs.xml | 37 +++++++++++++++++++++----------------
2 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index a8c3389..2552a0e 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,12 +1,14 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs">
<Files>
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs" Line="490" Column="28" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs" Line="159" Column="10" />
<File FileName="HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs" Line="33" Column="18" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs" Line="35" Column="34" />
+ <File FileName="HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs" Line="33" Column="21" />
<File FileName="HDL_ON/Entity/Room.cs" Line="466" Column="23" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs" Line="221" Column="54" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="72" Column="60" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -14,29 +16,32 @@
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
<Node name="Common" expanded="True" />
- <Node name="Entity" expanded="True">
- <Node name="Enumerative" expanded="True" />
- <Node name="Function" expanded="True" />
- </Node>
+ <Node name="Entity" expanded="True" />
<Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
- <Node name="UI1-Login" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="1-HomePage" expanded="True" />
- <Node name="2-Classification" expanded="True">
- <Node name="RoomPageBLL.cs" selected="True" />
+ <Node name="2-Classification" expanded="True" />
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="IntelligencePage.cs" selected="True" />
</Node>
- <Node name="3-Intelligence" expanded="True" />
- <Node name="4-PersonalCenter" expanded="True">
- <Node name="RoomListManage" expanded="True">
- <Node name="AddRoom" expanded="True" />
+ <Node name="4-PersonalCenter" expanded="True" />
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="Music" expanded="True">
+ <Node name="View" expanded="True" />
</Node>
</Node>
</Node>
</Node>
</Node>
<Node name="HDL-ON_Android" expanded="True" />
- <Node name="HDL-ON_iOS" expanded="True" />
+ <Node name="HDL-ON_iOS" expanded="True">
+ <Node name="Resources" expanded="True">
+ <Node name="Phone" expanded="True">
+ <Node name="PersonalCenter" expanded="True">
+ <Node name="AppUnlockSetting" expanded="True" />
+ </Node>
+ </Node>
+ </Node>
+ </Node>
</Node>
</State>
</Pad>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index b995002..6aa31b3 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -69,7 +69,7 @@
};
bodyView.AddChidren(topView);
- if (DB_ResidenceData.Instance.GatewayType == 0)
+ if (DB_ResidenceData.Instance.GatewayType == 0 || DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
{
btnSceneTilte = new Button()
{
@@ -85,7 +85,6 @@
};
topView.AddChidren(btnSceneTilte);
btnAutomationTitle = new Button();
-
}
else
{
--
Gitblit v1.8.0