From 46fef61e8de822dc4a9eebca530ce37f2ed014f7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 11:06:27 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr6
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 34 ++++++----------------------------
1 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 81e9dd9..4b8ad64 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,47 +1,25 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs">
- <Files>
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="494" Column="10" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InputPushText.cs" Line="5" Column="1" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="62" Column="6" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="71" Column="10" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="575" Column="30" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs" Line="480" Column="37" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="128" Column="43" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs" Line="505" Column="54" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/OnePortAutomation.cs" Line="268" Column="54" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="57" Column="33" />
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs" Line="183" Column="1" />
- </Files>
+ <MonoDevelop.Ide.Workbench>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
- <Node name="Common" expanded="True" />
<Node name="DAL" expanded="True">
<Node name="Server" expanded="True" />
</Node>
- <Node name="Entity" expanded="True">
- <Node name="ResponseEntity" expanded="True" />
- </Node>
<Node name="UI" expanded="True">
- <Node name="UI0-Stan" expanded="True" />
<Node name="UI2" expanded="True">
- <Node name="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True">
- <Node name="MainView.cs" selected="True" />
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="PirDevice" expanded="True">
+ <Node name="View" expanded="True">
+ <Node name="TopView.cs" selected="True" />
+ </Node>
</Node>
- </Node>
- <Node name="FuntionControlView" expanded="True">
- <Node name="Video" expanded="True" />
</Node>
</Node>
</Node>
- </Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True" />
</Node>
</Node>
</State>
--
Gitblit v1.8.0