From e5248512859d7c85e603d898319469e47cda7071 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 17 十二月 2020 20:45:12 +0800
Subject: [PATCH] 2020-12-17 1.修复自动化隐藏后还能滑动问题。
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 10 ++++++++--
.vs/HDL_APP_Project/xs/UserPrefs.xml | 18 +++++++++---------
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 48925f2..ff4a3c3 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,12 +1,8 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs">
<Files>
- <File FileName="HDL-ON_Android/Other/JPush/JPushService.cs" Line="1" Column="1" />
- <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" Line="170" Column="43" />
- <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="118" Column="14" />
- <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1423" Column="28" />
- <File FileName="HDL_ON/UI/UI0-Public/Widget/TextButton.cs" Line="42" Column="42" />
+ <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="73" Column="13" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -18,8 +14,12 @@
</Node>
<Node name="UI" expanded="True">
<Node name="UI0-Public" expanded="True">
- <Node name="Widget" expanded="True">
- <Node name="TextButton.cs" selected="True" />
+ <Node name="Widget" expanded="True" />
+ </Node>
+ <Node name="UI1-Login" expanded="True" />
+ <Node name="UI2" expanded="True">
+ <Node name="3-Intelligence" expanded="True">
+ <Node name="IntelligencePage.cs" selected="True" />
</Node>
</Node>
</Node>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 6f1aa84..8ac9bfb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -70,7 +70,9 @@
bodyView.AddChidren(topView);
//涓嶆槸A缃戝叧鎴栬�呮槸鎴愬憳 鍙厑璁告坊鍔犲満鏅殣钘忚嚜鍔ㄥ寲
- if (DB_ResidenceData.Instance.GatewayType != 1 || DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ var HideAutoPage = DB_ResidenceData.Instance.GatewayType != 1 || DB_ResidenceData.Instance.CurrentRegion.IsOthreShare;
+ //鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
+ if (HideAutoPage)
{
btnSceneTilte = new Button()
{
@@ -147,7 +149,11 @@
bodyView.AddChidren(contentPageView);
LoadScenePageView();
- LoadAutomationPageView();
+ //鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
+ if (!HideAutoPage)
+ {
+ LoadAutomationPageView();
+ }
LoadEventList();
}
--
Gitblit v1.8.0